Changeset 14492
- Timestamp:
- 05/05/13 14:56:43 (11 years ago)
- Location:
- trunk/abcl/src/org/armedbear/lisp
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/src/org/armedbear/lisp/StandardObject.java
r14489 r14492 671 671 if (arg == StandardClass.STANDARD_CLASS) { 672 672 return new StandardClass(); 673 } else if (arg == StandardClass.STANDARD_GENERIC_FUNCTION) {674 // Not checking for (subtypep arg standard-generic-function)675 // here, since allocate-instance is only called for generic676 // functions early in the boot process and subtypep isn't677 // working yet. allocate-funcallable-instance takes over later.678 return new StandardGenericFunction();679 } else if (arg.typep(StandardClass.FUNCALLABLE_STANDARD_CLASS) != NIL) {680 LispObject l = Symbol.CLASS_LAYOUT.execute(arg);681 if (! (l instanceof Layout)) {682 program_error("Invalid class layout for funcallable class "683 + arg.princToString() + ".");684 }685 return new FuncallableStandardObject((Layout)l);686 673 } else if (arg instanceof StandardClass) { 687 674 StandardClass cls = (StandardClass)arg; -
trunk/abcl/src/org/armedbear/lisp/clos.lisp
r14490 r14492 1842 1842 (declare (ignore generic-function-class)) 1843 1843 (check-argument-precedence-order lambda-list argument-precedence-order) 1844 (let ((gf ( std-allocate-instance +the-standard-generic-function-class+)))1844 (let ((gf (allocate-funcallable-instance +the-standard-generic-function-class+))) 1845 1845 (unless (classp method-class) (setf method-class (find-class method-class))) 1846 1846 (unless (typep method-combination 'method-combination)
Note: See TracChangeset
for help on using the changeset viewer.