Reorganize

8 files changed, 35 insertions, 37 deletions

diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/AssignCommand.java b/JPratt/src/examples/java/bjc/pratt/examples/AssignCommand.java
index 4bdd60f..eb99350 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/AssignCommand.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/AssignCommand.java
@@ -1,12 +1,12 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
+import bjc.pratt.commands.NonBinaryCommand;
+import bjc.pratt.tokens.StringToken;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-import bjc.utils.parserutils.pratt.commands.NonBinaryCommand;
-import bjc.utils.parserutils.pratt.tokens.StringToken;
 
 class AssignCommand extends NonBinaryCommand<String, String, TestContext> {
 	public AssignCommand(int prec) {
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/BlockEnter.java b/JPratt/src/examples/java/bjc/pratt/examples/BlockEnter.java
index ac04720..71d4e72 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/BlockEnter.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/BlockEnter.java
@@ -1,8 +1,8 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.esodata.Directory;
-import bjc.utils.parserutils.pratt.Token;
 
 import java.util.function.UnaryOperator;
 
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/BlockExit.java b/JPratt/src/examples/java/bjc/pratt/examples/BlockExit.java
index b067464..1cca6d5 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/BlockExit.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/BlockExit.java
@@ -1,4 +1,4 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
 import java.util.function.UnaryOperator;
 
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/PrattParserTest.java b/JPratt/src/examples/java/bjc/pratt/examples/PrattParserTest.java
index 2cc53b0..4a9ae56 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/PrattParserTest.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/PrattParserTest.java
@@ -1,14 +1,14 @@
-package bjc.utils.examples.parsing;
-
+package bjc.pratt.examples;
+
+import bjc.pratt.InitialCommand;
+import bjc.pratt.NonInitialCommand;
+import bjc.pratt.PrattParser;
+import bjc.pratt.Token;
+import bjc.pratt.tokens.StringToken;
+import bjc.pratt.tokens.StringTokenStream;
 import bjc.utils.data.ITree;
 import bjc.utils.data.TransformIterator;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.NonInitialCommand;
-import bjc.utils.parserutils.pratt.PrattParser;
-import bjc.utils.parserutils.pratt.Token;
-import bjc.utils.parserutils.pratt.tokens.StringToken;
-import bjc.utils.parserutils.pratt.tokens.StringTokenStream;
 import bjc.utils.parserutils.splitter.TokenSplitter;
 import bjc.utils.parserutils.splitter.TwoLevelSplitter;
 
@@ -22,11 +22,9 @@ import java.util.Scanner;
 import java.util.Set;
 import java.util.function.UnaryOperator;
 
-import static bjc.utils.parserutils.pratt.commands.NonInitialCommands.*;
-import static bjc.utils.parserutils.pratt.commands.InitialCommands.*;
-
-import static bjc.utils.parserutils.pratt.tokens.StringToken.litToken;
-
+import static bjc.pratt.commands.InitialCommands.*;
+import static bjc.pratt.commands.NonInitialCommands.*;
+import static bjc.pratt.tokens.StringToken.litToken;
 import static bjc.utils.functypes.ID.id;
 
 /**
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/SwitchCommand.java b/JPratt/src/examples/java/bjc/pratt/examples/SwitchCommand.java
index 78d8093..4a5bd22 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/SwitchCommand.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/SwitchCommand.java
@@ -1,12 +1,12 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
+import bjc.pratt.InitialCommand;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
+import bjc.pratt.tokens.StringToken;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.InitialCommand;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-import bjc.utils.parserutils.pratt.tokens.StringToken;
 
 class SwitchCommand implements InitialCommand<String, String, TestContext> {
 	@Override
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/TestContext.java b/JPratt/src/examples/java/bjc/pratt/examples/TestContext.java
index 7f9986e..b5e8448 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/TestContext.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/TestContext.java
@@ -1,11 +1,11 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
+import bjc.pratt.Token;
 import bjc.utils.data.ITree;
 import bjc.utils.esodata.Directory;
 import bjc.utils.esodata.SimpleDirectory;
 import bjc.utils.esodata.SimpleStack;
 import bjc.utils.esodata.Stack;
-import bjc.utils.parserutils.pratt.Token;
 
 /**
  * Simple context for the parser.
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/Tokenizer.java b/JPratt/src/examples/java/bjc/pratt/examples/Tokenizer.java
index a224de6..563b578 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/Tokenizer.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/Tokenizer.java
@@ -1,12 +1,12 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
-import bjc.utils.parserutils.pratt.Token;
-import bjc.utils.parserutils.pratt.tokens.StringToken;
+import bjc.pratt.Token;
+import bjc.pratt.tokens.StringToken;
 
 import java.util.Set;
 import java.util.function.Function;
 
-import static bjc.utils.parserutils.pratt.tokens.StringToken.litToken;
+import static bjc.pratt.tokens.StringToken.litToken;
 
 final class Tokenizer implements Function<String, Token<String, String>> {
 	private Set<String>	ops;
diff --git a/JPratt/src/examples/java/bjc/utils/examples/parsing/VarCommand.java b/JPratt/src/examples/java/bjc/pratt/examples/VarCommand.java
index 5cf4b25..dd04a59 100644
--- a/JPratt/src/examples/java/bjc/utils/examples/parsing/VarCommand.java
+++ b/JPratt/src/examples/java/bjc/pratt/examples/VarCommand.java
@@ -1,12 +1,12 @@
-package bjc.utils.examples.parsing;
+package bjc.pratt.examples;
 
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
+import bjc.pratt.commands.AbstractInitialCommand;
+import bjc.pratt.tokens.StringToken;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
-import bjc.utils.parserutils.pratt.ParserContext;
-import bjc.utils.parserutils.pratt.Token;
-import bjc.utils.parserutils.pratt.commands.AbstractInitialCommand;
-import bjc.utils.parserutils.pratt.tokens.StringToken;
 
 class VarCommand extends AbstractInitialCommand<String, String, TestContext> {