Changeset 5674

Timestamp:

Jan 2, 2007, 8:57:53 AM (18 years ago)

Author:

Gary Byers

Message:

Keep fixing CTYPECASE.

File:

• trunk/ccl/lib/macros.lisp (modified) (3 diffs)

trunk/ccl/lib/macros.lisp

@@ -870 +870 @@
         (if (eq construct 'etypecase)
             (push `(t (values (%err-disp #.$XWRONGTYPE ,key-var ',types))) body)
-            (push `(t (setf ,key-var (ensure-value-of-type  ,key-var ',types ',keyform))
+            (push `(t (setf ,keyform (ensure-value-of-type  ,key-var ',types ',keyform))
                       (go ,e-c-p)) body))))
     `(cond ,@(nreverse body))))
@@ -892 +892 @@
        ,(typecase-aux key-var clauses 'etypecase))))
 
-(defmacro ctypecase (keyform &body clauses)
-  "CTYPECASE Keyform {(Type Form*)}*
+(defmacro ctypecase (keyplace &body clauses)
+  "CTYPECASE Key {(Type Form*)}*
   Evaluates the Forms in the first clause for which TYPEP of Keyform and Type
   is true. If no form is satisfied then a correctable error is signalled."
@@ -899 +899 @@
         (tag (gensym)))
     `(prog (,key-var)
-       (setq ,key-var ,keyform)
        ,tag
-       (return ,(typecase-aux key-var clauses tag keyform)))))
+       (setq ,key-var ,keyplace)
+       (return ,(typecase-aux key-var clauses tag keyplace)))))
 
 (defmacro destructuring-bind (lambda-list expression &body body)