From 6734191c6822d41920c322d83fa0e17221d95dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 10 Jan 2010 23:52:15 +0100 Subject: [PATCH] Remove unused top-level variables. * module/ice-9/runq.scm (fork-strips): Remove. * module/language/assembly.scm (*block-alignment*): Remove. * module/language/assembly/disassemble.scm (disassemble-objects, simplify): Remove. * module/srfi/srfi-18.scm (mutex-owners): Remove. * module/srfi/srfi-19.scm (leap-year?): Remove. * module/system/base/compile.scm (dsu-sort): Remove. * module/texinfo.scm (ascii->char): Remove. * module/texinfo/html.scm (ignored?): Remove. * module/texinfo/indexing.scm (def-name): Remove. * module/texinfo/plain-text.scm (ignore): Remove. --- module/ice-9/runq.scm | 3 +-- module/language/assembly.scm | 4 +--- module/language/assembly/disassemble.scm | 16 ---------------- module/srfi/srfi-18.scm | 3 +-- module/srfi/srfi-19.scm | 3 --- module/system/base/compile.scm | 7 +------ module/texinfo.scm | 4 +--- module/texinfo/html.scm | 4 +--- module/texinfo/indexing.scm | 5 +---- module/texinfo/plain-text.scm | 5 +---- 10 files changed, 8 insertions(+), 46 deletions(-) diff --git a/module/ice-9/runq.scm b/module/ice-9/runq.scm index c14eb8967..78a420322 100644 --- a/module/ice-9/runq.scm +++ b/module/ice-9/runq.scm @@ -1,6 +1,6 @@ ;;;; runq.scm --- the runq data structure ;;;; -;;;; Copyright (C) 1996, 2001, 2006 Free Software Foundation, Inc. +;;;; Copyright (C) 1996, 2001, 2006, 2010 Free Software Foundation, Inc. ;;;; ;;;; This library is free software; you can redistribute it and/or ;;;; modify it under the terms of the GNU Lesser General Public @@ -208,7 +208,6 @@ ;;; runq, strips of the parallel subtasks will run ;;; round-robin style. ;;; -(define fork-strips (lambda args args)) ;;;; diff --git a/module/language/assembly.scm b/module/language/assembly.scm index 541096c52..95604b26a 100644 --- a/module/language/assembly.scm +++ b/module/language/assembly.scm @@ -1,6 +1,6 @@ ;;; Guile Virtual Machine Assembly -;; Copyright (C) 2001, 2009 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2009, 2010 Free Software Foundation, Inc. ;;;; This library is free software; you can redistribute it and/or ;;;; modify it under the terms of the GNU Lesser General Public @@ -58,8 +58,6 @@ (define *program-alignment* 8) -(define *block-alignment* 8) - (define (addr+ addr code) (fold (lambda (x len) (+ (byte-length x) len)) addr diff --git a/module/language/assembly/disassemble.scm b/module/language/assembly/disassemble.scm index 0c4706177..d072d3b4f 100644 --- a/module/language/assembly/disassemble.scm +++ b/module/language/assembly/disassemble.scm @@ -88,13 +88,6 @@ (else (error "bad load-program form" asm)))) -(define (disassemble-objects objs) - (display "Objects:\n\n") - (let ((len (vector-length objs))) - (do ((n 0 (1+ n))) - ((= n len) (newline)) - (print-info n (vector-ref objs n) #f #f)))) - (define (disassemble-free-vars free-vars) (display "Free variables:\n\n") (let lp ((i 0)) @@ -164,12 +157,3 @@ ;; i am format's daddy. (define (print-info addr info extra src) (format #t "~4@S ~32S~@[;; ~1{~@?~}~]~@[~61t at ~a~]\n" addr info extra src)) - -(define (simplify x) - (cond ((string? x) - (cond ((string-index x #\newline) => - (lambda (i) (set! x (substring x 0 i))))) - (cond ((> (string-length x) 16) - (set! x (string-append (substring x 0 13) "...")))))) - x) - diff --git a/module/srfi/srfi-18.scm b/module/srfi/srfi-18.scm index 4a171b4fd..4921a95d7 100644 --- a/module/srfi/srfi-18.scm +++ b/module/srfi/srfi-18.scm @@ -1,6 +1,6 @@ ;;; srfi-18.scm --- Multithreading support -;; Copyright (C) 2008, 2009 Free Software Foundation, Inc. +;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public @@ -105,7 +105,6 @@ (define terminated-thread-exception (list 'terminated-thread-exception)) (define uncaught-exception (list 'uncaught-exception)) -(define mutex-owners (make-weak-key-hash-table)) (define object-names (make-weak-key-hash-table)) (define object-specifics (make-weak-key-hash-table)) (define thread-start-conds (make-weak-key-hash-table)) diff --git a/module/srfi/srfi-19.scm b/module/srfi/srfi-19.scm index 8a86b35fa..6148b55b2 100644 --- a/module/srfi/srfi-19.scm +++ b/module/srfi/srfi-19.scm @@ -738,9 +738,6 @@ (or (= (modulo year 400) 0) (and (= (modulo year 4) 0) (not (= (modulo year 100) 0))))) -(define (leap-year? date) - (priv:leap-year? (date-year date))) - ;; Map 1-based month number M to number of days in the year before the ;; start of month M (in a non-leap year). (define priv:month-assoc '((1 . 0) (2 . 31) (3 . 59) (4 . 90) diff --git a/module/system/base/compile.scm b/module/system/base/compile.scm index da3f7cd98..0caa24809 100644 --- a/module/system/base/compile.scm +++ b/module/system/base/compile.scm @@ -1,6 +1,6 @@ ;;; High-level compiler interface -;; Copyright (C) 2001, 2009 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2009, 2010 Free Software Foundation, Inc. ;;; This library is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU Lesser General Public @@ -109,11 +109,6 @@ (ensure-writable-dir (dirname dir)) (mkdir dir)))) -(define (dsu-sort list key less) - (map cdr - (stable-sort (map (lambda (x) (cons (key x) x)) list) - (lambda (x y) (less (car x) (car y)))))) - ;;; This function is among the trickiest I've ever written. I tried many ;;; variants. In the end, simple is best, of course. ;;; diff --git a/module/texinfo.scm b/module/texinfo.scm index d792cfa5d..0b8285e0f 100644 --- a/module/texinfo.scm +++ b/module/texinfo.scm @@ -1,6 +1,6 @@ ;;;; (texinfo) -- parsing of texinfo into SXML ;;;; -;;;; Copyright (C) 2009 Free Software Foundation, Inc. +;;;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. ;;;; Copyright (C) 2004, 2009 Andy Wingo ;;;; Copyright (C) 2001,2002 Oleg Kiselyov ;;;; @@ -427,8 +427,6 @@ Examples: (read-char port)) ; skip \n that follows \r line))) -(define ascii->char integer->char) - (define (skip-whitespace port) (skip-while '(#\space #\tab #\return #\newline) port)) diff --git a/module/texinfo/html.scm b/module/texinfo/html.scm index f9faf6a36..1e37fdc5b 100644 --- a/module/texinfo/html.scm +++ b/module/texinfo/html.scm @@ -1,6 +1,6 @@ ;;;; (texinfo html) -- translating stexinfo into shtml ;;;; -;;;; Copyright (C) 2009 Free Software Foundation, Inc. +;;;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. ;;;; Copyright (C) 2003,2004,2009 Andy Wingo ;;;; ;;;; This library is free software; you can redistribute it and/or @@ -210,8 +210,6 @@ name, @code{#}, and the node name." '(page setfilename setchapternewpage iftex ifinfo ifplaintext ifxml sp vskip menu ignore syncodeindex comment c dircategory direntry top shortcontents cindex printindex)) -(define (ignored? tag) - (memq tag ignore-list)) (define rules `((% *preorder* . ,(lambda args args)) ;; Keep these around... diff --git a/module/texinfo/indexing.scm b/module/texinfo/indexing.scm index bc3d7ab74..d7d10cd69 100644 --- a/module/texinfo/indexing.scm +++ b/module/texinfo/indexing.scm @@ -1,6 +1,6 @@ ;;;; (texinfo indexing) -- indexing stexinfo ;;;; -;;;; Copyright (C) 2009 Free Software Foundation, Inc. +;;;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. ;;;; Copyright (C) 2003,2004,2009 Andy Wingo ;;;; ;;;; This library is free software; you can redistribute it and/or @@ -32,9 +32,6 @@ #:use-module (srfi srfi-13) #:export (stexi-extract-index)) -(define (def-name def) - (cadr (assq 'name (cdadr def)))) - (define defines '(deftp defcv defivar deftypeivar defop deftypeop defmethod deftypemethod defopt defvr defvar deftypevr deftypevar deffn diff --git a/module/texinfo/plain-text.scm b/module/texinfo/plain-text.scm index dfa4c9acc..93a7c1d99 100644 --- a/module/texinfo/plain-text.scm +++ b/module/texinfo/plain-text.scm @@ -1,6 +1,6 @@ ;;;; (texinfo plain-text) -- rendering stexinfo as plain text ;;;; -;;;; Copyright (C) 2009 Free Software Foundation, Inc. +;;;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. ;;;; Copyright (C) 2003,2004,2009 Andy Wingo ;;;; ;;;; This library is free software; you can redistribute it and/or @@ -208,9 +208,6 @@ (define (passthrough tag . body) (stexi->plain-text body)) -(define (ignore . args) - "") - (define (texinfo tag args . body) (let ((title (chapter 'foo (arg-req 'title args)))) (string-append title (stexi->plain-text body))))