0.pre7.141:

[sbcl.git] / src / code / target-hash-table.lisp

diff --git a/src/code/target-hash-table.lisp b/src/code/target-hash-table.lisp
index 4db23f4..e5b5761 100644 (file)
--- a/src/code/target-hash-table.lisp
+++ b/src/code/target-hash-table.lisp
@@ -179,7 +179,7 @@
 
 (defun hash-table-count (hash-table)
   #!+sb-doc
-  "Returns the number of entries in the given HASH-TABLE."
+  "Return the number of entries in the given HASH-TABLE."
   (declare (type hash-table hash-table)
           (values index))
   (hash-table-number-entries hash-table))
@@ -504,8 +504,8 @@
 
 (defun remhash (key hash-table)
   #!+sb-doc
-  "Remove the entry in HASH-TABLE associated with KEY. Returns T if there
-   was such an entry, and NIL if not."
+  "Remove the entry in HASH-TABLE associated with KEY. Return T if there
+   was such an entry, or NIL if not."
   (declare (type hash-table hash-table)
           (values (member t nil)))
   (without-gcing
@@ -642,15 +642,13 @@
 ;;;      not only parts of the system which are defined after DEFUN MAPHASH.
 ;;;   2. It could be conditional on compilation policy, so that
 ;;;      it could be compiled as a full call instead of an inline
-;;;      expansion when SPACE>SPEED. (Not only would this save space,
-;;;      it might actually be faster when a call is made from byte-compiled
-;;;      code.)
+;;;      expansion when SPACE>SPEED.
 (declaim (inline maphash))
 (defun maphash (function-designator hash-table)
   #!+sb-doc
   "For each entry in HASH-TABLE, call the designated two-argument function
    on the key and value of the entry. Return NIL."
-  (let ((fun (%coerce-callable-to-function function-designator))
+  (let ((fun (%coerce-callable-to-fun function-designator))
        (size (length (hash-table-next-vector hash-table))))
     (declare (type function fun))
     (do ((i 1 (1+ i)))
@@ -667,7 +665,7 @@
 
 ;;; Return a list of keyword args and values to use for MAKE-HASH-TABLE
 ;;; when reconstructing HASH-TABLE.
-(defun hash-table-ctor-args (hash-table)
+(defun %hash-table-ctor-args (hash-table)
   (when (hash-table-weak-p hash-table)
     ;; FIXME: This might actually work with no trouble, but as of
     ;; sbcl-0.6.12.10 when this code was written, weak hash tables
@@ -680,7 +678,7 @@
     :rehash-threshold ',(hash-table-rehash-threshold hash-table)))
 
 ;;; Return an association list representing the same data as HASH-TABLE.
-(defun hash-table-alist (hash-table)
+(defun %hash-table-alist (hash-table)
   (let ((result nil))
     (maphash (lambda (key value)
               (push (cons key value) result))
@@ -691,7 +689,7 @@
 ;;; so that we can use this for the *PRINT-READABLY* case in
 ;;; PRINT-OBJECT (HASH-TABLE T) without having to worry about LET
 ;;; forms and readable gensyms and stuff.
-(defun stuff-hash-table (hash-table alist)
+(defun %stuff-hash-table (hash-table alist)
   (dolist (x alist)
     (setf (gethash (car x) hash-table) (cdr x)))
   hash-table)
@@ -710,11 +708,11 @@
         (with-standard-io-syntax
          (format stream
                  "#.~W"
-                 `(stuff-hash-table (make-hash-table ,@(hash-table-ctor-args
-                                                        hash-table))
-                                    ',(hash-table-alist hash-table)))))))
+                 `(%stuff-hash-table (make-hash-table ,@(%hash-table-ctor-args
+                                                         hash-table))
+                                    ',(%hash-table-alist hash-table)))))))
 
 (def!method make-load-form ((hash-table hash-table) &optional environment)
   (declare (ignore environment))
-  (values `(make-hash-table ,@(hash-table-ctor-args hash-table))
-         `(stuff-hash-table ,hash-table ',(hash-table-alist hash-table))))
+  (values `(make-hash-table ,@(%hash-table-ctor-args hash-table))
+         `(%stuff-hash-table ,hash-table ',(%hash-table-alist hash-table))))