Changeset 14476

Timestamp:

04/24/13 12:51:08 (10 years ago)

Author:

rschlatte

Message:

remove cargo-culted layoutStandardGenericFunction

• also replace "instanceof FuncallableStandardClass?" with typep call

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• StandardClass.java (modified) (2 diffs)
• StandardObject.java (modified) (1 diff)

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

@@ -109 +109 @@
         }
       };
-
-  static Layout layoutStandardGenericFunction =
-      new Layout(null,
-                 list(Symbol.NAME,
-                      Symbol.LAMBDA_LIST,
-                      Symbol.REQUIRED_ARGS,
-                      Symbol.OPTIONAL_ARGS,
-                      Symbol.INITIAL_METHODS,
-                      Symbol.METHODS,
-                      Symbol.METHOD_CLASS,
-                      Symbol._METHOD_COMBINATION,
-                      Symbol.ARGUMENT_PRECEDENCE_ORDER,
-                      Symbol.DECLARATIONS,
-                      Symbol.CLASSES_TO_EMF_TABLE,
-                      Symbol._DOCUMENTATION),
-                 NIL)
-      {
-        @Override
-        public LispClass getLispClass()
-        {
-          return STANDARD_GENERIC_FUNCTION;
-        }
-      };
-
-  
 
   public StandardClass()
@@ -849 +824 @@
 
     // STANDARD-GENERIC-FUNCTION
-    STANDARD_GENERIC_FUNCTION.setClassLayout(layoutStandardGenericFunction);
     STANDARD_GENERIC_FUNCTION.setCPL(STANDARD_GENERIC_FUNCTION,
                                      GENERIC_FUNCTION, METAOBJECT,

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

@@ -677 +677 @@
         // working yet.  allocate-funcallable-instance takes over later.
         return new StandardGenericFunction();
-      } else if (arg instanceof FuncallableStandardClass) {
-        FuncallableStandardClass cls = (FuncallableStandardClass)arg;
-        Layout layout = cls.getClassLayout();
-        if (layout == null) {
-          program_error("No layout for funcallable class " + cls.princToString() + ".");
+      } 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(cls, layout.getLength());
+        return new FuncallableStandardObject((Layout)l);
       } else if (arg instanceof StandardClass) {
         StandardClass cls = (StandardClass)arg;