diff --git a/.externalToolBuilders/Ant_Builder.launch b/.externalToolBuilders/Ant_Builder.launch
index dcc6b4b..a535c81 100644
--- a/.externalToolBuilders/Ant_Builder.launch
+++ b/.externalToolBuilders/Ant_Builder.launch
@@ -1,4 +1,5 @@
+
@@ -13,6 +14,6 @@
-
+
\ No newline at end of file
diff --git a/.project b/.project
index 883a7f1..d7cb98d 100644
--- a/.project
+++ b/.project
@@ -22,10 +22,6 @@
LaunchConfigHandle
<project>/.externalToolBuilders/Ant_Builder.launch
-
- incclean
- true
-
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..a698e59 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
diff --git a/build.xml b/build.xml
index a28a61a..83bc670 100644
--- a/build.xml
+++ b/build.xml
@@ -18,6 +18,7 @@
@@ -38,8 +39,7 @@
parser/*.java,
eval/*.java,
error/*.java,
- main/*.java"
- excludes="main/LispInterpreter2.java" />
+ main/*.java" />
diff --git a/src/error/ErrorManager.class b/src/error/ErrorManager.class
deleted file mode 100644
index a7f40c1..0000000
Binary files a/src/error/ErrorManager.class and /dev/null differ
diff --git a/src/eval/APPLY.class b/src/eval/APPLY.class
deleted file mode 100644
index 2b22463..0000000
Binary files a/src/eval/APPLY.class and /dev/null differ
diff --git a/src/eval/ATOM.class b/src/eval/ATOM.class
deleted file mode 100644
index b5cf96e..0000000
Binary files a/src/eval/ATOM.class and /dev/null differ
diff --git a/src/eval/CAR.class b/src/eval/CAR.class
deleted file mode 100644
index 86a7ae3..0000000
Binary files a/src/eval/CAR.class and /dev/null differ
diff --git a/src/eval/CDR.class b/src/eval/CDR.class
deleted file mode 100644
index 128383f..0000000
Binary files a/src/eval/CDR.class and /dev/null differ
diff --git a/src/eval/COND.class b/src/eval/COND.class
deleted file mode 100644
index 29bb23a..0000000
Binary files a/src/eval/COND.class and /dev/null differ
diff --git a/src/eval/CONS.class b/src/eval/CONS.class
deleted file mode 100644
index c95ed56..0000000
Binary files a/src/eval/CONS.class and /dev/null differ
diff --git a/src/eval/DEFUN.class b/src/eval/DEFUN.class
deleted file mode 100644
index fd9c707..0000000
Binary files a/src/eval/DEFUN.class and /dev/null differ
diff --git a/src/eval/DIVIDE.class b/src/eval/DIVIDE.class
deleted file mode 100644
index edb1745..0000000
Binary files a/src/eval/DIVIDE.class and /dev/null differ
diff --git a/src/eval/EQ.class b/src/eval/EQ.class
deleted file mode 100644
index 83a270c..0000000
Binary files a/src/eval/EQ.class and /dev/null differ
diff --git a/src/eval/EQUAL.class b/src/eval/EQUAL.class
deleted file mode 100644
index 3fc65a8..0000000
Binary files a/src/eval/EQUAL.class and /dev/null differ
diff --git a/src/eval/EQUALSP.class b/src/eval/EQUALSP.class
deleted file mode 100644
index 4cd829e..0000000
Binary files a/src/eval/EQUALSP.class and /dev/null differ
diff --git a/src/eval/EVAL.class b/src/eval/EVAL.class
deleted file mode 100644
index a661ef5..0000000
Binary files a/src/eval/EVAL.class and /dev/null differ
diff --git a/src/eval/EXIT.class b/src/eval/EXIT.class
deleted file mode 100644
index a5733c5..0000000
Binary files a/src/eval/EXIT.class and /dev/null differ
diff --git a/src/eval/FUNCALL.class b/src/eval/FUNCALL.class
deleted file mode 100644
index 60b34d3..0000000
Binary files a/src/eval/FUNCALL.class and /dev/null differ
diff --git a/src/eval/GREATERP.class b/src/eval/GREATERP.class
deleted file mode 100644
index 38cddbf..0000000
Binary files a/src/eval/GREATERP.class and /dev/null differ
diff --git a/src/eval/LAMBDA.class b/src/eval/LAMBDA.class
deleted file mode 100644
index 10468c9..0000000
Binary files a/src/eval/LAMBDA.class and /dev/null differ
diff --git a/src/eval/LENGTH.class b/src/eval/LENGTH.class
deleted file mode 100644
index e5619b9..0000000
Binary files a/src/eval/LENGTH.class and /dev/null differ
diff --git a/src/eval/LESSP.class b/src/eval/LESSP.class
deleted file mode 100644
index bdb80e4..0000000
Binary files a/src/eval/LESSP.class and /dev/null differ
diff --git a/src/eval/LET.class b/src/eval/LET.class
deleted file mode 100644
index fa99e32..0000000
Binary files a/src/eval/LET.class and /dev/null differ
diff --git a/src/eval/LIST.class b/src/eval/LIST.class
deleted file mode 100644
index f33586b..0000000
Binary files a/src/eval/LIST.class and /dev/null differ
diff --git a/src/eval/LISTP.class b/src/eval/LISTP.class
deleted file mode 100644
index 2bb22ae..0000000
Binary files a/src/eval/LISTP.class and /dev/null differ
diff --git a/src/eval/LOAD.class b/src/eval/LOAD.class
deleted file mode 100644
index 0529e47..0000000
Binary files a/src/eval/LOAD.class and /dev/null differ
diff --git a/src/eval/LambdaExpression.class b/src/eval/LambdaExpression.class
deleted file mode 100644
index bc54d92..0000000
Binary files a/src/eval/LambdaExpression.class and /dev/null differ
diff --git a/src/eval/LispFunction.class b/src/eval/LispFunction.class
deleted file mode 100644
index a6f8297..0000000
Binary files a/src/eval/LispFunction.class and /dev/null differ
diff --git a/src/eval/MINUS.class b/src/eval/MINUS.class
deleted file mode 100644
index cdd4ee9..0000000
Binary files a/src/eval/MINUS.class and /dev/null differ
diff --git a/src/eval/MULTIPLY.class b/src/eval/MULTIPLY.class
deleted file mode 100644
index 53eab28..0000000
Binary files a/src/eval/MULTIPLY.class and /dev/null differ
diff --git a/src/eval/NULL.class b/src/eval/NULL.class
deleted file mode 100644
index c74646b..0000000
Binary files a/src/eval/NULL.class and /dev/null differ
diff --git a/src/eval/PLUS.class b/src/eval/PLUS.class
deleted file mode 100644
index 334668c..0000000
Binary files a/src/eval/PLUS.class and /dev/null differ
diff --git a/src/eval/PRINT.class b/src/eval/PRINT.class
deleted file mode 100644
index f02a693..0000000
Binary files a/src/eval/PRINT.class and /dev/null differ
diff --git a/src/eval/QUOTE.class b/src/eval/QUOTE.class
deleted file mode 100644
index 9154e6e..0000000
Binary files a/src/eval/QUOTE.class and /dev/null differ
diff --git a/src/eval/SETF.class b/src/eval/SETF.class
deleted file mode 100644
index 4010526..0000000
Binary files a/src/eval/SETF.class and /dev/null differ
diff --git a/src/eval/SYMBOL_FUNCTION.class b/src/eval/SYMBOL_FUNCTION.class
deleted file mode 100644
index 4638fb6..0000000
Binary files a/src/eval/SYMBOL_FUNCTION.class and /dev/null differ
diff --git a/src/eval/SymbolTable.class b/src/eval/SymbolTable.class
deleted file mode 100644
index 6e6dbb7..0000000
Binary files a/src/eval/SymbolTable.class and /dev/null differ
diff --git a/src/eval/UDFunction.class b/src/eval/UDFunction.class
deleted file mode 100644
index afbca9e..0000000
Binary files a/src/eval/UDFunction.class and /dev/null differ
diff --git a/src/main/LispInterpreter.class b/src/main/LispInterpreter.class
deleted file mode 100644
index 3b4d901..0000000
Binary files a/src/main/LispInterpreter.class and /dev/null differ
diff --git a/src/main/LispParserDriver.class b/src/main/LispParserDriver.class
deleted file mode 100644
index 521f57c..0000000
Binary files a/src/main/LispParserDriver.class and /dev/null differ
diff --git a/src/main/LispParserDriver.java b/src/main/LispParserDriver.java
deleted file mode 100644
index d0ffc46..0000000
--- a/src/main/LispParserDriver.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Name: Mike Cifelli
- * Course: CIS 443 - Programming Languages
- * Assignment: Lisp Parser
- */
-
-package main;
-
-import parser.*;
-import error.ErrorManager;
-import java.io.*;
-
-/**
- * LispParserDriver
is a program that takes the name of a file
- * as a command-line argument, creates an internal representation of the
- * S-expressions found in the file and prints them to the console. If no file
- * name is provided at the command-line, this program will read from standard
- * input.
- */
-public class LispParserDriver {
-
- /**
- * Create internal representations of the S-expressions found in the file
- * whose name was given as a command-line argument and print them to the
- * console. If no file name was given, retrieve the S-expressions from
- * standard input.
- *
- * @param args
- * the command-line arguments:
- *
- * args[0]
- file name (optional)
- *
- */
- public static void main(String[] args) {
- LispParser parser = null;
-
- if (args.length > 0) {
- // a file name was given at the command-line, attempt to create a
- // 'LispParser' on it
- try {
- parser = new LispParser(new FileInputStream(args[0]), args[0]);
- } catch (FileNotFoundException e) {
- ErrorManager.generateError(e.getMessage(),
- ErrorManager.CRITICAL_LEVEL);
- }
- } else {
- // no file name was given, create a 'LispParser' on standard input
- parser = new LispParser(System.in, "System.in");
- }
-
- while (! parser.eof()) {
- try {
- SExpression sexpr = parser.getSExpr();
-
- System.out.println(sexpr.toString());
- } catch (RuntimeException e) {
- ErrorManager.generateError(e.getMessage(), 2);
- } catch (IOException e) {
- ErrorManager.generateError(e.getMessage(),
- ErrorManager.CRITICAL_LEVEL);
- }
- }
- }
-
-}
diff --git a/src/main/LispScannerDriver.class b/src/main/LispScannerDriver.class
deleted file mode 100644
index 23a6959..0000000
Binary files a/src/main/LispScannerDriver.class and /dev/null differ
diff --git a/src/main/LispScannerDriver.java b/src/main/LispScannerDriver.java
deleted file mode 100644
index 13447c3..0000000
--- a/src/main/LispScannerDriver.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Name: Mike Cifelli
- * Course: CIS 443 - Programming Languages
- * Assignment: Lisp Interpreter Phase 1 - Lexical Analysis
- */
-
-package main;
-
-import scanner.*;
-import error.ErrorManager;
-import java.io.*;
-
-/**
- * LispScannerDriver
is a program that takes the name of a file
- * as a command-line argument, retrieves all of the Lisp tokens from the file
- * and prints them to the console. If no file name is provided at the
- * command-line, this program will read from standard input.
- */
-public class LispScannerDriver {
-
- /**
- * Obtain the Lisp tokens from the file whose name was given as a
- * command-line argument and print them to the console. If no file name was
- * given, retrieve the tokens from standard input.
- *
- * @param args
- * the command-line arguments:
- *
- * args[0]
- file name (optional)
- *
- */
- public static void main(String[] args) {
- LispScanner in = null;
-
- if (args.length > 0) {
- // a file name was given at the command-line, attempt to create a
- // 'LispScanner' on it
- try {
- in = new LispScanner(new FileInputStream(args[0]), args[0]);
- } catch (FileNotFoundException e) {
- ErrorManager.generateError(e.getMessage(),
- ErrorManager.CRITICAL_LEVEL);
- }
- } else {
- // no file name was given, create a 'LispScanner' on standard input
- in = new LispScanner(System.in, "System.in");
- }
-
- Token t = null;
-
- do {
- try {
- t = in.nextToken();
-
- System.out.printf("%-15s%-25s%5d%5d%25s\n", t.getType(),
- t.getText(),
- t.getLine(),
- t.getColumn(),
- t.getFName());
- } catch (RuntimeException e) {
- ErrorManager.generateError(e.getMessage(), 2);
- } catch (IOException e) {
- ErrorManager.generateError(e.getMessage(),
- ErrorManager.CRITICAL_LEVEL);
- }
- } while ((t == null) || (t.getType() != Token.Type.EOF));
- }
-
-}
diff --git a/src/parser/Atom.class b/src/parser/Atom.class
deleted file mode 100644
index e3eb78f..0000000
Binary files a/src/parser/Atom.class and /dev/null differ
diff --git a/src/parser/Cons.class b/src/parser/Cons.class
deleted file mode 100644
index 7d5d2c6..0000000
Binary files a/src/parser/Cons.class and /dev/null differ
diff --git a/src/parser/LispNumber.class b/src/parser/LispNumber.class
deleted file mode 100644
index 6f45292..0000000
Binary files a/src/parser/LispNumber.class and /dev/null differ
diff --git a/src/parser/LispParser$1.class b/src/parser/LispParser$1.class
deleted file mode 100644
index 349ebea..0000000
Binary files a/src/parser/LispParser$1.class and /dev/null differ
diff --git a/src/parser/LispParser.class b/src/parser/LispParser.class
deleted file mode 100644
index b428895..0000000
Binary files a/src/parser/LispParser.class and /dev/null differ
diff --git a/src/parser/LispString.class b/src/parser/LispString.class
deleted file mode 100644
index 49a710f..0000000
Binary files a/src/parser/LispString.class and /dev/null differ
diff --git a/src/parser/Nil.class b/src/parser/Nil.class
deleted file mode 100644
index 73def30..0000000
Binary files a/src/parser/Nil.class and /dev/null differ
diff --git a/src/parser/SExpression.class b/src/parser/SExpression.class
deleted file mode 100644
index 2c11139..0000000
Binary files a/src/parser/SExpression.class and /dev/null differ
diff --git a/src/parser/Symbol.class b/src/parser/Symbol.class
deleted file mode 100644
index 0b28c98..0000000
Binary files a/src/parser/Symbol.class and /dev/null differ
diff --git a/src/scanner/LispFilterStream.class b/src/scanner/LispFilterStream.class
deleted file mode 100644
index c520c13..0000000
Binary files a/src/scanner/LispFilterStream.class and /dev/null differ
diff --git a/src/scanner/LispScanner.class b/src/scanner/LispScanner.class
deleted file mode 100644
index fc19894..0000000
Binary files a/src/scanner/LispScanner.class and /dev/null differ
diff --git a/src/scanner/Token$Type.class b/src/scanner/Token$Type.class
deleted file mode 100644
index 6f4aff2..0000000
Binary files a/src/scanner/Token$Type.class and /dev/null differ
diff --git a/src/scanner/Token.class b/src/scanner/Token.class
deleted file mode 100644
index ec0cbe6..0000000
Binary files a/src/scanner/Token.class and /dev/null differ