X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Finfo-functions.lisp;h=52cf65f1f2dc2f8537b21dffcdbf5d59f6a590b5;hb=422b88abf96f4842a3d0999cd3b80d96f5a153d6;hp=ab6cc28312c2838169e413631e4264ee5de5df9a;hpb=d40a76606c86722b0aef8179155f9f2840739b72;p=sbcl.git

diff --git a/src/compiler/info-functions.lisp b/src/compiler/info-functions.lisp
index ab6cc28..52cf65f 100644
--- a/src/compiler/info-functions.lisp
+++ b/src/compiler/info-functions.lisp
@@ -60,12 +60,12 @@
   ;; in EVAL-WHEN (:COMPILE) inside something like DEFSTRUCT, in which
   ;; case it's reasonable style. Either way, NAME is no longer a free
   ;; function.)
-  (when (boundp '*free-functions*) ; when compiling
-    (remhash name *free-functions*))
+  (when (boundp '*free-funs*) ; when compiling
+    (remhash name *free-funs*))
 
   ;; recording the ordinary case
   (setf (info :function :kind name) :function)
-  (note-if-setf-function-and-macro name)
+  (note-if-setf-fun-and-macro name)
 
   (values))
 
@@ -75,7 +75,7 @@
 ;;; warning. Due to the weak semantics of the (SETF FUNCTION) name, we
 ;;; can't assume that they aren't just naming a function (SETF FOO)
 ;;; for the heck of it. NAME is already known to be well-formed.
-(defun note-if-setf-function-and-macro (name)
+(defun note-if-setf-fun-and-macro (name)
   (when (consp name)
     (when (or (info :setf :inverse name)
 	      (info :setf :expander name))
@@ -151,7 +151,7 @@
    else returns NIL. If ENV is unspecified or NIL, use the global
    environment only."
   (declare (symbol symbol))
-  (let* ((fenv (when env (sb!c::lexenv-functions env)))
+  (let* ((fenv (when env (sb!c::lexenv-funs env)))
 	 (local-def (cdr (assoc symbol fenv))))
     (cond (local-def
 	   (if (and (consp local-def) (eq (car local-def) 'MACRO))
@@ -189,12 +189,11 @@
 
 (defun sb!xc:compiler-macro-function (name &optional env)
   #!+sb-doc
-  "If NAME names a compiler-macro, returns the expansion function,
-   else returns NIL. Note: if the name is shadowed in ENV by a local
-   definition, or declared NOTINLINE, NIL is returned. Can be
-   set with SETF."
+  "If NAME names a compiler-macro, return the expansion function, else
+   return NIL. Note: if the name is shadowed in ENV by a local definition,
+   or declared NOTINLINE, NIL is returned. Can be set with SETF."
   (let ((found (and env
-		    (cdr (assoc name (sb!c::lexenv-functions env)
+		    (cdr (assoc name (sb!c::lexenv-funs env)
 				:test #'equal)))))
     (unless (eq (cond ((sb!c::defined-fun-p found)
 		       (sb!c::defined-fun-inlinep found))