Cleanliness

4 files changed, 16 insertions, 23 deletions

diff --git a/dice-lang/src/bjc/dicelang/CLIArgsParser.java b/dice-lang/src/bjc/dicelang/CLIArgsParser.java
index 02762cb..de92ff1 100644
--- a/dice-lang/src/bjc/dicelang/CLIArgsParser.java
+++ b/dice-lang/src/bjc/dicelang/CLIArgsParser.java
@@ -105,25 +105,23 @@ public class CLIArgsParser {
 		String fName = args[i + 1];
 
 		try(FileInputStream fis = new FileInputStream(fName)) {
-			Scanner scan = new Scanner(fis);
-
-			while(scan.hasNextLine()) {
-				String ln = scan.nextLine();
-
-				Define dfn = parseDefine(ln.substring(ln.indexOf(' ')));
-				if(dfn == null || dfn.inError) return -1;
-
-				if(ln.startsWith("line")) {
-					eng.addLineDefine(dfn);
-				} else if(ln.startsWith("token")) {
-					eng.addTokenDefine(dfn);
-				} else {
-					Errors.inst.printError(EK_CLI_INVDFNTYPE, ln.substring(0, ln.indexOf(' ')));
-					return -1;
+			try(Scanner scan = new Scanner(fis)) {
+				while(scan.hasNextLine()) {
+					String ln = scan.nextLine();
+	
+					Define dfn = parseDefine(ln.substring(ln.indexOf(' ')));
+					if(dfn == null || dfn.inError) return -1;
+	
+					if(ln.startsWith("line")) {
+						eng.addLineDefine(dfn);
+					} else if(ln.startsWith("token")) {
+						eng.addTokenDefine(dfn);
+					} else {
+						Errors.inst.printError(EK_CLI_INVDFNTYPE, ln.substring(0, ln.indexOf(' ')));
+						return -1;
+					}
 				}
 			}
-
-			scan.close();
 		} catch (FileNotFoundException fnfex) {
 			Errors.inst.printError(EK_CLI_NOFILE, fName);
 			return -1;
diff --git a/dice-lang/src/bjc/dicelang/DiceLangEngine.java b/dice-lang/src/bjc/dicelang/DiceLangEngine.java
index 7648568..12fa22d 100644
--- a/dice-lang/src/bjc/dicelang/DiceLangEngine.java
+++ b/dice-lang/src/bjc/dicelang/DiceLangEngine.java
@@ -2,9 +2,7 @@ package bjc.dicelang;
 
 import bjc.dicelang.scl.StreamEngine;
 
-import bjc.utils.data.IPair;
 import bjc.utils.data.ITree;
-import bjc.utils.data.Pair;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.FunctionalMap;
 import bjc.utils.funcdata.FunctionalStringTokenizer;
@@ -325,7 +323,7 @@ public class DiceLangEngine {
 		/*
 		 * Expand tokens
 		 */
-		IList<String> fullyExpandedTokens = tokens.flatMap((token) -> new FunctionalList(opExpander.split(token)));
+		IList<String> fullyExpandedTokens = tokens.flatMap((token) -> new FunctionalList<>(opExpander.split(token)));
 		System.out.println("\tCommand after token expansion: " + fullyExpandedTokens.toString());
 
 		/*
diff --git a/dice-lang/src/bjc/dicelang/Tokenizer.java b/dice-lang/src/bjc/dicelang/Tokenizer.java
index 688a632..11bffec 100644
--- a/dice-lang/src/bjc/dicelang/Tokenizer.java
+++ b/dice-lang/src/bjc/dicelang/Tokenizer.java
@@ -101,7 +101,6 @@ public class Tokenizer {
 		return tk;

 	}

 

-	private Pattern intMatcher          = Pattern.compile("\\A[\\-\\+]?\\d+\\Z");

 	private Pattern hexadecimalMatcher  = Pattern.compile("\\A[\\-\\+]?0x[0-9A-Fa-f]+\\Z");

 	private Pattern flexadecimalMatcher = Pattern.compile("\\A[\\-\\+]?[0-9][0-9A-Za-z]+B\\d{1,2}\\Z");

 	private Pattern stringLitMatcher    = Pattern.compile("\\AstringLiteral(\\d+)\\Z");

diff --git a/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java b/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java
index 554f41b..8759c84 100644
--- a/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java
+++ b/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java
@@ -4,14 +4,12 @@ import bjc.dicelang.Errors;
 
 import bjc.utils.esodata.Stack;
 import bjc.utils.esodata.SimpleStack;
-import bjc.utils.esodata.Tape;
 import bjc.utils.funcdata.IList;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcutils.StringUtils;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.regex.Pattern;
 
 import static bjc.dicelang.Errors.ErrorKey.*;
 import static bjc.dicelang.scl.StreamControlEngine.Token.Type.*;