Import organization

5 files changed, 44 insertions, 17 deletions

diff --git a/src/main/java/bjc/dicelang/scl/StreamControlConsole.java b/src/main/java/bjc/dicelang/scl/StreamControlConsole.java
index 6ab06ae..1a60beb 100644
--- a/src/main/java/bjc/dicelang/scl/StreamControlConsole.java
+++ b/src/main/java/bjc/dicelang/scl/StreamControlConsole.java
@@ -1,10 +1,10 @@
 package bjc.dicelang.scl;
 
+import java.util.Scanner;
+
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 
-import java.util.Scanner;
-
 /**
  * Implement a SCL REPL
  *
diff --git a/src/main/java/bjc/dicelang/scl/StreamControlEngine.java b/src/main/java/bjc/dicelang/scl/StreamControlEngine.java
index 68347cc..4b4dce7 100644
--- a/src/main/java/bjc/dicelang/scl/StreamControlEngine.java
+++ b/src/main/java/bjc/dicelang/scl/StreamControlEngine.java
@@ -1,5 +1,17 @@
 package bjc.dicelang.scl;
 
+import static bjc.dicelang.scl.Errors.ErrorKey.EK_SCL_INVARG;
+import static bjc.dicelang.scl.Errors.ErrorKey.EK_SCL_MMQUOTE;
+import static bjc.dicelang.scl.Errors.ErrorKey.EK_SCL_SUNDERFLOW;
+import static bjc.dicelang.scl.Errors.ErrorKey.EK_SCL_UNWORD;
+import static bjc.dicelang.scl.Errors.ErrorKey.WK_SCL_WRDFAIL;
+import static bjc.dicelang.scl.tokens.TokenType.ARRAY;
+import static bjc.dicelang.scl.tokens.TokenType.ILIT;
+import static bjc.dicelang.scl.tokens.TokenType.SYMBOL;
+import static bjc.dicelang.scl.tokens.TokenType.WORDS;
+import static bjc.dicelang.scl.tokens.WordType.NDROP;
+import static bjc.dicelang.scl.tokens.WordType.NNIP;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -20,10 +32,6 @@ import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 import bjc.utils.parserutils.TokenUtils;
 
-import static bjc.dicelang.scl.Errors.ErrorKey.*;
-import static bjc.dicelang.scl.tokens.TokenType.*;
-import static bjc.dicelang.scl.tokens.WordType.*;
-
 /*
  * @TODO 10/08/17 Ben Culkin :SCLReorg
  * 
diff --git a/src/main/java/bjc/dicelang/scl/StreamEngine.java b/src/main/java/bjc/dicelang/scl/StreamEngine.java
index 0c8d3bf..0b5f746 100644
--- a/src/main/java/bjc/dicelang/scl/StreamEngine.java
+++ b/src/main/java/bjc/dicelang/scl/StreamEngine.java
@@ -1,5 +1,14 @@
 package bjc.dicelang.scl;
 
+import static bjc.dicelang.scl.Errors.ErrorKey.EK_STRM_INVCOM;
+import static bjc.dicelang.scl.Errors.ErrorKey.EK_STRM_LAST;
+import static bjc.dicelang.scl.Errors.ErrorKey.EK_STRM_NONEX;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Predicate;
+
 import bjc.utils.esodata.SingleTape;
 import bjc.utils.esodata.Tape;
 import bjc.utils.funcdata.FunctionalList;
@@ -8,13 +17,6 @@ import bjc.utils.funcdata.IList;
 import bjc.utils.funcdata.IMap;
 import bjc.utils.funcutils.ListUtils;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Predicate;
-
-import static bjc.dicelang.scl.Errors.ErrorKey.*;
-
 /**
  * Implements multiple interleaved parse streams, as well as a command language
  * for the streams.
diff --git a/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java b/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java
index 1075ab8..1686fb0 100644
--- a/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java
+++ b/src/main/java/bjc/dicelang/scl/tokens/SCLToken.java
@@ -1,14 +1,17 @@
 package bjc.dicelang.scl.tokens;
 
+import static bjc.dicelang.scl.Errors.ErrorKey.EK_SCL_INVTOKEN;
+import static bjc.dicelang.scl.tokens.TokenType.DQUOTE;
+import static bjc.dicelang.scl.tokens.TokenType.OBRACE;
+import static bjc.dicelang.scl.tokens.TokenType.OBRACKET;
+import static bjc.dicelang.scl.tokens.TokenType.SQUOTE;
+
 import java.util.HashMap;
 import java.util.Map;
 
 import bjc.dicelang.scl.Errors;
 import bjc.utils.parserutils.TokenUtils;
 
-import static bjc.dicelang.scl.Errors.ErrorKey.*;
-import static bjc.dicelang.scl.tokens.TokenType.*;
-
 /**
  * Base class for SCL tokens.
  * 
diff --git a/src/main/java/bjc/dicelang/scl/tokens/WordSCLToken.java b/src/main/java/bjc/dicelang/scl/tokens/WordSCLToken.java
index 6fd444d..5cdd4bf 100644
--- a/src/main/java/bjc/dicelang/scl/tokens/WordSCLToken.java
+++ b/src/main/java/bjc/dicelang/scl/tokens/WordSCLToken.java
@@ -1,6 +1,20 @@
 package bjc.dicelang.scl.tokens;
 
-import static bjc.dicelang.scl.tokens.WordType.*;
+import static bjc.dicelang.scl.tokens.WordType.DEFINE;
+import static bjc.dicelang.scl.tokens.WordType.DELETESTREAM;
+import static bjc.dicelang.scl.tokens.WordType.DROP;
+import static bjc.dicelang.scl.tokens.WordType.LEFTSTREAM;
+import static bjc.dicelang.scl.tokens.WordType.MAKEARRAY;
+import static bjc.dicelang.scl.tokens.WordType.MAKEEXEC;
+import static bjc.dicelang.scl.tokens.WordType.MAKEUNEXEC;
+import static bjc.dicelang.scl.tokens.WordType.MERGESTREAM;
+import static bjc.dicelang.scl.tokens.WordType.NDROP;
+import static bjc.dicelang.scl.tokens.WordType.NEWSTREAM;
+import static bjc.dicelang.scl.tokens.WordType.NIP;
+import static bjc.dicelang.scl.tokens.WordType.NNIP;
+import static bjc.dicelang.scl.tokens.WordType.RIGHTSTREAM;
+import static bjc.dicelang.scl.tokens.WordType.STACKCOUNT;
+import static bjc.dicelang.scl.tokens.WordType.STACKEMPTY;
 
 import java.util.HashMap;
 import java.util.Map;