Changeset 14492

Timestamp:

05/05/13 14:56:43 (11 years ago)

Author:

rschlatte

Message:

Don't call allocate-instance with funcallable-standard-class arg

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• StandardObject.java (modified) (1 diff)
• clos.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/StandardObject.java

@@ -671 +671 @@
       if (arg == StandardClass.STANDARD_CLASS) {
         return new StandardClass();
-      } else if (arg == StandardClass.STANDARD_GENERIC_FUNCTION) {
-        // Not checking for (subtypep arg standard-generic-function)
-        // here, since allocate-instance is only called for generic
-        // functions early in the boot process and subtypep isn't
-        // working yet.  allocate-funcallable-instance takes over later.
-        return new StandardGenericFunction();
-      } else if (arg.typep(StandardClass.FUNCALLABLE_STANDARD_CLASS) != NIL) {
-        LispObject l = Symbol.CLASS_LAYOUT.execute(arg);
-        if (! (l instanceof Layout)) {
-          program_error("Invalid class layout for funcallable class "
-                        + arg.princToString() + ".");
-        }
-        return new FuncallableStandardObject((Layout)l);
       } else if (arg instanceof StandardClass) {
         StandardClass cls = (StandardClass)arg;

trunk/abcl/src/org/armedbear/lisp/clos.lisp

@@ -1842 +1842 @@
   (declare (ignore generic-function-class))
   (check-argument-precedence-order lambda-list argument-precedence-order)
-  (let ((gf (std-allocate-instance +the-standard-generic-function-class+)))
+  (let ((gf (allocate-funcallable-instance +the-standard-generic-function-class+)))
     (unless (classp method-class) (setf method-class (find-class method-class)))
     (unless (typep method-combination 'method-combination)