New tests of excess arguments now ignored.

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

diff --git a/ice-9/hcons.scm b/ice-9/hcons.scm
index ebbf586..b6c0816 100644 (file)
--- a/ice-9/hcons.scm
+++ b/ice-9/hcons.scm
@@ -1,25 +1,27 @@
 ;;; installed-scm-file
 
-;;;;   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+;;;;   Copyright (C) 1995, 1996, 1998, 2001, 2003 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 hcons))
+(define-module  (ice-9 hcons)
+  :export (hashq-cons-hash hashq-cons-assoc hashq-cons-get-handle
+          hashq-cons-create-handle! hashq-cons-ref hashq-cons-set! hashq-cons
+          hashq-conser make-gc-buffer))
 
 \f
 ;;; {Eq? hash-consing}
@@ -30,12 +32,12 @@
 ;;; A hash conser does not contribute life to the pairs it returns.
 ;;;
 
-(define-public (hashq-cons-hash pair n)
+(define (hashq-cons-hash pair n)
   (modulo (logxor (hashq (car pair) 4194303)
                  (hashq (cdr pair) 4194303))
          n))
 
-(define-public (hashq-cons-assoc key l)
+(define (hashq-cons-assoc key l)
   (and (not (null? l))
        (or (and (pair? l)              ; If not a pair, use its cdr?
                (pair? (car l))
@@ -45,22 +47,22 @@
                (car l))
           (hashq-cons-assoc key (cdr l)))))
 
-(define-public (hashq-cons-get-handle table key)
-  (hashx-get-handle hashq-cons-hash hashq-cons-assoc table key #f))
+(define (hashq-cons-get-handle table key)
+  (hashx-get-handle hashq-cons-hash hashq-cons-assoc table key))
 
-(define-public (hashq-cons-create-handle! table key init)
+(define (hashq-cons-create-handle! table key init)
   (hashx-create-handle! hashq-cons-hash hashq-cons-assoc table key init))
 
-(define-public (hashq-cons-ref table key)
+(define (hashq-cons-ref table key)
   (hashx-ref hashq-cons-hash hashq-cons-assoc table key #f))
 
-(define-public (hashq-cons-set! table key val)
+(define (hashq-cons-set! table key val)
   (hashx-set! hashq-cons-hash hashq-cons-assoc table key val))
 
-(define-public (hashq-cons table a d)
+(define (hashq-cons table a d)
   (car (hashq-cons-create-handle! table (cons a d) #f)))
 
-(define-public (hashq-conser hash-tab-or-size)
+(define (hashq-conser hash-tab-or-size)
   (let ((table (if (vector? hash-tab-or-size)
                   hash-tab-or-size
                   (make-doubly-weak-hash-table hash-tab-or-size))))
@@ -69,7 +71,7 @@
 
 \f
 
-(define-public (make-gc-buffer n)
+(define (make-gc-buffer n)
   (let ((ring (make-list n #f)))
     (append! ring ring)
     (lambda (next)