Changeset 13885

Timestamp:

02/29/12 22:35:41 (11 years ago)

Author:

ehuelsmann

Message:

Report the actual parameters passed in a function call with mismatched
parameter counts.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• ArgumentListProcessor.java (modified) (2 diffs)
• Lisp.java (modified) (1 diff)
• WrongNumberOfArgumentsException.java (modified) (4 diffs)

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

@@ -610 +610 @@
             // Fixed arity.
             if (args.length != arity)
-              error(new WrongNumberOfArgumentsException(function, arity));
+              error(new WrongNumberOfArgumentsException(function, list(args), arity));
             return args;
           }
@@ -640 +640 @@
             // Fixed arity.
             if (argsLength != arity)
-              error(new WrongNumberOfArgumentsException(function, arity));
+              error(new WrongNumberOfArgumentsException(function, list(args), arity));
             return args;
           }

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

@@ -883 +883 @@
   }
 
+  public static LispObject list(LispObject[] obj) {
+      LispObject theList = NIL;
+      if (obj.length > 0)
+      for (int i = obj.length - 1; i >= 0; i--)
+          theList = new Cons(obj[i], theList);
+      return theList;
+  }
 
   public static final Cons list(LispObject obj1, LispObject... remaining)

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

@@ -41 +41 @@
     private int expectedMinArgs;
     private int expectedMaxArgs;
+    private LispObject actualArgs;
     private String message;
 
@@ -47 +48 @@
     }
 
-    public WrongNumberOfArgumentsException(Operator operator, int expectedMin,
-            int expectedMax) {
+    public WrongNumberOfArgumentsException(Operator operator, LispObject args,
+            int expectedMin, int expectedMax) {
         // This is really just an ordinary PROGRAM-ERROR, broken out into its
         // own Java class as a convenience for the implementation.
@@ -55 +56 @@
   this.expectedMinArgs = expectedMin;
   this.expectedMaxArgs = expectedMax;
+        this.actualArgs = args;
         setFormatControl(getMessage());
         setFormatArguments(NIL);
     }
-    
+
+    public WrongNumberOfArgumentsException(Operator operator,
+            int expectedMin, int expectedMax) {
+        this(operator, null, expectedMin, expectedMax);
+    }
+        
     public WrongNumberOfArgumentsException(Operator operator, int expectedArgs) {
         this(operator, expectedArgs, expectedArgs);
     }
 
+    public WrongNumberOfArgumentsException(Operator operator, LispObject args,
+            int expectedArgs) {
+        this(operator, args, expectedArgs, expectedArgs);
+    }
+    
     public WrongNumberOfArgumentsException(String message) {
         super(StandardClass.PROGRAM_ERROR);
@@ -100 +112 @@
       sb.append(" expected");
   }
+        if (actualArgs != null) {
+            sb.append(" -- provided: ");
+            sb.append(actualArgs.princToString());
+        }
         sb.append('.');
         return message = sb.toString();