Changeset 12529

Timestamp:

03/13/10 22:51:23 (13 years ago)

Author:

ehuelsmann

Message:

Re #38: CLASSP can't be checked with instanceof alone any longer.

Location:

branches/metaclass/abcl/src/org/armedbear/lisp

Files:

• Primitives.java (modified) (1 diff)
• compiler-pass2.lisp (modified) (4 diffs)

branches/metaclass/abcl/src/org/armedbear/lisp/Primitives.java

@@ -5604 +5604 @@
         @Override
         public LispObject execute(LispObject arg) {
-            return arg instanceof LispClass ? T : NIL;
+            return (arg instanceof LispClass) ? T : arg.typep(Symbol.CLASS);
         }
     };

branches/metaclass/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -3403 +3403 @@
                     (CHAR=              p2-test-char=)
                     (CHARACTERP         p2-test-characterp)
-                    (CLASSP             p2-test-classp)
                     (CONSP              p2-test-consp)
                     (CONSTANTP          p2-test-constantp)
@@ -3543 +3542 @@
 (defun p2-test-special-variable-p (form)
   (p2-test-predicate form "isSpecialVariable"))
-
-(defun p2-test-classp (form)
-  (p2-test-instanceof-predicate form +lisp-class-class+))
 
 (defun p2-test-symbolp (form)
@@ -4827 +4823 @@
 (defun p2-characterp (form target representation)
   (p2-instanceof-predicate form target representation +lisp-character-class+))
-
-(defun p2-classp (form target representation)
-  (p2-instanceof-predicate form target representation +lisp-class-class+))
 
 (defun p2-consp (form target representation)
@@ -8876 +8869 @@
   (install-p2-handler 'char=               'p2-char=)
   (install-p2-handler 'characterp          'p2-characterp)
-  (install-p2-handler 'classp              'p2-classp)
   (install-p2-handler 'coerce-to-function  'p2-coerce-to-function)
   (install-p2-handler 'cons                'p2-cons)