Refactor

1 files changed, 16 insertions, 3 deletions

diff --git a/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java b/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
index a5a9ca4..2bfa53a 100644
--- a/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
+++ b/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
@@ -58,6 +58,19 @@ public class DiceLangEngine {
 		// 		 once there is a sym-table
 		IMap<String, String> stringLiterals = new FunctionalMap<>();
 
+		boolean success = destringTokens(tokens, stringLiterals,
+				destringed);
+
+		if(!success) return success;
+
+		if(debugMode)
+			System.out.println("Command after destringing: "
+					+ destringed.toString());
+	}
+
+	private boolean destringTokens(IList<String> tokens,
+			IMap<String, String> stringLiterals,
+			IList<String> destringed) {
 		// Are we parsing a string literal?
 		boolean stringMode = false;
 
@@ -107,10 +120,10 @@ public class DiceLangEngine {
 		if(stringMode) {
 			System.out.printf("\tERROR: Unclosed string literal (%s"
 					+ ").\n", currentLiteral.toString());
+
+			return false;
 		}
 
-		if(debugMode)
-			System.out.println("Command after destringing: "
-					+ destringed.toString());
+		return true;
 	}
 }