Commit 66177c10 authored by rschlatte@1c010e3e-69d0-11dd-93a8-456734b0d56f's avatar rschlatte@1c010e3e-69d0-11dd-93a8-456734b0d56f
Browse files

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

parent a0879984
......@@ -194,7 +194,7 @@ public class FuncallableStandardObject extends StandardObject
+ arg.princToString() + ".");
}
FuncallableStandardObject o = new FuncallableStandardObject((Layout)l);
if (arg == StandardClass.STANDARD_GENERIC_FUNCTION || Symbol.SUBTYPEP.execute(arg, StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
if (Symbol.SUBTYPEP.execute(arg, LispClass.findClass(Symbol.STANDARD_GENERIC_FUNCTION)) != NIL) {
// KLUDGE: this initialization should be moved Lisp-side
o.setInstanceSlotValue(Symbol.NAME, NIL);
o.setInstanceSlotValue(Symbol.LAMBDA_LIST, NIL);
......
......@@ -670,7 +670,7 @@ public class LispObject //extends Lisp
SimpleString doc = new SimpleString(docstring);
((Symbol)this).setDocumentation(Symbol.FUNCTION, doc);
return doc;
} else if (fn.typep(StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
} else if (fn.typep(Symbol.STANDARD_GENERIC_FUNCTION) != NIL) {
return Symbol.SLOT_VALUE.execute(fn, Symbol._DOCUMENTATION);
}
}
......
......@@ -4248,7 +4248,7 @@ public final class Primitives {
// KLUDGE: this isn't fully general, but lots of other stuff
// will break for generic functions that aren't subclasses
// of standard-generic-function as well.
if (first.typep(StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
if (first.typep(Symbol.STANDARD_GENERIC_FUNCTION) != NIL) {
((StandardObject)first).setInstanceSlotValue(Symbol.NAME, second);
return second;
}
......
......@@ -72,7 +72,7 @@ public class Profiler
object.setCallCount(0);
object.setHotCount(0);
LispObject methods = null;
if (object.typep(StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
if (object.typep(Symbol.STANDARD_GENERIC_FUNCTION) != NIL) {
methods =
Symbol.GENERIC_FUNCTION_METHODS.execute(object);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment