New tests of excess arguments now ignored.

[bpt/guile.git] / ice-9 / ls.scm

diff --git a/ice-9/ls.scm b/ice-9/ls.scm
index ed03ccc..8c204fe 100644 (file)
--- a/ice-9/ls.scm
+++ b/ice-9/ls.scm
@@ -1,25 +1,26 @@
 ;;;; ls.scm --- functions for browsing modules
 ;;;;
-;;;;   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+;;;;   Copyright (C) 1995, 1996, 1997, 1999, 2001 Free Software Foundation, Inc.
 ;;;; 
-;;;; This program is free software; you can redistribute it and/or modify
-;;;; it under the terms of the GNU General Public License as published by
-;;;; the Free Software Foundation; either version 2, or (at your option)
-;;;; any later version.
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 2.1 of the License, or (at your option) any later version.
 ;;;; 
-;;;; This program is distributed in the hope that it will be useful,
+;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;;; Lesser General Public License for more details.
 ;;;; 
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with this software; see the file COPYING.  If not, write to
-;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;;;; Boston, MA 02111-1307 USA
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ;;;; 
 \f
 (define-module (ice-9 ls)
-  :use-module (ice-9 common-list))
+  :use-module (ice-9 common-list)
+  :export (local-definitions-in definitions-in ls lls
+          recursive-local-define))
 
 ;;;;
 ;;;    local-definitions-in root name
@@ -35,6 +36,9 @@
 ;;;
 ;;;    ls . various-names
 ;;;
+;;;            With no arguments, return a list of definitions in
+;;;            `(current-module)'.
+;;;
 ;;;            With just one argument, interpret that argument as the
 ;;;            name of a subdirectory of the current module and
 ;;;            return a list of names defined there.
@@ -45,8 +49,11 @@
 ;;;                     (<subdir-name> . <names-defined-there>)
 ;;;                     ...)
 ;;;
+;;;     lls . various-names
+;;;
+;;;            Analogous to `ls', but with local definitions only.
 
-(define-public (local-definitions-in root names)
+(define (local-definitions-in root names)
   (let ((m (nested-ref root names))
        (answer '()))
     (if (not (module? m))
@@ -54,7 +61,7 @@
        (module-for-each (lambda (k v) (set! answer (cons k answer))) m))
     answer))
 
-(define-public (definitions-in root names)
+(define (definitions-in root names)
   (let ((m (nested-ref root names)))
     (if (not (module? m))
        m
@@ -63,23 +70,27 @@
                      (map (lambda (m2) (definitions-in m2 '()))
                           (module-uses m)))))))
 
-(define-public (ls . various-refs)
-  (and various-refs
+(define (ls . various-refs)
+  (if (pair? various-refs)
        (if (cdr various-refs)
           (map (lambda (ref)
                  (cons ref (definitions-in (current-module) ref)))
                various-refs)
-          (definitions-in (current-module) (car various-refs)))))
+         (definitions-in (current-module) (car various-refs)))
+      (definitions-in (current-module) '())))
 
-(define-public (lls . various-refs)
-  (and various-refs
+(define (lls . various-refs)
+  (if (pair? various-refs)
        (if (cdr various-refs)
           (map (lambda (ref)
                  (cons ref (local-definitions-in (current-module) ref)))
                various-refs)
-          (local-definitions-in (current-module) (car various-refs)))))
+         (local-definitions-in (current-module) (car various-refs)))
+      (local-definitions-in (current-module) '())))
 
-(define-public (recursive-local-define name value)
+(define (recursive-local-define name value)
   (let ((parent (reverse! (cdr (reverse name)))))
     (and parent (make-modules-in (current-module) parent))
     (local-define name value)))
+
+;;; ls.scm ends here