Changeset 12529


Ignore:
Timestamp:
03/13/10 22:51:23 (11 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/metaclass/abcl/src/org/armedbear/lisp/Primitives.java

    r12528 r12529  
    56045604        @Override
    56055605        public LispObject execute(LispObject arg) {
    5606             return arg instanceof LispClass ? T : NIL;
     5606            return (arg instanceof LispClass) ? T : arg.typep(Symbol.CLASS);
    56075607        }
    56085608    };
  • branches/metaclass/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

    r12415 r12529  
    34033403                    (CHAR=              p2-test-char=)
    34043404                    (CHARACTERP         p2-test-characterp)
    3405                     (CLASSP             p2-test-classp)
    34063405                    (CONSP              p2-test-consp)
    34073406                    (CONSTANTP          p2-test-constantp)
     
    35433542(defun p2-test-special-variable-p (form)
    35443543  (p2-test-predicate form "isSpecialVariable"))
    3545 
    3546 (defun p2-test-classp (form)
    3547   (p2-test-instanceof-predicate form +lisp-class-class+))
    35483544
    35493545(defun p2-test-symbolp (form)
     
    48274823(defun p2-characterp (form target representation)
    48284824  (p2-instanceof-predicate form target representation +lisp-character-class+))
    4829 
    4830 (defun p2-classp (form target representation)
    4831   (p2-instanceof-predicate form target representation +lisp-class-class+))
    48324825
    48334826(defun p2-consp (form target representation)
     
    88768869  (install-p2-handler 'char=               'p2-char=)
    88778870  (install-p2-handler 'characterp          'p2-characterp)
    8878   (install-p2-handler 'classp              'p2-classp)
    88798871  (install-p2-handler 'coerce-to-function  'p2-coerce-to-function)
    88808872  (install-p2-handler 'cons                'p2-cons)
Note: See TracChangeset for help on using the changeset viewer.