Changeset 14497


Ignore:
Timestamp:
05/15/13 06:42:41 (9 years ago)
Author:
rschlatte
Message:

Remove direct references to standard-generic-function class from Java

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/FuncallableStandardObject.java

    r14495 r14497  
    195195        }
    196196        FuncallableStandardObject o = new FuncallableStandardObject((Layout)l);
    197         if (arg == StandardClass.STANDARD_GENERIC_FUNCTION || Symbol.SUBTYPEP.execute(arg, StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
     197        if (Symbol.SUBTYPEP.execute(arg, LispClass.findClass(Symbol.STANDARD_GENERIC_FUNCTION)) != NIL) {
    198198          // KLUDGE: this initialization should be moved Lisp-side
    199199          o.setInstanceSlotValue(Symbol.NAME, NIL);
  • trunk/abcl/src/org/armedbear/lisp/LispObject.java

    r14448 r14497  
    671671                    ((Symbol)this).setDocumentation(Symbol.FUNCTION, doc);
    672672                    return doc;
    673                 } else if (fn.typep(StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
     673                } else if (fn.typep(Symbol.STANDARD_GENERIC_FUNCTION) != NIL) {
    674674                    return Symbol.SLOT_VALUE.execute(fn, Symbol._DOCUMENTATION);
    675675                }
  • trunk/abcl/src/org/armedbear/lisp/Primitives.java

    r14494 r14497  
    42494249            // will break for generic functions that aren't subclasses
    42504250            // of standard-generic-function as well.
    4251             if (first.typep(StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
     4251            if (first.typep(Symbol.STANDARD_GENERIC_FUNCTION) != NIL) {
    42524252                ((StandardObject)first).setInstanceSlotValue(Symbol.NAME, second);
    42534253                return second;
  • trunk/abcl/src/org/armedbear/lisp/Profiler.java

    r14448 r14497  
    7373                            object.setHotCount(0);
    7474                            LispObject methods = null;
    75                             if (object.typep(StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
     75                            if (object.typep(Symbol.STANDARD_GENERIC_FUNCTION) != NIL) {
    7676                                methods =
    7777                                    Symbol.GENERIC_FUNCTION_METHODS.execute(object);
Note: See TracChangeset for help on using the changeset viewer.