Refactored the function table logic

src/function/builtin/EVAL.java

@@ -1,24 +1,18 @@
 package function.builtin;
 
-import static function.FunctionTable.functionTable;
-
 import java.text.MessageFormat;
-import java.util.HashMap;
 
 import error.LispException;
 import function.*;
 import function.builtin.cons.LIST;
 import function.builtin.special.*;
 import sexpression.*;
+import table.FunctionTable;
 
 public class EVAL extends LispFunction {
 
-    public static HashMap<String, LispFunction> getFunctionTable() {
-        return functionTable;
-    }
-
     public static LispFunction lookupFunctionOrLambda(SExpression functionExpression) {
-        LispFunction function = lookupFunction(functionExpression.toString());
+        LispFunction function = FunctionTable.lookupFunction(functionExpression.toString());
 
         if (function == null)
             function = createLambdaFunction(functionExpression);
@@ -26,10 +20,6 @@ public class EVAL extends LispFunction {
         return function;
     }
 
-    public static LispFunction lookupFunction(String functionName) {
-        return functionTable.get(functionName);
-    }
-
     private static LispFunction createLambdaFunction(SExpression lambdaExpression) {
         if (lambdaExpression.functionp())
             return ((LambdaExpression) lambdaExpression).getFunction();
@@ -40,13 +30,12 @@ public class EVAL extends LispFunction {
     }
 
     public static SExpression lookupSymbol(String symbolName) {
-        if (symbolName.equals("NIL")) {
+        if (symbolName.equals("NIL"))
             return Nil.getInstance();
-        } else if (symbolName.equals("T")) {
+        else if (symbolName.equals("T"))
             return Symbol.T;
-        } else if (symbolName.startsWith(":")) {
+        else if (symbolName.startsWith(":"))
             return new Symbol(symbolName);
-        }
 
         return SETF.lookupSymbolValue(symbolName);
     }

src/function/builtin/SYMBOL_FUNCTION.java

@@ -5,6 +5,7 @@ import java.text.MessageFormat;
 import error.LispException;
 import function.*;
 import sexpression.*;
+import table.FunctionTable;
 
 public class SYMBOL_FUNCTION extends LispFunction {
 
@@ -20,7 +21,7 @@ public class SYMBOL_FUNCTION extends LispFunction {
         argumentValidator.validate(argumentList);
 
         SExpression symbol = argumentList.getCar();
-        LispFunction function = EVAL.lookupFunction(symbol.toString());
+        LispFunction function = FunctionTable.lookupFunction(symbol.toString());
 
         if (function != null) {
             if (function instanceof UserDefinedFunction)

src/function/builtin/special/DEFUN.java

@@ -1,13 +1,12 @@
 package function.builtin.special;
 
 import java.text.MessageFormat;
-import java.util.HashMap;
 
 import environment.Environment;
 import function.*;
-import function.builtin.EVAL;
 import function.builtin.cons.LIST;
 import sexpression.*;
+import table.FunctionTable;
 
 public class DEFUN extends LispFunction {
 
@@ -43,20 +42,15 @@ public class DEFUN extends LispFunction {
 
         Cons functionBody = (Cons) remainingArguments.getCdr();
         UserDefinedFunction function = new UserDefinedFunction(functionName.toString(), lambdaList, functionBody);
-        HashMap<String, LispFunction> functionTable = EVAL.getFunctionTable();
 
-        if (isAlreadyDefined(functionName, functionTable))
+        if (FunctionTable.isAlreadyDefined(functionName.toString()))
             printWarning(functionName);
 
-        functionTable.put(functionName.toString(), function);
+        FunctionTable.defineFunction(functionName.toString(), function);
 
         return functionName;
     }
 
-    private boolean isAlreadyDefined(SExpression functionName, HashMap<String, LispFunction> functionTable) {
-        return functionTable.containsKey(functionName.toString());
-    }
-
     private void printWarning(SExpression functionName) {
         String message = MessageFormat.format("WARNING: redefining function {0}", functionName.toString());
         environment.getOutput().println(message);

src/table/FunctionTable.java

@@ -1,7 +1,8 @@
-package function;
+package table;
 
 import java.util.HashMap;
 
+import function.LispFunction;
 import function.builtin.*;
 import function.builtin.cons.*;
 import function.builtin.math.*;
@@ -10,9 +11,29 @@ import function.builtin.special.*;
 
 public class FunctionTable {
     
-    public static final HashMap<String, LispFunction> functionTable = new HashMap<String, LispFunction>();
+    private static FunctionTable uniqueInstance = new FunctionTable();
     
-    static {
+    public static LispFunction lookupFunction(String functionName) {
+        return uniqueInstance.functionTable.get(functionName);
+    }
+    
+    public static boolean isAlreadyDefined(String functionName) {
+        return uniqueInstance.functionTable.containsKey(functionName);
+    }
+    
+    public static void defineFunction(String functionName, LispFunction function) {
+        uniqueInstance.functionTable.put(functionName, function);
+    }
+    
+    private HashMap<String, LispFunction> functionTable;
+
+    private FunctionTable() {
+        this.functionTable = new HashMap<>();
+        
+        initializeFunctionTable();
+    }
+
+    private void initializeFunctionTable() {
         functionTable.put("*", new MULTIPLY());
         functionTable.put("+", new PLUS());
         functionTable.put("-", new MINUS());

src/table/SymbolTable.java

@@ -9,16 +9,10 @@ public class SymbolTable {
     private HashMap<String, SExpression> table;
     private SymbolTable parent;
 
-    /**
-     * Create a new symbol table with no parent.
-     */
     public SymbolTable() {
         this(null);
     }
 
-    /**
-     * Create a new symbol table with the specified parent.
-     */
     public SymbolTable(SymbolTable parent) {
         this.table = new HashMap<String, SExpression>();
         this.parent = parent;