diff options
| author | bculkin2442 <bjculkin@mix.wvu.edu> | 2017-03-11 13:24:35 -0500 |
|---|---|---|
| committer | bculkin2442 <bjculkin@mix.wvu.edu> | 2017-03-11 13:24:35 -0500 |
| commit | 098757690361a7301b0912eea56cc6e9ab32d242 (patch) | |
| tree | a04b4f15ed66bc2b9cc4505331f552b79f07b480 | |
| parent | b359b0456ccba2fbb83de950f5210cc6df8b5432 (diff) | |
Update
| -rw-r--r-- | dice-lang/src/bjc/dicelang/DiceLangEngine.java | 17 | ||||
| -rw-r--r-- | dice-lang/src/bjc/dicelang/Evaluator.java | 2 | ||||
| -rw-r--r-- | dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java | 4 |
3 files changed, 5 insertions, 18 deletions
diff --git a/dice-lang/src/bjc/dicelang/DiceLangEngine.java b/dice-lang/src/bjc/dicelang/DiceLangEngine.java index c34ecac..7648568 100644 --- a/dice-lang/src/bjc/dicelang/DiceLangEngine.java +++ b/dice-lang/src/bjc/dicelang/DiceLangEngine.java @@ -130,7 +130,6 @@ public class DiceLangEngine { opExpander.addDelimiter("-"); opExpander.addDelimiter("*"); opExpander.addDelimiter("/"); - opExpander.addDelimiter("+"); opExpander.compile(); nextLiteral = 1; @@ -232,21 +231,7 @@ public class DiceLangEngine { } /* - * Matches quote-delimited strings - * (like "text" or "text\"text") - * Uses the "normal* (special normal*)*" pattern style - * recommended in 'Mastering regular expressions' - * Here, the normal is 'anything but a forward or backslash' - * (in regex, thats '[^\""]') and the special is 'an escaped forward slash' - * (in regex, thats '\\"') - * - * Then, we just follow the pattern, escape it for java strings, and - * add the enclosing quotes - */ - private Pattern quotePattern = Pattern.compile("\"([^\\\"]*(?:\\\"(?:[^\\\"])*)*)\""); - - /* - * Similiar to the above, but using angle brackets instead of quotes + * Matches double-angle bracketed strings. */ private Pattern nonExpandPattern = Pattern.compile("<<([^\\>]*(?:\\>(?:[^\\>])*)*)>>"); diff --git a/dice-lang/src/bjc/dicelang/Evaluator.java b/dice-lang/src/bjc/dicelang/Evaluator.java index 551325a..bb5c345 100644 --- a/dice-lang/src/bjc/dicelang/Evaluator.java +++ b/dice-lang/src/bjc/dicelang/Evaluator.java @@ -478,7 +478,7 @@ public class Evaluator { res = new EvaluatorResult(DICE, tk.diceValue); break; case STRING_LIT: - res = new EvaluatorResult(STRING, eng.stringLiterals.get((int)(tk.intValue))); + res = new EvaluatorResult(STRING, eng.stringLits.get((int)(tk.intValue))); break; default: Errors.inst.printError(EK_EVAL_UNTOK, tk.type.toString()); diff --git a/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java b/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java index 4e125f9..554f41b 100644 --- a/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java +++ b/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java @@ -3,6 +3,7 @@ package bjc.dicelang.scl; 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; @@ -206,7 +207,8 @@ public class StreamControlEngine { public StreamControlEngine(StreamEngine eng) { this.eng = eng; - words = new HashMap<>(); + words = new HashMap<>(); + curStack = new SimpleStack<>(); } /** |