Use function alias in validation messages

Resolves #9

src/function/builtin/APPLY.java

@@ -15,8 +15,8 @@ public class APPLY extends LispFunction {
         return lookupFunction("APPLY").call(argumentList);
     }
 
-    public APPLY() {
+    public APPLY(String name) {
-        this.argumentValidator = new ArgumentValidator("APPLY");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(2);
         this.argumentValidator.setTrailingArgumentExpectedType(Cons.class);
     }

src/function/builtin/EVAL.java

@@ -53,8 +53,8 @@ public class EVAL extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public EVAL() {
+    public EVAL(String name) {
-        this.argumentValidator = new ArgumentValidator("EVAL");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(1);
     }
 

src/function/builtin/EXIT.java

@@ -12,8 +12,8 @@ public class EXIT extends LispFunction {
     private ArgumentValidator argumentValidator;
     private RuntimeEnvironment environment;
 
-    public EXIT() {
+    public EXIT(String name) {
-        this.argumentValidator = new ArgumentValidator("EXIT");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setMaximumNumberOfArguments(0);
         this.environment = RuntimeEnvironment.getInstance();
     }

src/function/builtin/FUNCALL.java

@@ -11,8 +11,8 @@ public class FUNCALL extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public FUNCALL() {
+    public FUNCALL(String name) {
-        this.argumentValidator = new ArgumentValidator("FUNCALL");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setMinimumNumberOfArguments(1);
     }
 

src/function/builtin/LOAD.java

@@ -18,16 +18,15 @@ import sexpression.*;
 @FunctionNames({ "LOAD" })
 public class LOAD extends LispFunction {
 
+    private static Stack<String> pathPrefixes = new Stack<>();
     private ArgumentValidator argumentValidator;
     private RuntimeEnvironment environment;
-    private Stack<String> pathPrefixes;
 
-    public LOAD() {
+    public LOAD(String name) {
-        this.argumentValidator = new ArgumentValidator("LOAD");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(1);
         this.argumentValidator.setEveryArgumentExpectedType(LispString.class);
         this.environment = RuntimeEnvironment.getInstance();
-        this.pathPrefixes = new Stack<>();
     }
 
     public SExpression call(Cons argumentList) {

src/function/builtin/PRINT.java

@@ -10,8 +10,8 @@ public class PRINT extends LispFunction {
     private ArgumentValidator argumentValidator;
     private RuntimeEnvironment environment;
 
-    public PRINT() {
+    public PRINT(String name) {
-        this.argumentValidator = new ArgumentValidator("PRINT");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(1);
         this.environment = RuntimeEnvironment.getInstance();
     }

src/function/builtin/SET.java

@@ -16,8 +16,8 @@ public class SET extends LispFunction {
     private ArgumentValidator argumentValidator;
     private ExecutionContext executionContext;
 
-    public SET() {
+    public SET(String name) {
-        this.argumentValidator = new ArgumentValidator("SET");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(2);
         this.argumentValidator.setFirstArgumentExpectedType(Symbol.class);
         this.executionContext = ExecutionContext.getInstance();

src/function/builtin/SYMBOL_FUNCTION.java

@@ -13,8 +13,8 @@ public class SYMBOL_FUNCTION extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public SYMBOL_FUNCTION() {
+    public SYMBOL_FUNCTION(String name) {
-        this.argumentValidator = new ArgumentValidator("SYMBOL-FUNCTION");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(1);
         this.argumentValidator.setEveryArgumentExpectedType(Symbol.class);
     }

src/function/builtin/cons/CONS.java

@@ -8,8 +8,8 @@ public class CONS extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public CONS() {
+    public CONS(String name) {
-        this.argumentValidator = new ArgumentValidator("CONS");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(2);
     }
 

src/function/builtin/cons/FIRST.java

@@ -8,8 +8,8 @@ public class FIRST extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public FIRST() {
+    public FIRST(String name) {
-        this.argumentValidator = new ArgumentValidator("FIRST");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(1);
         this.argumentValidator.setEveryArgumentExpectedType(Cons.class);
     }

src/function/builtin/cons/LENGTH.java

@@ -11,7 +11,7 @@ import sexpression.*;
 public class LENGTH extends LispFunction {
 
     public static BigInteger getLength(Cons list) {
-        LENGTH lengthFunction = new LENGTH();
+        LENGTH lengthFunction = new LENGTH("LENGTH");
         LispNumber length = lengthFunction.callWithoutArgumentValidation(makeList(list));
 
         return length.getValue();
@@ -19,8 +19,8 @@ public class LENGTH extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public LENGTH() {
+    public LENGTH(String name) {
-        this.argumentValidator = new ArgumentValidator("LENGTH");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(1);
         this.argumentValidator.setEveryArgumentExpectedType(Cons.class);
     }

src/function/builtin/cons/LIST.java

@@ -14,8 +14,8 @@ public class LIST extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public LIST() {
+    public LIST(String name) {
-        this.argumentValidator = new ArgumentValidator("LIST");
+        this.argumentValidator = new ArgumentValidator(name);
     }
 
     public Cons call(Cons argumentList) {

src/function/builtin/cons/REST.java

@@ -8,8 +8,8 @@ public class REST extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public REST() {
+    public REST(String name) {
-        this.argumentValidator = new ArgumentValidator("REST");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(1);
         this.argumentValidator.setEveryArgumentExpectedType(Cons.class);
     }

src/function/builtin/math/DIVIDE.java

@@ -11,8 +11,8 @@ public class DIVIDE extends LispFunction {
     private ArgumentValidator argumentValidator;
     private MathFunction mathFunction;
 
-    public DIVIDE() {
+    public DIVIDE(String name) {
-        this.argumentValidator = new ArgumentValidator("/");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setMinimumNumberOfArguments(1);
         this.argumentValidator.setEveryArgumentExpectedType(LispNumber.class);
         this.mathFunction = new MathFunction(this::getReciprocal, this::divide);

src/function/builtin/math/MINUS.java

@@ -11,8 +11,8 @@ public class MINUS extends LispFunction {
     private ArgumentValidator argumentValidator;
     private MathFunction mathFunction;
 
-    public MINUS() {
+    public MINUS(String name) {
-        this.argumentValidator = new ArgumentValidator("-");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setMinimumNumberOfArguments(1);
         this.argumentValidator.setEveryArgumentExpectedType(LispNumber.class);
         this.mathFunction = new MathFunction(this::additiveInverse, this::subtract);

src/function/builtin/math/MULTIPLY.java

@@ -11,8 +11,8 @@ public class MULTIPLY extends LispFunction {
     private ArgumentValidator argumentValidator;
     private MathFunction mathFunction;
 
-    public MULTIPLY() {
+    public MULTIPLY(String name) {
-        this.argumentValidator = new ArgumentValidator("*");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setEveryArgumentExpectedType(LispNumber.class);
         this.mathFunction = new MathFunction(number -> number, this::multiply);
     }

src/function/builtin/math/PLUS.java

@@ -11,8 +11,8 @@ public class PLUS extends LispFunction {
     private ArgumentValidator argumentValidator;
     private MathFunction mathFunction;
 
-    public PLUS() {
+    public PLUS(String name) {
-        this.argumentValidator = new ArgumentValidator("+");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setEveryArgumentExpectedType(LispNumber.class);
         this.mathFunction = new MathFunction(number -> number, this::add);
     }

src/function/builtin/predicate/ATOM.java

@@ -11,8 +11,8 @@ public class ATOM extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public ATOM() {
+    public ATOM(String name) {
-        this.argumentValidator = new ArgumentValidator("ATOM");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(1);
     }
 

src/function/builtin/predicate/EQ.java

@@ -11,8 +11,8 @@ public class EQ extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public EQ() {
+    public EQ(String name) {
-        this.argumentValidator = new ArgumentValidator("EQ");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(2);
     }
 

src/function/builtin/predicate/EQUAL.java

@@ -15,8 +15,8 @@ public class EQUAL extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public EQUAL() {
+    public EQUAL(String name) {
-        this.argumentValidator = new ArgumentValidator("EQUAL");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(2);
     }
 

src/function/builtin/predicate/LISTP.java

@@ -11,8 +11,8 @@ public class LISTP extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public LISTP() {
+    public LISTP(String name) {
-        this.argumentValidator = new ArgumentValidator("LISTP");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(1);
     }
 

src/function/builtin/predicate/NULL.java

@@ -11,8 +11,8 @@ public class NULL extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public NULL() {
+    public NULL(String name) {
-        this.argumentValidator = new ArgumentValidator("NULL");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(1);
     }
 

src/function/builtin/predicate/NUMERIC_EQUAL.java

@@ -11,8 +11,8 @@ public class NUMERIC_EQUAL extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public NUMERIC_EQUAL() {
+    public NUMERIC_EQUAL(String name) {
-        this.argumentValidator = new ArgumentValidator("=");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setMinimumNumberOfArguments(1);
         this.argumentValidator.setEveryArgumentExpectedType(LispNumber.class);
     }

src/function/builtin/predicate/NUMERIC_GREATER.java

@@ -11,8 +11,8 @@ public class NUMERIC_GREATER extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public NUMERIC_GREATER() {
+    public NUMERIC_GREATER(String name) {
-        this.argumentValidator = new ArgumentValidator(">");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setMinimumNumberOfArguments(1);
         this.argumentValidator.setEveryArgumentExpectedType(LispNumber.class);
     }

src/function/builtin/predicate/NUMERIC_LESS.java

@@ -11,8 +11,8 @@ public class NUMERIC_LESS extends LispFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public NUMERIC_LESS() {
+    public NUMERIC_LESS(String name) {
-        this.argumentValidator = new ArgumentValidator("<");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setMinimumNumberOfArguments(1);
         this.argumentValidator.setEveryArgumentExpectedType(LispNumber.class);
     }

src/function/builtin/special/AND.java

@@ -11,8 +11,8 @@ public class AND extends LispSpecialFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public AND() {
+    public AND(String name) {
-        this.argumentValidator = new ArgumentValidator("AND");
+        this.argumentValidator = new ArgumentValidator(name);
     }
 
     public SExpression call(Cons argumentList) {

src/function/builtin/special/CASE.java

@@ -13,8 +13,8 @@ public class CASE extends LispSpecialFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public CASE() {
+    public CASE(String name) {
-        this.argumentValidator = new ArgumentValidator("CASE");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setMinimumNumberOfArguments(1);
         this.argumentValidator.setTrailingArgumentExpectedType(Cons.class);
         this.argumentValidator.setTrailingArgumentExcludedType(Nil.class);

src/function/builtin/special/COND.java

@@ -11,8 +11,8 @@ public class COND extends LispSpecialFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public COND() {
+    public COND(String name) {
-        this.argumentValidator = new ArgumentValidator("COND");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setEveryArgumentExpectedType(Cons.class);
         this.argumentValidator.setEveryArgumentExcludedType(Nil.class);
     }

src/function/builtin/special/DEFINE_MACRO.java

@@ -6,8 +6,8 @@ import sexpression.*;
 @FunctionNames({ "DEFINE-MACRO" })
 public class DEFINE_MACRO extends Define {
 
-    public DEFINE_MACRO() {
+    public DEFINE_MACRO(String name) {
-        super("DEFINE-MACRO");
+        super(name);
     }
 
     @Override

src/function/builtin/special/DEFUN.java

@@ -6,8 +6,8 @@ import sexpression.*;
 @FunctionNames({ "DEFUN" })
 public class DEFUN extends Define {
 
-    public DEFUN() {
+    public DEFUN(String name) {
-        super("DEFUN");
+        super(name);
     }
 
     @Override

src/function/builtin/special/IF.java

@@ -10,8 +10,8 @@ public class IF extends LispSpecialFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public IF() {
+    public IF(String name) {
-        this.argumentValidator = new ArgumentValidator("IF");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setMinimumNumberOfArguments(2);
         this.argumentValidator.setMaximumNumberOfArguments(3);
     }

src/function/builtin/special/LAMBDA.java

@@ -25,7 +25,7 @@ public class LAMBDA extends LispSpecialFunction {
         lambdaValidator.setEveryArgumentExpectedType(Cons.class);
         lambdaValidator.validate(makeList(rest));
 
-        LambdaExpression lambda = new LAMBDA().call((Cons) rest);
+        LambdaExpression lambda = new LAMBDA("LAMBDA").call((Cons) rest);
 
         return lambda.getFunction();
     }
@@ -33,12 +33,12 @@ public class LAMBDA extends LispSpecialFunction {
     private ArgumentValidator argumentValidator;
     private ArgumentValidator lambdaListValidator;
 
-    public LAMBDA() {
+    public LAMBDA(String name) {
-        this.argumentValidator = new ArgumentValidator("LAMBDA");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setFirstArgumentExpectedType(Cons.class);
         this.argumentValidator.setMinimumNumberOfArguments(1);
 
-        this.lambdaListValidator = new ArgumentValidator("LAMBDA|lambda-list|");
+        this.lambdaListValidator = new ArgumentValidator(name + "|lambda-list|");
         this.lambdaListValidator.setEveryArgumentExpectedType(Symbol.class);
     }
 

src/function/builtin/special/LET.java

@@ -15,15 +15,15 @@ public class LET extends LispSpecialFunction {
     private ArgumentValidator pairValidator;
     private ExecutionContext executionContext;
 
-    public LET() {
+    public LET(String name) {
-        this.argumentValidator = new ArgumentValidator("LET");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setMinimumNumberOfArguments(1);
         this.argumentValidator.setFirstArgumentExpectedType(Cons.class);
 
-        this.variableDefinitionListValidator = new ArgumentValidator("LET|pair-list|");
+        this.variableDefinitionListValidator = new ArgumentValidator(name + "|pair-list|");
         this.variableDefinitionListValidator.setEveryArgumentExpectedType(Cons.class);
 
-        this.pairValidator = new ArgumentValidator("LET|pair|");
+        this.pairValidator = new ArgumentValidator(name + "|pair|");
         this.pairValidator.setMinimumNumberOfArguments(1);
         this.pairValidator.setMaximumNumberOfArguments(2);
         this.pairValidator.setFirstArgumentExpectedType(Symbol.class);

src/function/builtin/special/OR.java

@@ -10,8 +10,8 @@ public class OR extends LispSpecialFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public OR() {
+    public OR(String name) {
-        this.argumentValidator = new ArgumentValidator("OR");
+        this.argumentValidator = new ArgumentValidator(name);
     }
 
     public SExpression call(Cons argumentList) {

src/function/builtin/special/PROGN.java

@@ -11,8 +11,8 @@ public class PROGN extends LispSpecialFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public PROGN() {
+    public PROGN(String name) {
-        this.argumentValidator = new ArgumentValidator("PROGN");
+        this.argumentValidator = new ArgumentValidator(name);
     }
 
     public SExpression call(Cons argumentList) {

src/function/builtin/special/QUOTE.java

@@ -8,8 +8,8 @@ public class QUOTE extends LispSpecialFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public QUOTE() {
+    public QUOTE(String name) {
-        this.argumentValidator = new ArgumentValidator("QUOTE");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(1);
     }
 

src/function/builtin/special/SETF.java

@@ -12,8 +12,8 @@ public class SETF extends LispSpecialFunction {
 
     private ArgumentValidator argumentValidator;
 
-    public SETF() {
+    public SETF(String name) {
-        this.argumentValidator = new ArgumentValidator("SETF");
+        this.argumentValidator = new ArgumentValidator(name);
         this.argumentValidator.setExactNumberOfArguments(2);
         this.argumentValidator.setFirstArgumentExpectedType(Symbol.class);
     }

src/table/FunctionTable.java

@@ -110,17 +110,15 @@ public class FunctionTable {
     }
 
     private void addAllFunctionNamesToTable(Class<? extends LispFunction> function, String[] names) {
-        LispFunction instance = createInstance(function);
-
         for (String name : names)
-            table.put(name, instance);
+            table.put(name, createInstance(function, name));
     }
 
-    private LispFunction createInstance(Class<? extends LispFunction> function) {
+    private LispFunction createInstance(Class<? extends LispFunction> function, String name) {
         LispFunction instance = null;
 
         try {
-            instance = function.getConstructor().newInstance();
+            instance = function.getConstructor(String.class).newInstance(name);
         } catch (Exception e) {
             throw new LispFunctionInstantiationException(function.getName());
         }

test/table/FunctionTableTester.java

@@ -19,6 +19,8 @@ public class FunctionTableTester {
     @FunctionNames({ "GOOD" })
     public static class GoodFunction extends LispFunction {
 
+        public GoodFunction(String name) {}
+
         @Override
         public SExpression call(Cons argList) {
             return NIL;
@@ -28,10 +30,6 @@ public class FunctionTableTester {
     @FunctionNames({ "BAD" })
     public static class BadFunction extends LispFunction {
 
-        public BadFunction() {
-            throw new IllegalArgumentException("bad function");
-        }
-
         @Override
         public SExpression call(Cons argList) {
             return NIL;