X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ftypetran.lisp;h=ddd606605eabfa31237dbba151e87e2e32473355;hb=5edd74f6911093805a009a152b32216b3dba59f7;hp=1a332aa000e1ac09baa281ddcef39215a7b45580;hpb=1817553af5c3e33486994d5d4079fca26d910ffd;p=sbcl.git

diff --git a/src/compiler/typetran.lisp b/src/compiler/typetran.lisp
index 1a332aa..ddd6066 100644
--- a/src/compiler/typetran.lisp
+++ b/src/compiler/typetran.lisp
@@ -87,7 +87,7 @@
 ;;; whether the single argument is known to (not) be of the
 ;;; appropriate type, expanding to T or NIL as appropriate.
 (deftransform fold-type-predicate ((object) * * :node node :defun-only t)
-  (let ((ctype (gethash (leaf-name
+  (let ((ctype (gethash (leaf-source-name
 			 (ref-leaf
 			  (continuation-use
 			   (basic-combination-fun node))))
@@ -97,7 +97,7 @@
 
 ;;; If FIND-CLASS is called on a constant class, locate the CLASS-CELL
 ;;; at load time.
-(deftransform find-class ((name) ((constant-argument symbol)) *
+(deftransform find-class ((name) ((constant-arg symbol)) *
 			  :when :both)
   (let* ((name (continuation-value name))
 	 (cell (find-class-cell name)))
@@ -145,7 +145,7 @@
 ;;;;
 ;;;; See also VM dependent transforms.
 
-(def-source-transform atom (x)
+(define-source-transform atom (x)
   `(not (consp ,x)))
 
 ;;;; TYPEP source transform
@@ -271,8 +271,8 @@
 	     (satisfies `(if (funcall #',(second spec) ,object) t nil))
 	     ((not and)
 	      (once-only ((n-obj object))
-		`(,(first spec) ,@(mapcar #'(lambda (x)
-					      `(typep ,n-obj ',x))
+		`(,(first spec) ,@(mapcar (lambda (x)
+					    `(typep ,n-obj ',x))
 					  (rest spec))))))))))
 
 ;;; Do source transformation for TYPEP of a known union type. If a
@@ -485,7 +485,7 @@
 ;;; to that predicate. Otherwise, we dispatch off of the type's type.
 ;;; These transformations can increase space, but it is hard to tell
 ;;; when, so we ignore policy and always do them. 
-(def-source-transform typep (object spec)
+(define-source-transform typep (object spec)
   ;; KLUDGE: It looks bad to only do this on explicitly quoted forms,
   ;; since that would overlook other kinds of constants. But it turns
   ;; out that the DEFTRANSFORM for TYPEP detects any constant
@@ -507,8 +507,8 @@
 	      (member-type
 	       `(member ,object ',(member-type-members type)))
 	      (args-type
-	       (compiler-warning "illegal type specifier for TYPEP: ~S"
-				 (cadr spec))
+	       (compiler-warn "illegal type specifier for TYPEP: ~S"
+			      (cadr spec))
 	       `(%typep ,object ,spec))
 	      (t nil))
 	    (typecase type