Changeset 14309

Timestamp:

Sep 28, 2010, 2:07:50 PM (14 years ago)

Author:

R. Matthew Emerson

Message:

A somewhat inelegant change to nx1-typespec-for-typep: when called
with :whine nil, not only do we not warn, but we don't replace an
unknown or invalid type with *. Instead, we return the original
typespec so that the caller will have it available.

Right now, the only thing that calls this with :whine nil is
the the macro TYPECHECK, which is used in the expansion of
defstruct.

(We can't just check for a return value of * and assume that
the type was unknown: the * could be because of a values
type specifier.)

File:

• trunk/source/compiler/nx1.lisp (modified) (1 diff)

trunk/source/compiler/nx1.lisp

@@ -52 +52 @@
     (let* ((ctype (handler-case (values-specifier-type (nx-target-type typespec) env)
                     (parse-unknown-type (c)
-                      (when whine
-                        (nx1-whine :unknown-type-in-declaration (parse-unknown-type-specifier c)))
-                      *wild-type*)
+                      (if whine
+                        (progn
+                          (nx1-whine :unknown-type-in-declaration
+                                     (parse-unknown-type-specifier c))
+                          *wild-type*)
+                        (specifier-type typespec env)))
                     (program-error (c)
-                      (when whine
-                        (nx1-whine :invalid-type typespec c))
-                      *wild-type*)))
+                      (if whine
+                        (progn
+                          (nx1-whine :invalid-type typespec c)
+                          *wild-type*)
+                        (specifier-type typespec)))))
            (new (ctype-spec ctype)))
       (nx-target-type (type-specifier (if new (specifier-type new) ctype))))))