diff options
4 files changed, 11 insertions, 11 deletions
diff --git a/dice-lang/src/bjc/dicelang/Define.java b/dice-lang/src/bjc/dicelang/Define.java index a008e0c..c8e0e0c 100644 --- a/dice-lang/src/bjc/dicelang/Define.java +++ b/dice-lang/src/bjc/dicelang/Define.java @@ -45,6 +45,7 @@ public class Define implements UnaryOperator<String>, Comparable<Define> { * The priority of this definition. */ public final int priority; + /** * Whether or not this definition is in error. */ diff --git a/dice-lang/src/bjc/dicelang/DiceLangConsole.java b/dice-lang/src/bjc/dicelang/DiceLangConsole.java index bbf3db8..29b6f1a 100644 --- a/dice-lang/src/bjc/dicelang/DiceLangConsole.java +++ b/dice-lang/src/bjc/dicelang/DiceLangConsole.java @@ -205,14 +205,7 @@ public class DiceLangConsole { } /* - * Matches slash-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 slashes + * Matches slash-delimited strings (like /text/ or /text\/text/). */ private final Pattern slashPattern = Pattern.compile("/((?:\\\\.|[^/\\\\])*)/"); diff --git a/dice-lang/src/bjc/dicelang/scl/StreamControlConsole.java b/dice-lang/src/bjc/dicelang/scl/StreamControlConsole.java index 8c71770..71dacaa 100644 --- a/dice-lang/src/bjc/dicelang/scl/StreamControlConsole.java +++ b/dice-lang/src/bjc/dicelang/scl/StreamControlConsole.java @@ -3,8 +3,11 @@ package bjc.dicelang.scl; import bjc.utils.funcdata.FunctionalList; import bjc.utils.funcdata.IList; +import java.util.Iterator; import java.util.Scanner; +import java.util.function.Supplier; + public class StreamControlConsole { public static void main(String[] args) { /* @@ -28,17 +31,14 @@ public class StreamControlConsole { String[] tokens = ln.split(" "); boolean succ = sengine.doStreams(tokens, res); - if(!succ) continue; tokens = res.toArray(new String[res.getSize()]); succ = sclengine.runProgram(tokens); - if(!succ) continue; System.out.print("Command string executed succesfully.\n\n"); - System.out.print("Enter a SCL command string (blank to exit): "); } } diff --git a/dice-lang/src/bjc/dicelang/scl/StreamEngine.java b/dice-lang/src/bjc/dicelang/scl/StreamEngine.java index fded5f1..5094283 100644 --- a/dice-lang/src/bjc/dicelang/scl/StreamEngine.java +++ b/dice-lang/src/bjc/dicelang/scl/StreamEngine.java @@ -15,6 +15,8 @@ import bjc.utils.funcdata.FunctionalList; import bjc.utils.funcdata.IList; import bjc.utils.funcutils.ListUtils; +import java.util.Arrays; + /** * Implements multiple interleaved parse streams, as well as a command language * for the streams. @@ -89,6 +91,10 @@ public class StreamEngine { * @return Whether or not the streams were successfully processed. */ public boolean doStreams(final String[] toks, final IList<String> dest) { + return doStreams(Arrays.asList(toks), dest); + } + + public boolean doStreams(final Iterable<String> toks, final IList<String> dest) { /* * Initialize per-run state. */ |