X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmacros.lisp;h=3ea38a5e85754c1fee349f6297d38b2a51482787;hb=422b88abf96f4842a3d0999cd3b80d96f5a153d6;hp=c91b3f0b011834b2cbcbe059ca7819917d18df29;hpb=a0e89f991d9bb20341ea9a944c8fe2acf7f96b21;p=sbcl.git

diff --git a/src/compiler/macros.lisp b/src/compiler/macros.lisp
index c91b3f0..3ea38a5 100644
--- a/src/compiler/macros.lisp
+++ b/src/compiler/macros.lisp
@@ -149,7 +149,7 @@
 ) ; EVAL-WHEN
 
 ;;; Define a new class of boolean attributes, with the attributes
-;;; having the specified Attribute-Names. Name is the name of the
+;;; having the specified ATTRIBUTE-NAMES. NAME is the name of the
 ;;; class, which is used to generate some macros to manipulate sets of
 ;;; the attributes:
 ;;;
@@ -239,10 +239,10 @@
 ;;;   those in Attr2.
 (defmacro attributes-union (&rest attributes)
   `(the attributes
-	(logior ,@(mapcar #'(lambda (x) `(the attributes ,x)) attributes))))
+	(logior ,@(mapcar (lambda (x) `(the attributes ,x)) attributes))))
 (defmacro attributes-intersection (&rest attributes)
   `(the attributes
-	(logand ,@(mapcar #'(lambda (x) `(the attributes ,x)) attributes))))
+	(logand ,@(mapcar (lambda (x) `(the attributes ,x)) attributes))))
 (declaim (ftype (function (attributes attributes) boolean) attributes=))
 #!-sb-fluid (declaim (inline attributes=))
 (defun attributes= (attr1 attr2)
@@ -386,13 +386,10 @@
 ;;;             which means efficiency notes will be generated when this
 ;;;             transform fails even if INHIBIT-WARNINGS=SPEED (but not if
 ;;;             INHIBIT-WARNINGS>SPEED).
-;;;   :WHEN {:NATIVE | :BYTE | :BOTH}
-;;;           - Indicates whether this transform applies to native code,
-;;;             byte-code or both (default :native.)
 (defmacro deftransform (name (lambda-list &optional (arg-types '*)
 					  (result-type '*)
 					  &key result policy node defun-only
-					  eval-name important (when :native))
+					  eval-name important)
 			     &body body-decls-doc)
   (when (and eval-name defun-only)
     (error "can't specify both DEFUN-ONLY and EVAL-NAME"))
@@ -431,10 +428,9 @@
 		,(if eval-name
 		     ``(function ,,arg-types ,,result-type)
 		     `'(function ,arg-types ,result-type))
-		#'(lambda ,@stuff)
+		(lambda ,@stuff)
 		,doc
-		,(if important t nil)
-		,when)))))))
+		,(if important t nil))))))))
 
 ;;;; DEFKNOWN and DEFOPTIMIZER
 
@@ -547,8 +543,8 @@
 	    ,(parse-deftransform lambda-list body n-args
 				 `(return-from ,name nil))))
 	,@(when (consp what)
-	    `((setf (,(symbolicate "FUNCTION-INFO-" (second what))
-		     (function-info-or-lose ',(first what)))
+	    `((setf (,(symbolicate "FUN-INFO-" (second what))
+		     (fun-info-or-lose ',(first what)))
 		    #',name)))))))
 
 ;;;; IR groveling macros
@@ -685,7 +681,7 @@
       #'closure-needing-ir1-environment-from-node)))
 (defun %with-ir1-environment-from-node (node fun)
   (declare (type node node) (type function fun))
-  (let ((*current-component* (block-component (node-block node)))
+  (let ((*current-component* (node-component node))
 	(*lexenv* (node-lexenv node))
 	(*current-path* (node-source-path node)))
     (aver-live-component *current-component*)
@@ -694,8 +690,8 @@
 ;;; Bind the hashtables used for keeping track of global variables,
 ;;; functions, etc. Also establish condition handlers.
 (defmacro with-ir1-namespace (&body forms)
-  `(let ((*free-variables* (make-hash-table :test 'eq))
-	 (*free-functions* (make-hash-table :test 'equal))
+  `(let ((*free-vars* (make-hash-table :test 'eq))
+	 (*free-funs* (make-hash-table :test 'equal))
 	 (*constants* (make-hash-table :test 'equal))
 	 (*source-paths* (make-hash-table :test 'eq)))
      (handler-bind ((compiler-error #'compiler-error-handler)
@@ -815,10 +811,10 @@
 (declaim (ftype (function (&optional unsigned-byte stream) (values)) event-statistics))
 (defun event-statistics (&optional (min-count 1) (stream *standard-output*))
   (collect ((info))
-    (maphash #'(lambda (k v)
-		 (declare (ignore k))
-		 (when (>= (event-info-count v) min-count)
-		   (info v)))
+    (maphash (lambda (k v)
+	       (declare (ignore k))
+	       (when (>= (event-info-count v) min-count)
+		 (info v)))
 	     *event-info*)
     (dolist (event (sort (info) #'> :key #'event-info-count))
       (format stream "~6D: ~A~%" (event-info-count event)
@@ -828,9 +824,9 @@
 
 (declaim (ftype (function nil (values)) clear-event-statistics))
 (defun clear-event-statistics ()
-  (maphash #'(lambda (k v)
-	       (declare (ignore k))
-	       (setf (event-info-count v) 0))
+  (maphash (lambda (k v)
+	     (declare (ignore k))
+	     (setf (event-info-count v) 0))
 	   *event-info*)
   (values))