diff options
| author | bculkin2442 <bjculkin@mix.wvu.edu> | 2018-10-28 12:23:08 -0400 |
|---|---|---|
| committer | bculkin2442 <bjculkin@mix.wvu.edu> | 2018-10-28 12:23:08 -0400 |
| commit | 2e764f482f5633c18701aa2daadffe9f02c9324b (patch) | |
| tree | a63208ef34e81840b59e9a9513f668020c16f1f8 /src/main | |
| parent | c5d984d423835e14e41ca2754fa30262778e5ca4 (diff) | |
General cleanup
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/bjc/dicelang/scl/Errors.java | 9 | ||||
| -rw-r--r-- | src/main/java/bjc/dicelang/scl/StreamEngine.java | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/main/java/bjc/dicelang/scl/Errors.java b/src/main/java/bjc/dicelang/scl/Errors.java index ef20086..ceb79e3 100644 --- a/src/main/java/bjc/dicelang/scl/Errors.java +++ b/src/main/java/bjc/dicelang/scl/Errors.java @@ -45,6 +45,9 @@ public class Errors { EK_STRM_INVCOM("\tERROR: Unknown stream control command %s\n", 1), /* SCL Warnings */ + /** + * Word execution failed. + */ WK_SCL_WRDFAIL("\tWARNING: Execution of word %s failed\n", 1), /* SCL Errors */ @@ -69,7 +72,13 @@ public class Errors { */ EK_SCL_INVARG("\tERROR: Invalid argument to SCL command\n", 0); + /** + * The message of the error. + */ public final String msg; + /** + * The number of arguments to the error. + */ public final int argc; private ErrorKey(String message, int argcount) { diff --git a/src/main/java/bjc/dicelang/scl/StreamEngine.java b/src/main/java/bjc/dicelang/scl/StreamEngine.java index ba1f029..0c8d3bf 100644 --- a/src/main/java/bjc/dicelang/scl/StreamEngine.java +++ b/src/main/java/bjc/dicelang/scl/StreamEngine.java @@ -2,7 +2,6 @@ package bjc.dicelang.scl; import bjc.utils.esodata.SingleTape; import bjc.utils.esodata.Tape; -import bjc.utils.esodata.TapeLibrary; import bjc.utils.funcdata.FunctionalList; import bjc.utils.funcdata.FunctionalMap; import bjc.utils.funcdata.IList; @@ -10,6 +9,8 @@ import bjc.utils.funcdata.IMap; import bjc.utils.funcutils.ListUtils; import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; import java.util.function.Predicate; import static bjc.dicelang.scl.Errors.ErrorKey.*; @@ -34,7 +35,7 @@ public class StreamEngine { private IList<String> currStream; /* Saved streams */ - private TapeLibrary<IList<String>> savedStreams; + private Map<String, IList<String>> savedStreams; /* Handler for SCL programs */ private final StreamControlEngine scleng; @@ -70,7 +71,7 @@ public class StreamEngine { * */ public StreamEngine() { - savedStreams = new TapeLibrary<>(); + savedStreams = new HashMap<>(); scleng = new StreamControlEngine(this); } |