0.8.3.94:

[sbcl.git] / src / compiler / vmdef.lisp

diff --git a/src/compiler/vmdef.lisp b/src/compiler/vmdef.lisp
index fb6c554..3b6fb42 100644 (file)
--- a/src/compiler/vmdef.lisp
+++ b/src/compiler/vmdef.lisp
@@ -45,9 +45,9 @@
 (defun meta-sc-number-or-lose (x)
   (the sc-number (sc-number (meta-sc-or-lose x))))
 \f
-;;;; side-effect classes
+;;;; side effect classes
 
-(def-boolean-attribute vop
+(!def-boolean-attribute vop
   any)
 \f
 ;;;; move/coerce definition
@@ -102,7 +102,7 @@
   ;; -- AL 20010218
   ;;
   ;; See also the description of VOP-INFO-TARGETS. -- APD, 2002-01-30
-  (defconstant max-vop-tn-refs 256))
+  (def!constant max-vop-tn-refs 256))
 
 (defvar *vop-tn-refs* (make-array max-vop-tn-refs :initial-element nil))
 (defvar *using-vop-tn-refs* nil)
@@ -113,7 +113,7 @@
 
 (pushnew 'flush-vop-tn-refs *before-gc-hooks*)
 
-(defconstant sc-bits (integer-length (1- sc-number-limit)))
+(def!constant sc-bits (integer-length (1- sc-number-limit)))
 
 (defun emit-generic-vop (node block template args results &optional info)
   (%emit-generic-vop node block template args results info))
@@ -199,7 +199,7 @@
        #'<=
        :key #'template-cost))
 \f
-;;; Return a function type specifier describing Template's type computed
+;;; Return a function type specifier describing TEMPLATE's type computed
 ;;; from the operand type restrictions.
 (defun template-type-specifier (template)
   (declare (type template template))
@@ -208,10 +208,7 @@
                    (if (eq x '*)
                        t
                        (ecase (first x)
-                         (:or `(or ,@(mapcar (lambda (type)
-                                               (type-specifier
-                                                (primitive-type-type
-                                                 type)))
+                         (:or `(or ,@(mapcar #'primitive-type-specifier
                                              (rest x))))
                          (:constant `(constant-arg ,(third x)))))))
             `(,@(mapcar #'frob types)