Re-organized the built in function classes

src/function/ArgumentValidator.java

@@ -3,7 +3,7 @@ package function;
 import java.text.MessageFormat;
 
 import error.LispException;
-import function.builtin.LENGTH;
+import function.builtin.cons.LENGTH;
 import sexpression.*;
 
 public class ArgumentValidator {

src/function/UserDefinedFunction.java

@@ -2,7 +2,8 @@ package function;
 
 import java.util.ArrayList;
 
-import function.builtin.*;
+import function.builtin.EVAL;
+import function.builtin.special.SETF;
 import sexpression.*;
 import table.SymbolTable;
 

src/function/builtin/EVAL.java

@@ -3,6 +3,10 @@ package function.builtin;
 import java.util.HashMap;
 
 import function.LispFunction;
+import function.builtin.cons.*;
+import function.builtin.math.*;
+import function.builtin.predicate.*;
+import function.builtin.special.*;
 import sexpression.*;
 
 public class EVAL extends LispFunction {

src/function/builtin/EXIT.java

@@ -1,6 +1,7 @@
 package function.builtin;
 
 import function.LispFunction;
+import function.builtin.cons.LENGTH;
 import sexpression.*;
 
 public class EXIT extends LispFunction {

src/function/builtin/FUNCALL.java

@@ -1,6 +1,7 @@
 package function.builtin;
 
 import function.*;
+import function.builtin.cons.LIST;
 import sexpression.*;
 
 public class FUNCALL extends LispFunction {

src/function/builtin/LOAD.java

@@ -4,6 +4,7 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
 import function.LispFunction;
+import function.builtin.cons.LENGTH;
 import parser.LispParser;
 import sexpression.*;
 

src/function/builtin/PRINT.java

@@ -1,6 +1,7 @@
 package function.builtin;
 
 import function.LispFunction;
+import function.builtin.cons.LENGTH;
 import sexpression.*;
 
 /**

src/function/builtin/SYMBOL_FUNCTION.java

@@ -1,6 +1,7 @@
 package function.builtin;
 
 import function.*;
+import function.builtin.cons.LENGTH;
 import sexpression.*;
 
 /**

src/function/builtin/cons/CAR.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.cons;
 
 import function.*;
 import sexpression.*;

src/function/builtin/cons/CDR.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.cons;
 
 import function.*;
 import sexpression.*;

src/function/builtin/cons/CONS.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.cons;
 
 import function.*;
 import sexpression.*;

src/function/builtin/cons/LENGTH.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.cons;
 
 import java.math.BigInteger;
 

src/function/builtin/cons/LIST.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.cons;
 
 import function.*;
 import sexpression.*;

src/function/builtin/math/DIVIDE.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.math;
 
 import java.math.BigInteger;
 

src/function/builtin/math/MINUS.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.math;
 
 import java.math.BigInteger;
 

src/function/builtin/math/MULTIPLY.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.math;
 
 import function.*;
 import sexpression.*;

src/function/builtin/math/PLUS.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.math;
 
 import function.*;
 import sexpression.*;

src/function/builtin/predicate/ATOM.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import function.*;
 import sexpression.*;

src/function/builtin/predicate/EQ.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import function.*;
 import sexpression.*;

src/function/builtin/predicate/EQUAL.java

@@ -1,6 +1,7 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import function.*;
+import function.builtin.cons.LIST;
 import sexpression.*;
 
 public class EQUAL extends LispFunction {

src/function/builtin/predicate/EQUALSP.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import function.*;
 import sexpression.*;

src/function/builtin/predicate/GREATERP.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import function.*;
 import sexpression.*;

src/function/builtin/predicate/LESSP.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import function.*;
 import sexpression.*;

src/function/builtin/predicate/LISTP.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import function.*;
 import sexpression.*;

src/function/builtin/predicate/NULL.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import function.*;
 import sexpression.*;

src/function/builtin/special/COND.java

@@ -1,6 +1,7 @@
-package function.builtin;
+package function.builtin.special;
 
 import function.*;
+import function.builtin.EVAL;
 import sexpression.*;
 
 public class COND extends LispFunction {

src/function/builtin/special/DEFUN.java

@@ -1,8 +1,9 @@
-package function.builtin;
+package function.builtin.special;
 
 import java.util.HashMap;
 
 import function.*;
+import function.builtin.EVAL;
 import sexpression.*;
 
 public class DEFUN extends LispFunction {

src/function/builtin/special/LAMBDA.java

@@ -1,6 +1,8 @@
-package function.builtin;
+package function.builtin.special;
 
 import function.*;
+import function.builtin.*;
+import function.builtin.cons.LENGTH;
 import sexpression.*;
 
 /**

src/function/builtin/special/LET.java

@@ -1,6 +1,7 @@
-package function.builtin;
+package function.builtin.special;
 
 import function.*;
+import function.builtin.EVAL;
 import sexpression.*;
 import table.SymbolTable;
 

src/function/builtin/special/QUOTE.java

@@ -1,6 +1,7 @@
-package function.builtin;
+package function.builtin.special;
 
 import function.LispFunction;
+import function.builtin.cons.LENGTH;
 import sexpression.*;
 
 /**

src/function/builtin/special/SETF.java

@@ -1,6 +1,8 @@
-package function.builtin;
+package function.builtin.special;
 
 import function.*;
+import function.builtin.*;
+import function.builtin.cons.LENGTH;
 import sexpression.*;
 import table.SymbolTable;
 

test/function/builtin/cons/CARTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.cons;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/cons/CDRTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.cons;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/cons/CONSTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.cons;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/cons/LISTTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.cons;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/math/DIVIDETester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.math;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/math/MINUSTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.math;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/math/MULTIPLYTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.math;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/math/PLUSTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.math;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/predicate/ATOMTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/predicate/EQTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/predicate/EQUALSPTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/predicate/EQUALTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/predicate/GREATERPTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/predicate/LESSPTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/predicate/LISTPTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/predicate/NULLTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.predicate;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/special/CONDTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.special;
 
 import static testutil.TestUtilities.*;
 

test/function/builtin/special/DEFUNTester.java

@@ -1,4 +1,4 @@
-package function.builtin;
+package function.builtin.special;
 
 import static testutil.TestUtilities.*;