X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmacros.lisp;h=0a5d134121ec218197cb7c5494a2fda793240229;hb=369029d73f198b59135c6c005b7a70ae5a753650;hp=89b35bbfa141199de7d78cb1f0bde64fc150219d;hpb=09957fcf57b49ed5ae5f05d62ad12d7ddbfd8e1d;p=sbcl.git

diff --git a/src/compiler/macros.lisp b/src/compiler/macros.lisp
index 89b35bb..0a5d134 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:
 ;;;
@@ -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"))
@@ -433,8 +430,7 @@
 		     `'(function ,arg-types ,result-type))
 		(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
@@ -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)
@@ -713,6 +709,11 @@
     `(if ,n-res
 	 (values (cdr ,n-res) t)
 	 (values nil nil))))
+
+;;;
+(defmacro with-continuation-type-assertion ((cont ctype context) &body body)
+  `(let ((*lexenv* (ir1ize-the-or-values ,ctype ,cont *lexenv* ,context)))
+     ,@body))
 
 ;;;; the EVENT statistics/trace utility