Changeset 14086

Timestamp:

08/14/12 12:40:56 (8 years ago)

Author:

rschlatte

Message:

Eliminate numberOfRequiredArgs attribute from standard generic function

• calculate it when required instead

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• FuncallableStandardObject.java (modified) (1 diff)
• StandardGenericFunction.java (modified) (4 diffs)

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

@@ -42 +42 @@
 {
   protected LispObject function;
-  protected int numberOfRequiredArgs;
 
   protected FuncallableStandardObject()

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

@@ -57 +57 @@
     slots[StandardGenericFunctionClass.SLOT_INDEX_REQUIRED_ARGS] = NIL;
     slots[StandardGenericFunctionClass.SLOT_INDEX_OPTIONAL_ARGS] = NIL;
-    numberOfRequiredArgs = 0;
     slots[StandardGenericFunctionClass.SLOT_INDEX_INITIAL_METHODS] = NIL;
     slots[StandardGenericFunctionClass.SLOT_INDEX_METHODS] = NIL;
@@ -229 +228 @@
       final StandardGenericFunction gf = checkStandardGenericFunction(first);
       gf.slots[StandardGenericFunctionClass.SLOT_INDEX_REQUIRED_ARGS] = second;
-      gf.numberOfRequiredArgs = second.length();
       return second;
     }
@@ -578 +576 @@
       final StandardGenericFunction gf = checkStandardGenericFunction(first);
       LispObject args = second;
-      LispObject[] array = new LispObject[gf.numberOfRequiredArgs];
-      for (int i = gf.numberOfRequiredArgs; i-- > 0;)
+      int numberOfRequiredArgs
+        = gf.slots[StandardGenericFunctionClass.SLOT_INDEX_REQUIRED_ARGS]
+        .length();
+      LispObject[] array = new LispObject[numberOfRequiredArgs];
+      for (int i = numberOfRequiredArgs; i-- > 0;)
         {
           array[i] = gf.getArgSpecialization(args.car());
@@ -607 +608 @@
       final StandardGenericFunction gf = checkStandardGenericFunction(first);
       LispObject args = second;
-      LispObject[] array = new LispObject[gf.numberOfRequiredArgs];
-      for (int i = gf.numberOfRequiredArgs; i-- > 0;)
+      int numberOfRequiredArgs
+        = gf.slots[StandardGenericFunctionClass.SLOT_INDEX_REQUIRED_ARGS]
+        .length();
+      LispObject[] array = new LispObject[numberOfRequiredArgs];
+      for (int i = numberOfRequiredArgs; i-- > 0;)
         {
           array[i] = gf.getArgSpecialization(args.car());