[armedbear-cvs] r13453 - trunk/abcl/src/org/armedbear/lisp

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Thu Aug 11 00:30:40 2011
New Revision: 13453

Log:
Remove code duplication: operators know how to print themselves perfectly
well; this improves printing of "Wrong number of args" errors.

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

Modified: trunk/abcl/src/org/armedbear/lisp/WrongNumberOfArgumentsException.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/WrongNumberOfArgumentsException.java	Tue Aug  9 13:54:47 2011	(r13452)
+++ trunk/abcl/src/org/armedbear/lisp/WrongNumberOfArgumentsException.java	Thu Aug 11 00:30:40 2011	(r13453)
@@ -72,12 +72,8 @@
 	    return message;
 	}
         StringBuilder sb =
-            new StringBuilder("Wrong number of arguments");
-        LispObject lambdaName = operator.getLambdaName();
-        if (lambdaName != null && lambdaName != NIL) {
-            sb.append(" for ");
-            sb.append(operator.getLambdaName().princToString());
-        }
+            new StringBuilder("Wrong number of arguments for "
+                              + operator.princToString());
 	if(expectedArgs >= 0) {
 	    sb.append("; ");
 	    sb.append(expectedArgs);