From 2a284050cb5ccb2413840e989e4d369e52509ee1 Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Mon, 6 Mar 2017 14:18:04 -0500
Subject: Fix build issue

---
 dice-lang/src/bjc/dicelang/Define.java         |  3 +--
 dice-lang/src/bjc/dicelang/DiceLangEngine.java | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dice-lang/src/bjc/dicelang/Define.java b/dice-lang/src/bjc/dicelang/Define.java
index a70ca61..1beeecd 100644
--- a/dice-lang/src/bjc/dicelang/Define.java
+++ b/dice-lang/src/bjc/dicelang/Define.java
@@ -34,8 +34,6 @@ public class Define implements UnaryOperator<String> {
 		doRecur  = recur;
 		subType  = isSub;
 
-		inError = false;
-
 		/*
 		 * Only try to compile non-null predicates
 		 */
@@ -60,6 +58,7 @@ public class Define implements UnaryOperator<String> {
 			return;
 		}
 
+		inError = false;
 		/*
 		 * Check whether or not we do sub-replacements
 		 */
diff --git a/dice-lang/src/bjc/dicelang/DiceLangEngine.java b/dice-lang/src/bjc/dicelang/DiceLangEngine.java
index dfe956e..98e42fd 100644
--- a/dice-lang/src/bjc/dicelang/DiceLangEngine.java
+++ b/dice-lang/src/bjc/dicelang/DiceLangEngine.java
@@ -261,8 +261,8 @@ public class DiceLangEngine {
 		 * Run the tokens through the stream engine
 		 */
 		IList<String> streamToks = new FunctionalList<>();
-		boolean success = streamEng.doStreams(command.split(" "), streamToks);
-		if(!success) return false;
+		boolean succ = streamEng.doStreams(command.split(" "), streamToks);
+		if(!succ) return false;
 
 		/*
 		 * Apply line defns
@@ -384,7 +384,7 @@ public class DiceLangEngine {
 		IList<Token> shuntedTokens = lexedTokens;
 		IList<Token> preparedTokens         = new FunctionalList<>();
 		succ = removePreshuntTokens(lexedTokens, preparedTokens);
-		if(!sc) return false;
+		if(!succ) return false;
 		if(debugMode && !postfixMode)
 			System.out.printf("\tCommand after pre-shunter removal: %s\n", preparedTokens.toString());
 
@@ -393,8 +393,8 @@ public class DiceLangEngine {
 			 * Shunt the tokens
 			 */
 			shuntedTokens = new FunctionalList<>();
-			success       = shunt.shuntTokens(preparedTokens, shuntedTokens);
-			if(!success) return false;
+			succ       = shunt.shuntTokens(preparedTokens, shuntedTokens);
+			if(!succ) return false;
 		} else if(prefixMode) {
 			/*
 			 * Reverse directional tokens
@@ -441,8 +441,8 @@ public class DiceLangEngine {
 		 * Parse the tokens
 		 */
 		IList<ITree<Node>> astForest = new FunctionalList<>();
-		success                      = parsr.parseTokens(readyTokens, astForest);
-		if(!success) return false;
+		succ                         = parsr.parseTokens(readyTokens, astForest);
+		if(!succ) return false;
 
 		/*
 		 * Evaluate the tokens
-- 
cgit v1.2.3