Changeset 12119

Timestamp:

08/27/09 09:33:21 (14 years ago)

Author:

Mark Evenson

Message:

Fix ticket#61 for THE evaluated with DEFTYPEd forms.

Shouldn't the call to the Lisp-side TYPEP be added at the "top-level"
typep() defined on LispObject?

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• SpecialOperators.java (modified) (1 diff)
• compiler-pass2.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java

@@ -377 +377 @@
         if (type instanceof Symbol
             || type instanceof BuiltInClass)
-            if (rv.typep(type) == NIL)
-                type_error(rv, type);
-
+    if (rv.typep(type) == NIL) {
+      // Try to call the Lisp-side TYPEP, as we will miss
+      // DEFTYPEd types.
+      Symbol typep
+        = PACKAGE_SYS.findAccessibleSymbol("TYPEP");
+      LispObject result
+        = typep.getSymbolFunction().execute(rv, type);
+      if (result == NIL) {
+        type_error(rv, type);
+      }
+    }
         return rv;
       }

trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -7916 +7916 @@
                    ((eq name 'LET)
                     (p2-let/let*-node form target representation))
-                   ((eq name 'SETF) ;; SETF functions create
+;;                   ((eq name 'LABELS)
+;;                    (p2-labels-node form target representation))
+;;                   ((eq name 'SETF) ;; SETF functions create
                     ;; consp block names, if we're unlucky
-                    (p2-block-node form target representation))
+;;                    (p2-block-node form target representation))
                    (t
                     (print name)