Changeset 5972

Timestamp:

Mar 2, 2007, 4:05:02 AM (18 years ago)

Author:

Gary Byers

Message:

(the <type> <constant>) transforms to <constant> if constant is of type
<type>.)

Do we need an ignore-errors here ? Or does <type> need to be defined ?

File:

• trunk/ccl/compiler/nx0.lisp (modified) (1 diff)

trunk/ccl/compiler/nx0.lisp

@@ -1999 +1999 @@
        (when (eq sym 'the)
          (destructuring-bind (typespec thing) (cdr form)
-           (multiple-value-bind (newform win) (nx-transform thing environment)
-             (when win
-               (setq changed t)
-               (if (and (self-evaluating-p newform)
-                        (typep newform typespec))
-                 (setq form newform)
-                 (setq form `(the ,typespec ,newform)))
-               (go DONE)))))
+           (if (constantp thing)
+             (progn
+               (setq form thing form thing)
+               (go LOOP))
+             (multiple-value-bind (newform win) (nx-transform thing environment)
+               (when win
+                 (setq changed t)
+                 (if (and (self-evaluating-p newform)
+                          (typep newform typespec))
+                   (setq form newform)
+                   (setq form `(the ,typespec ,newform)))
+                 (go DONE))))))
        (when (nx-quoted-form-p form)
          (when (self-evaluating-p (%cadr form))