Formatting pass

8 files changed, 33 insertions, 35 deletions

diff --git a/base/src/bjc/dicelang/scl/BooleanSCLToken.java b/base/src/bjc/dicelang/scl/BooleanSCLToken.java
index 5f89ce0..e2e8e12 100644
--- a/base/src/bjc/dicelang/scl/BooleanSCLToken.java
+++ b/base/src/bjc/dicelang/scl/BooleanSCLToken.java
@@ -3,10 +3,10 @@ package bjc.dicelang.scl;
 public class BooleanSCLToken extends SCLToken {
 	/* Used for BLIT */
 	public boolean boolVal;
-	
+
 	public BooleanSCLToken(boolean val) {
 		super(Type.BLIT);
-		
+
 		boolVal = val;
 	}
 
diff --git a/base/src/bjc/dicelang/scl/FloatSCLToken.java b/base/src/bjc/dicelang/scl/FloatSCLToken.java
index 46db4c5..f02c796 100644
--- a/base/src/bjc/dicelang/scl/FloatSCLToken.java
+++ b/base/src/bjc/dicelang/scl/FloatSCLToken.java
@@ -3,10 +3,10 @@ package bjc.dicelang.scl;
 public class FloatSCLToken extends SCLToken {
 	/* Used for FLIT */
 	public double floatVal;
-	
+
 	public FloatSCLToken(double val) {
 		super(Type.FLIT);
-		
+
 		floatVal = val;
 	}
 
diff --git a/base/src/bjc/dicelang/scl/IntSCLToken.java b/base/src/bjc/dicelang/scl/IntSCLToken.java
index b90aa83..9e88dbe 100644
--- a/base/src/bjc/dicelang/scl/IntSCLToken.java
+++ b/base/src/bjc/dicelang/scl/IntSCLToken.java
@@ -12,7 +12,7 @@ public class IntSCLToken extends SCLToken {
 	/* Create a new token. */
 	public IntSCLToken(final long iVal) {
 		super(Type.ILIT);
-		
+
 		intVal = iVal;
 	}
 }
\ No newline at end of file
diff --git a/base/src/bjc/dicelang/scl/StreamControlConsole.java b/base/src/bjc/dicelang/scl/StreamControlConsole.java
index 78b1d49..ca61244 100644
--- a/base/src/bjc/dicelang/scl/StreamControlConsole.java
+++ b/base/src/bjc/dicelang/scl/StreamControlConsole.java
@@ -12,26 +12,25 @@ import java.util.Scanner;
  */
 public class StreamControlConsole {
 	/*
-	 * @TODO 10/08/17 :SCLArgs
-	 * 	Do something useful with the CLI args.
+	 * @TODO 10/08/17 :SCLArgs Do something useful with the CLI args.
 	 *
 	 */
 	/**
 	 * Main method
 	 *
 	 * @param args
-	 * 	Unused CLI args.
+	 *            Unused CLI args.
 	 */
 	public static void main(String[] args) {
 		/*
 		 * Initialize vars.
-		* 
-		*  We can get away with passing the null, because StreamEngine
-		*  doesn't reference any parts of DiceLangEngine.
+		 * 
+		 * We can get away with passing the null, because StreamEngine doesn't reference
+		 * any parts of DiceLangEngine.
 		 */
-		StreamEngine sengine          = new StreamEngine(null);
+		StreamEngine sengine = new StreamEngine(null);
 		StreamControlEngine sclengine = new StreamControlEngine(sengine);
-		Scanner scn                   = new Scanner(System.in);
+		Scanner scn = new Scanner(System.in);
 
 		/* Get input from the user. */
 		System.out.print("Enter a SCL command string (blank to exit): ");
@@ -47,7 +46,7 @@ public class StreamControlConsole {
 
 			/* Break the token into strings. */
 			IList<String> res = new FunctionalList<>();
-			String[] tokens   = ln.split(" ");
+			String[] tokens = ln.split(" ");
 
 			/* Run the stream engine on the tokens. */
 			boolean succ = sengine.doStreams(tokens, res);
@@ -58,7 +57,7 @@ public class StreamControlConsole {
 
 			/* Run the command through SCL. */
 			tokens = res.toArray(new String[res.getSize()]);
-			succ   = sclengine.runProgram(tokens);
+			succ = sclengine.runProgram(tokens);
 			if (!succ) {
 				System.out.printf("ERROR: SCL engine failed for line '%s'\n", ln);
 				continue;
diff --git a/base/src/bjc/dicelang/scl/StreamEngine.java b/base/src/bjc/dicelang/scl/StreamEngine.java
index 2e0a6d7..2d931b9 100644
--- a/base/src/bjc/dicelang/scl/StreamEngine.java
+++ b/base/src/bjc/dicelang/scl/StreamEngine.java
@@ -30,8 +30,8 @@ public class StreamEngine {
 	DiceLangEngine eng;
 
 	/* Our streams. */
-	Tape<IList<String>>     streams;
-	IList<String>           currStream;
+	Tape<IList<String>> streams;
+	IList<String> currStream;
 
 	/* Saved streams */
 	TapeLibrary<IList<String>> savedStreams;
@@ -43,7 +43,7 @@ public class StreamEngine {
 	 * Create a new stream engine.
 	 *
 	 * @param engine
-	 *                The dice engine we're attached to.
+	 *            The dice engine we're attached to.
 	 */
 	public StreamEngine(final DiceLangEngine engine) {
 		eng = engine;
@@ -66,10 +66,10 @@ public class StreamEngine {
 	 * Process a possibly interleaved set of streams.
 	 *
 	 * @param toks
-	 *                The raw token to read streams from.
+	 *            The raw token to read streams from.
 	 *
 	 * @param dest
-	 *                The list to write the final stream to.
+	 *            The list to write the final stream to.
 	 *
 	 * @return Whether or not the streams were successfully processed.
 	 */
@@ -81,10 +81,10 @@ public class StreamEngine {
 	 * Process a possibly interleaved set of streams.
 	 *
 	 * @param toks
-	 *                The raw token to read streams from.
+	 *            The raw token to read streams from.
 	 *
 	 * @param dest
-	 *                The list to write the final stream to.
+	 *            The list to write the final stream to.
 	 *
 	 * @return Whether or not the streams were successfully processed.
 	 */
@@ -212,9 +212,8 @@ public class StreamEngine {
 
 		/* Process each command. */
 		/*
-		 * @TODO 10/09/17 Ben Culkin :StreamCommands
-		 * 	This should probably be refactored in some way, so as to
-		 * 	make it easier to add new commands.
+		 * @TODO 10/09/17 Ben Culkin :StreamCommands This should probably be refactored
+		 * in some way, so as to make it easier to add new commands.
 		 */
 		for (final char comm : comms) {
 			switch (comm) {
diff --git a/base/src/bjc/dicelang/scl/StringSCLToken.java b/base/src/bjc/dicelang/scl/StringSCLToken.java
index f594c4c..1436bc3 100644
--- a/base/src/bjc/dicelang/scl/StringSCLToken.java
+++ b/base/src/bjc/dicelang/scl/StringSCLToken.java
@@ -3,14 +3,14 @@ package bjc.dicelang.scl;
 public class StringSCLToken extends SCLToken {
 	/* Used for SYMBOL & SLIT */
 	public String stringVal;
-	
+
 	protected StringSCLToken(boolean isSymbol, String val) {
-		if(isSymbol) {
+		if (isSymbol) {
 			type = Type.SYMBOL;
 		} else {
 			type = Type.SLIT;
 		}
-		
+
 		stringVal = val;
 	}
 
diff --git a/base/src/bjc/dicelang/scl/WordListSCLToken.java b/base/src/bjc/dicelang/scl/WordListSCLToken.java
index d13f7ab..ffa0e85 100644
--- a/base/src/bjc/dicelang/scl/WordListSCLToken.java
+++ b/base/src/bjc/dicelang/scl/WordListSCLToken.java
@@ -7,12 +7,12 @@ public class WordListSCLToken extends SCLToken {
 	public IList<SCLToken> tokenVals;
 
 	protected WordListSCLToken(boolean isArray, IList<SCLToken> tokens) {
-		if(isArray) {
+		if (isArray) {
 			type = Type.ARRAY;
 		} else {
 			type = Type.WORDS;
 		}
-		
+
 		tokenVals = tokens;
 	}
 
diff --git a/base/src/bjc/dicelang/scl/WordSCLToken.java b/base/src/bjc/dicelang/scl/WordSCLToken.java
index 3fe78b3..ea3118e 100644
--- a/base/src/bjc/dicelang/scl/WordSCLToken.java
+++ b/base/src/bjc/dicelang/scl/WordSCLToken.java
@@ -16,14 +16,14 @@ public class WordSCLToken extends SCLToken {
 	}
 
 	public Word wordVal;
-	
+
 	public WordSCLToken(String wrd) {
 		this(builtinWords.get(wrd));
 	}
-	
+
 	public WordSCLToken(Word wrd) {
 		super(Type.WORD);
-		
+
 		wordVal = wrd;
 	}
 
@@ -57,9 +57,9 @@ public class WordSCLToken extends SCLToken {
 	public static boolean isBuiltinWord(String wrd) {
 		return builtinWords.containsKey(wrd);
 	}
-	
+
 	private static final Map<String, WordSCLToken.Word> builtinWords;
-	
+
 	static {
 		/* Init builtin words. */
 		builtinWords = new HashMap<>();