Refactor source directories again

2018-03-17 14:18:02 -04:00 · 2018-03-17 14:18:02 -04:00 · a25141a9b1
parent bd7df920fa
commit a25141a9b1
212 changed files with 12 additions and 10 deletions
--- a/pom.xml
+++ b/pom.xml
@ -9,8 +9,10 @@
  <version>1.2.0</version>

  <build>
-    <sourceDirectory>src/main</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <!--<sourceDirectory>src/main/kotlin</sourceDirectory>-->
+    <testSourceDirectory>src/test/java</testSourceDirectory>
+    <!--<testSourceDirectory>src/test/kotlin</testSourceDirectory>-->

    <resources>
      <resource>
@ -18,14 +20,14 @@
      </resource>
    </resources>

-    <testResources>
-      <testResource>
-        <directory>src/test</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </testResource>
-    </testResources>
+    <!--<testResources>-->
+      <!--<testResource>-->
+        <!--<directory>src/test</directory>-->
+        <!--<excludes>-->
+          <!--<exclude>**/*.java</exclude>-->
+        <!--</excludes>-->
+      <!--</testResource>-->
+    <!--</testResources>-->

    <plugins>
      <plugin>
--- a/src/main/java/application/LispMain.java
+++ b/src/main/java/application/LispMain.java
--- a/src/main/java/environment/RuntimeEnvironment.java
+++ b/src/main/java/environment/RuntimeEnvironment.java
--- a/src/main/java/error/CriticalLineColumnException.java
+++ b/src/main/java/error/CriticalLineColumnException.java
--- a/src/main/java/error/CriticalLispException.java
+++ b/src/main/java/error/CriticalLispException.java
--- a/src/main/java/error/ErrorManager.java
+++ b/src/main/java/error/ErrorManager.java
--- a/src/main/java/error/LineColumnException.java
+++ b/src/main/java/error/LineColumnException.java
--- a/src/main/java/error/LispException.java
+++ b/src/main/java/error/LispException.java
--- a/src/main/java/error/LispWarning.java
+++ b/src/main/java/error/LispWarning.java
--- a/src/main/java/file/FilePosition.java
+++ b/src/main/java/file/FilePosition.java
--- a/src/main/java/file/FilePositionTracker.java
+++ b/src/main/java/file/FilePositionTracker.java
--- a/src/main/java/function/ArgumentValidator.java
+++ b/src/main/java/function/ArgumentValidator.java
--- a/src/main/java/function/FunctionNames.java
+++ b/src/main/java/function/FunctionNames.java
--- a/src/main/java/function/LispFunction.java
+++ b/src/main/java/function/LispFunction.java
--- a/src/main/java/function/LispSpecialFunction.java
+++ b/src/main/java/function/LispSpecialFunction.java
--- a/src/main/java/function/UserDefinedFunction.java
+++ b/src/main/java/function/UserDefinedFunction.java
--- a/src/main/java/function/UserDefinedMacro.java
+++ b/src/main/java/function/UserDefinedMacro.java
--- a/src/main/java/function/UserDefinedSpecialFunction.java
+++ b/src/main/java/function/UserDefinedSpecialFunction.java
--- a/src/main/java/function/builtin/APPLY.java
+++ b/src/main/java/function/builtin/APPLY.java
--- a/src/main/java/function/builtin/BackquoteEvaluator.java
+++ b/src/main/java/function/builtin/BackquoteEvaluator.java
--- a/src/main/java/function/builtin/EVAL.java
+++ b/src/main/java/function/builtin/EVAL.java
--- a/src/main/java/function/builtin/EXIT.java
+++ b/src/main/java/function/builtin/EXIT.java
--- a/src/main/java/function/builtin/FUNCALL.java
+++ b/src/main/java/function/builtin/FUNCALL.java
--- a/src/main/java/function/builtin/FUSE.java
+++ b/src/main/java/function/builtin/FUSE.java
--- a/src/main/java/function/builtin/GENSYM.java
+++ b/src/main/java/function/builtin/GENSYM.java
--- a/src/main/java/function/builtin/LOAD.java
+++ b/src/main/java/function/builtin/LOAD.java
--- a/src/main/java/function/builtin/PRINT.java
+++ b/src/main/java/function/builtin/PRINT.java
--- a/src/main/java/function/builtin/SET.java
+++ b/src/main/java/function/builtin/SET.java
--- a/src/main/java/function/builtin/SYMBOLS.java
+++ b/src/main/java/function/builtin/SYMBOLS.java
--- a/src/main/java/function/builtin/SYMBOL_FUNCTION.java
+++ b/src/main/java/function/builtin/SYMBOL_FUNCTION.java
--- a/src/main/java/function/builtin/cons/APPEND.java
+++ b/src/main/java/function/builtin/cons/APPEND.java
--- a/src/main/java/function/builtin/cons/CONS.java
+++ b/src/main/java/function/builtin/cons/CONS.java
--- a/src/main/java/function/builtin/cons/FIRST.java
+++ b/src/main/java/function/builtin/cons/FIRST.java
--- a/src/main/java/function/builtin/cons/LENGTH.java
+++ b/src/main/java/function/builtin/cons/LENGTH.java
--- a/src/main/java/function/builtin/cons/LIST.java
+++ b/src/main/java/function/builtin/cons/LIST.java
--- a/src/main/java/function/builtin/cons/REST.java
+++ b/src/main/java/function/builtin/cons/REST.java
--- a/src/main/java/function/builtin/math/DIVIDE.java
+++ b/src/main/java/function/builtin/math/DIVIDE.java
--- a/src/main/java/function/builtin/math/MINUS.java
+++ b/src/main/java/function/builtin/math/MINUS.java
--- a/src/main/java/function/builtin/math/MODULO.java
+++ b/src/main/java/function/builtin/math/MODULO.java
--- a/src/main/java/function/builtin/math/MULTIPLY.java
+++ b/src/main/java/function/builtin/math/MULTIPLY.java
--- a/src/main/java/function/builtin/math/MathFunction.java
+++ b/src/main/java/function/builtin/math/MathFunction.java
--- a/src/main/java/function/builtin/math/PLUS.java
+++ b/src/main/java/function/builtin/math/PLUS.java
--- a/src/main/java/function/builtin/math/REMAINDER.java
+++ b/src/main/java/function/builtin/math/REMAINDER.java
--- a/src/main/java/function/builtin/predicate/ATOM.java
+++ b/src/main/java/function/builtin/predicate/ATOM.java
--- a/src/main/java/function/builtin/predicate/EQ.java
+++ b/src/main/java/function/builtin/predicate/EQ.java
--- a/src/main/java/function/builtin/predicate/EQUAL.java
+++ b/src/main/java/function/builtin/predicate/EQUAL.java
--- a/src/main/java/function/builtin/predicate/GENSYM_EQUAL.java
+++ b/src/main/java/function/builtin/predicate/GENSYM_EQUAL.java
--- a/src/main/java/function/builtin/predicate/LISTP.java
+++ b/src/main/java/function/builtin/predicate/LISTP.java
--- a/src/main/java/function/builtin/predicate/NULL.java
+++ b/src/main/java/function/builtin/predicate/NULL.java
--- a/src/main/java/function/builtin/predicate/NUMERIC_EQUAL.java
+++ b/src/main/java/function/builtin/predicate/NUMERIC_EQUAL.java
--- a/src/main/java/function/builtin/predicate/NUMERIC_GREATER.java
+++ b/src/main/java/function/builtin/predicate/NUMERIC_GREATER.java
--- a/src/main/java/function/builtin/predicate/NUMERIC_LESS.java
+++ b/src/main/java/function/builtin/predicate/NUMERIC_LESS.java
--- a/src/main/java/function/builtin/special/AND.java
+++ b/src/main/java/function/builtin/special/AND.java
--- a/src/main/java/function/builtin/special/CASE.java
+++ b/src/main/java/function/builtin/special/CASE.java
--- a/src/main/java/function/builtin/special/COND.java
+++ b/src/main/java/function/builtin/special/COND.java
--- a/src/main/java/function/builtin/special/DEFINE_SPECIAL.java
+++ b/src/main/java/function/builtin/special/DEFINE_SPECIAL.java
--- a/src/main/java/function/builtin/special/DEFMACRO.java
+++ b/src/main/java/function/builtin/special/DEFMACRO.java
--- a/src/main/java/function/builtin/special/DEFUN.java
+++ b/src/main/java/function/builtin/special/DEFUN.java
--- a/src/main/java/function/builtin/special/Define.java
+++ b/src/main/java/function/builtin/special/Define.java
--- a/src/main/java/function/builtin/special/IF.java
+++ b/src/main/java/function/builtin/special/IF.java
--- a/src/main/java/function/builtin/special/LAMBDA.java
+++ b/src/main/java/function/builtin/special/LAMBDA.java
--- a/src/main/java/function/builtin/special/LET.java
+++ b/src/main/java/function/builtin/special/LET.java
--- a/src/main/java/function/builtin/special/LET_STAR.java
+++ b/src/main/java/function/builtin/special/LET_STAR.java
--- a/src/main/java/function/builtin/special/OR.java
+++ b/src/main/java/function/builtin/special/OR.java
--- a/src/main/java/function/builtin/special/PROGN.java
+++ b/src/main/java/function/builtin/special/PROGN.java
--- a/src/main/java/function/builtin/special/QUOTE.java
+++ b/src/main/java/function/builtin/special/QUOTE.java
--- a/src/main/java/function/builtin/special/RECUR.java
+++ b/src/main/java/function/builtin/special/RECUR.java
--- a/src/main/java/function/builtin/special/SETQ.java
+++ b/src/main/java/function/builtin/special/SETQ.java
--- a/src/main/java/interpreter/FileLispInterpreter.java
+++ b/src/main/java/interpreter/FileLispInterpreter.java
--- a/src/main/java/interpreter/InteractiveLispInterpreter.java
+++ b/src/main/java/interpreter/InteractiveLispInterpreter.java
--- a/src/main/java/interpreter/LispInterpreter.java
+++ b/src/main/java/interpreter/LispInterpreter.java
--- a/src/main/java/interpreter/LispInterpreterBuilder.java
+++ b/src/main/java/interpreter/LispInterpreterBuilder.java
--- a/src/main/java/interpreter/LispInterpreterBuilderImpl.java
+++ b/src/main/java/interpreter/LispInterpreterBuilderImpl.java
--- a/src/main/java/parser/LispParser.java
+++ b/src/main/java/parser/LispParser.java
--- a/src/main/java/recursion/TailCall.java
+++ b/src/main/java/recursion/TailCall.java
--- a/src/main/java/recursion/TailCalls.java
+++ b/src/main/java/recursion/TailCalls.java
--- a/src/main/java/scanner/LispCommentRemovingInputStream.java
+++ b/src/main/java/scanner/LispCommentRemovingInputStream.java
--- a/src/main/java/scanner/LispInputStream.java
+++ b/src/main/java/scanner/LispInputStream.java
--- a/src/main/java/scanner/LispScanner.java
+++ b/src/main/java/scanner/LispScanner.java
--- a/src/main/java/sexpression/AtSignExpression.java
+++ b/src/main/java/sexpression/AtSignExpression.java
--- a/src/main/java/sexpression/Atom.java
+++ b/src/main/java/sexpression/Atom.java
--- a/src/main/java/sexpression/BackquoteExpression.java
+++ b/src/main/java/sexpression/BackquoteExpression.java
--- a/src/main/java/sexpression/CommaExpression.java
+++ b/src/main/java/sexpression/CommaExpression.java
--- a/src/main/java/sexpression/Cons.java
+++ b/src/main/java/sexpression/Cons.java
--- a/src/main/java/sexpression/DisplayName.java
+++ b/src/main/java/sexpression/DisplayName.java
--- a/src/main/java/sexpression/LambdaExpression.java
+++ b/src/main/java/sexpression/LambdaExpression.java
--- a/src/main/java/sexpression/LispNumber.java
+++ b/src/main/java/sexpression/LispNumber.java
--- a/src/main/java/sexpression/LispString.java
+++ b/src/main/java/sexpression/LispString.java
--- a/src/main/java/sexpression/Nil.java
+++ b/src/main/java/sexpression/Nil.java
--- a/src/main/java/sexpression/SExpression.java
+++ b/src/main/java/sexpression/SExpression.java
--- a/src/main/java/sexpression/Symbol.java
+++ b/src/main/java/sexpression/Symbol.java
--- a/src/main/java/stream/SafeInputStream.java
+++ b/src/main/java/stream/SafeInputStream.java
--- a/src/main/java/stream/SafeOutputStream.java
+++ b/src/main/java/stream/SafeOutputStream.java
--- a/src/main/java/stream/UncheckedIOException.java
+++ b/src/main/java/stream/UncheckedIOException.java
--- a/src/main/java/table/ExecutionContext.java
+++ b/src/main/java/table/ExecutionContext.java
--- a/src/main/java/table/FunctionTable.java
+++ b/src/main/java/table/FunctionTable.java
--- a/src/main/java/table/SymbolTable.java
+++ b/src/main/java/table/SymbolTable.java
--- a/src/main/java/terminal/ControlSequence.java
+++ b/src/main/java/terminal/ControlSequence.java
--- a/src/main/java/terminal/ControlSequenceHandler.java
+++ b/src/main/java/terminal/ControlSequenceHandler.java
--- a/src/main/java/terminal/ControlSequenceLookup.java
+++ b/src/main/java/terminal/ControlSequenceLookup.java
--- a/Show More
+++ b/Show More