summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/pom.xml10
-rw-r--r--base/src/bjc/dicelang/DiceLangEngine.java2
-rw-r--r--base/src/bjc/dicelang/scl/ArraySCLToken.java15
-rw-r--r--base/src/bjc/dicelang/scl/BooleanSCLToken.java39
-rw-r--r--base/src/bjc/dicelang/scl/FloatSCLToken.java41
-rw-r--r--base/src/bjc/dicelang/scl/IntSCLToken.java18
-rw-r--r--base/src/bjc/dicelang/scl/SCLToken.java92
-rw-r--r--base/src/bjc/dicelang/scl/StreamControlConsole.java73
-rw-r--r--base/src/bjc/dicelang/scl/StreamControlEngine.java397
-rw-r--r--base/src/bjc/dicelang/scl/StreamEngine.java261
-rw-r--r--base/src/bjc/dicelang/scl/StringLitSCLToken.java13
-rw-r--r--base/src/bjc/dicelang/scl/StringSCLToken.java46
-rw-r--r--base/src/bjc/dicelang/scl/SymbolSCLToken.java13
-rw-r--r--base/src/bjc/dicelang/scl/WordListSCLToken.java48
-rw-r--r--base/src/bjc/dicelang/scl/WordSCLToken.java82
-rw-r--r--base/src/bjc/dicelang/scl/WordsSCLToken.java15
16 files changed, 9 insertions, 1156 deletions
diff --git a/base/pom.xml b/base/pom.xml
index bfea276..f231c13 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -116,6 +115,12 @@
</dependency>
<dependency>
+ <groupId>bjc</groupId>
+ <artifactId>dicelang-scl</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>0.9.9</version>
@@ -126,5 +131,6 @@
<artifactId>guava</artifactId>
<version>19.0</version>
</dependency>
+
</dependencies>
</project>
diff --git a/base/src/bjc/dicelang/DiceLangEngine.java b/base/src/bjc/dicelang/DiceLangEngine.java
index e7ba4e8..f8fc5c6 100644
--- a/base/src/bjc/dicelang/DiceLangEngine.java
+++ b/base/src/bjc/dicelang/DiceLangEngine.java
@@ -127,7 +127,7 @@ public class DiceLangEngine {
shunt = new Shunter();
parsr = new Parser();
- streamEng = new StreamEngine(this);
+ streamEng = new StreamEngine();
tokenzer = new Tokenizer(this);
eval = new Evaluator(this);
}
diff --git a/base/src/bjc/dicelang/scl/ArraySCLToken.java b/base/src/bjc/dicelang/scl/ArraySCLToken.java
deleted file mode 100644
index ff86f48..0000000
--- a/base/src/bjc/dicelang/scl/ArraySCLToken.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package bjc.dicelang.scl;
-
-import bjc.utils.funcdata.IList;
-
-public class ArraySCLToken extends WordListSCLToken {
-
- public ArraySCLToken(IList<SCLToken> tokens) {
- super(true, tokens);
- }
-
- @Override
- public String toString() {
- return "ArraySCLToken [tokenVals=" + tokenVals + "]";
- }
-}
diff --git a/base/src/bjc/dicelang/scl/BooleanSCLToken.java b/base/src/bjc/dicelang/scl/BooleanSCLToken.java
deleted file mode 100644
index e2e8e12..0000000
--- a/base/src/bjc/dicelang/scl/BooleanSCLToken.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package bjc.dicelang.scl;
-
-public class BooleanSCLToken extends SCLToken {
- /* Used for BLIT */
- public boolean boolVal;
-
- public BooleanSCLToken(boolean val) {
- super(Type.BLIT);
-
- boolVal = val;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + (boolVal ? 1231 : 1237);
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
- return false;
- BooleanSCLToken other = (BooleanSCLToken) obj;
- if (boolVal != other.boolVal)
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- return "BooleanSCLToken [boolVal=" + boolVal + "]";
- }
-}
diff --git a/base/src/bjc/dicelang/scl/FloatSCLToken.java b/base/src/bjc/dicelang/scl/FloatSCLToken.java
deleted file mode 100644
index f02c796..0000000
--- a/base/src/bjc/dicelang/scl/FloatSCLToken.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package bjc.dicelang.scl;
-
-public class FloatSCLToken extends SCLToken {
- /* Used for FLIT */
- public double floatVal;
-
- public FloatSCLToken(double val) {
- super(Type.FLIT);
-
- floatVal = val;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- long temp;
- temp = Double.doubleToLongBits(floatVal);
- result = prime * result + (int) (temp ^ (temp >>> 32));
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
- return false;
- FloatSCLToken other = (FloatSCLToken) obj;
- if (Double.doubleToLongBits(floatVal) != Double.doubleToLongBits(other.floatVal))
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- return "FloatSCLToken [floatVal=" + floatVal + "]";
- }
-}
diff --git a/base/src/bjc/dicelang/scl/IntSCLToken.java b/base/src/bjc/dicelang/scl/IntSCLToken.java
deleted file mode 100644
index 9e88dbe..0000000
--- a/base/src/bjc/dicelang/scl/IntSCLToken.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package bjc.dicelang.scl;
-
-public class IntSCLToken extends SCLToken {
- /* Used for ILIT */
- public long intVal;
-
- /* Create a new token. */
- public IntSCLToken(final Type typ) {
- super(typ);
- }
-
- /* Create a new token. */
- public IntSCLToken(final long iVal) {
- super(Type.ILIT);
-
- intVal = iVal;
- }
-} \ No newline at end of file
diff --git a/base/src/bjc/dicelang/scl/SCLToken.java b/base/src/bjc/dicelang/scl/SCLToken.java
deleted file mode 100644
index b5dadb0..0000000
--- a/base/src/bjc/dicelang/scl/SCLToken.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package bjc.dicelang.scl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import bjc.dicelang.Errors;
-import bjc.utils.parserutils.TokenUtils;
-
-import static bjc.dicelang.Errors.ErrorKey.EK_SCL_INVTOKEN;
-
-import static bjc.dicelang.scl.SCLToken.Type.*;
-
-public class SCLToken {
-
- public static enum Type {
- /* Natural tokens. These come directly from strings */
- ILIT, FLIT, BLIT, SQUOTE, DQUOTE, OBRACKET, OBRACE, SYMBOL, WORD,
-
- /* Synthetic tokens. These are produced from special tokens. */
- SLIT, WORDS, ARRAY,
- }
-
- public SCLToken.Type type;
-
- public static SCLToken tokenizeString(final String token) {
- if (litTokens.containsKey(token)) {
- return new IntSCLToken(litTokens.get(token));
- } else if (token.startsWith("\\")) {
- return new SymbolSCLToken(token.substring(1));
- } else if (WordSCLToken.isBuiltinWord(token)) {
- return new WordSCLToken(token);
- } else if (token.equals("true")) {
- return new BooleanSCLToken(true);
- } else if (token.equals("false")) {
- return new BooleanSCLToken(false);
- } else if (TokenUtils.isInt(token)) {
- return new IntSCLToken(Long.parseLong(token));
- } else if (TokenUtils.isDouble(token)) {
- return new FloatSCLToken(Double.parseDouble(token));
- } else {
- Errors.inst.printError(EK_SCL_INVTOKEN, token);
- return null;
- }
- }
-
- protected static final Map<String, Type> litTokens;
-
- protected SCLToken() {
-
- }
-
- protected SCLToken(Type typ) {
- type = typ;
- }
-
- static {
- /* Init literal tokens. */
- litTokens = new HashMap<>();
-
- litTokens.put("'", SQUOTE);
- litTokens.put("\"", DQUOTE);
- litTokens.put("[", OBRACKET);
- litTokens.put("{", OBRACE);
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((type == null) ? 0 : type.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- SCLToken other = (SCLToken) obj;
- if (type != other.type)
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- return "SCLToken [type=" + type + "]";
- }
-} \ No newline at end of file
diff --git a/base/src/bjc/dicelang/scl/StreamControlConsole.java b/base/src/bjc/dicelang/scl/StreamControlConsole.java
deleted file mode 100644
index ca61244..0000000
--- a/base/src/bjc/dicelang/scl/StreamControlConsole.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package bjc.dicelang.scl;
-
-import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.IList;
-
-import java.util.Scanner;
-
-/**
- * Implement a SCL REPL
- *
- * @author Ben Culkin
- */
-public class StreamControlConsole {
- /*
- * @TODO 10/08/17 :SCLArgs Do something useful with the CLI args.
- *
- */
- /**
- * Main method
- *
- * @param args
- * Unused CLI args.
- */
- public static void main(String[] args) {
- /*
- * Initialize vars.
- *
- * We can get away with passing the null, because StreamEngine doesn't reference
- * any parts of DiceLangEngine.
- */
- StreamEngine sengine = new StreamEngine(null);
- StreamControlEngine sclengine = new StreamControlEngine(sengine);
- Scanner scn = new Scanner(System.in);
-
- /* Get input from the user. */
- System.out.print("Enter a SCL command string (blank to exit): ");
-
- /* Process it. */
- while (scn.hasNextLine()) {
- String ln = scn.nextLine().trim();
-
- if (ln.equals("")) {
- /* Ignore empty lines. */
- break;
- }
-
- /* Break the token into strings. */
- IList<String> res = new FunctionalList<>();
- String[] tokens = ln.split(" ");
-
- /* Run the stream engine on the tokens. */
- boolean succ = sengine.doStreams(tokens, res);
- if (!succ) {
- System.out.printf("ERROR: Stream engine failed for line '%s'\n", ln);
- continue;
- }
-
- /* Run the command through SCL. */
- tokens = res.toArray(new String[res.getSize()]);
- succ = sclengine.runProgram(tokens);
- if (!succ) {
- System.out.printf("ERROR: SCL engine failed for line '%s'\n", ln);
- continue;
- }
-
- /* Prompt again. */
- System.out.print("Command string executed succesfully.\n\n");
- System.out.print("Enter a SCL command string (blank to exit): ");
- }
-
- scn.close();
- }
-}
diff --git a/base/src/bjc/dicelang/scl/StreamControlEngine.java b/base/src/bjc/dicelang/scl/StreamControlEngine.java
deleted file mode 100644
index 32ae8ba..0000000
--- a/base/src/bjc/dicelang/scl/StreamControlEngine.java
+++ /dev/null
@@ -1,397 +0,0 @@
-package bjc.dicelang.scl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import bjc.dicelang.Errors;
-import bjc.utils.esodata.SimpleStack;
-import bjc.utils.esodata.Stack;
-import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.IList;
-import bjc.utils.parserutils.TokenUtils;
-
-import static bjc.dicelang.Errors.ErrorKey.*;
-import static bjc.dicelang.scl.SCLToken.Type.*;
-import static bjc.dicelang.scl.WordSCLToken.Word.*;
-
-/*
- * @TODO 10/08/17 Ben Culkin :SCLReorg
- *
- * This is a large enough class that it should maybe be split into subclasses.
- */
-/**
- * Runs a Stream Control Language (SCL) program.
- *
- * SCL is a stack-based concatenative language based mostly off of Postscript
- * and Factor, with inspiration from various other languages.
- *
- * @author Ben Culkin
- */
-public class StreamControlEngine {
- /* The stream engine we're hooked to. */
- private final StreamEngine eng;
-
- /* The current stack state. */
- private final Stack<SCLToken> curStack;
-
- /* Map of user defined words. */
- private final Map<String, SCLToken> words;
-
- /**
- * Create a new stream control engine.
- *
- * @param engine
- * The engine to control.
- */
- public StreamControlEngine(final StreamEngine engine) {
- eng = engine;
-
- words = new HashMap<>();
- curStack = new SimpleStack<>();
- }
-
- /**
- * Run a SCL program.
- *
- * @param tokens
- * The program to run.
- *
- * @return Whether the program executed successfully.
- */
- public boolean runProgram(final String[] tokens) {
- for (int i = 0; i < tokens.length; i++) {
- /* Tokenize each token. */
- final String token = tokens[i];
- final SCLToken tok = SCLToken.tokenizeString(token);
-
- if (tok == null) {
- System.out.printf("ERROR: Tokenization failed for '%s'\n", token);
- return false;
- }
-
- /* Handle token types. */
- switch (tok.type) {
- case SQUOTE:
- /* Handle single-quotes. */
- i = handleSingleQuote(i, tokens);
- if (i == -1) {
- return false;
- }
- break;
- case OBRACKET:
- /* Handle delimited brackets. */
- i = handleDelim(i, tokens, "]");
- if (i == -1) {
- return false;
- }
- break;
- case OBRACE:
- /* Handle delimited braces. */
- i = handleDelim(i, tokens, "}");
- if (i == -1) {
- return false;
- }
- final SCLToken brak = curStack.pop();
- curStack.push(new ArraySCLToken(((WordListSCLToken) brak).tokenVals));
- break;
-
- case WORD:
- /* Handle words. */
- if (!handleWord((WordSCLToken) tok)) {
- System.out.printf("WARNING: Execution of word '%s' failed\n", tok);
- }
- break;
- default:
- /* Put it onto the stack. */
- curStack.push(tok);
- break;
- }
- }
-
- return true;
- }
-
- private boolean handleWord(final WordSCLToken tk) {
- boolean succ = true;
-
- /* Handle each type of word. */
- /*
- * @NOTE This should probably use something other than a switch statement.
- */
- switch (tk.wordVal) {
- case NEWSTREAM:
- eng.newStream();
- break;
- case LEFTSTREAM:
- succ = eng.leftStream();
- if (!succ) {
- return false;
- }
- break;
- case RIGHTSTREAM:
- succ = eng.rightStream();
- if (!succ) {
- return false;
- }
- break;
- case DELETESTREAM:
- succ = eng.deleteStream();
- if (!succ) {
- return false;
- }
- break;
- case MERGESTREAM:
- succ = eng.mergeStream();
- if (!succ) {
- return false;
- }
- break;
- case MAKEARRAY:
- succ = makeArray();
- if (!succ) {
- return false;
- }
- break;
- case MAKEEXEC:
- succ = toggleExec(true);
- if (!succ) {
- return false;
- }
- break;
- case MAKEUNEXEC:
- succ = toggleExec(false);
- if (!succ) {
- return false;
- }
- break;
- case STACKCOUNT:
- curStack.push(new IntSCLToken(curStack.size()));
- break;
- case STACKEMPTY:
- curStack.push(new BooleanSCLToken(curStack.empty()));
- break;
- case DROP:
- if (curStack.size() == 0) {
- Errors.inst.printError(EK_SCL_SUNDERFLOW, tk.toString());
- return false;
- }
- curStack.drop();
- break;
- case NDROP:
- succ = handleNDrop();
- if (!succ) {
- return false;
- }
- break;
- case NIP:
- if (curStack.size() < 2) {
- Errors.inst.printError(EK_SCL_SUNDERFLOW, tk.toString());
- return false;
- }
- curStack.nip();
- break;
- case NNIP:
- succ = handleNNip();
- if (!succ) {
- return false;
- }
- break;
- default:
- Errors.inst.printError(EK_SCL_UNWORD, tk.toString());
- return false;
- }
-
- return true;
- }
-
- /* Handle nipping a specified number of items. */
- private boolean handleNNip() {
- final SCLToken num = curStack.pop();
-
- if (num.type != ILIT) {
- Errors.inst.printError(EK_SCL_INVARG, num.type.toString());
- return false;
- }
-
- final int n = (int) ((IntSCLToken) num).intVal;
-
- if (curStack.size() < n) {
- Errors.inst.printError(EK_SCL_SUNDERFLOW, NNIP.toString());
- return false;
- }
-
- curStack.nip(n);
- return true;
- }
-
- /* Handle dropping a specified number of items. */
- private boolean handleNDrop() {
- final SCLToken num = curStack.pop();
-
- if (num.type != ILIT) {
- Errors.inst.printError(EK_SCL_INVARG, num.type.toString());
- return false;
- }
-
- final int n = (int) ((IntSCLToken) num).intVal;
-
- if (curStack.size() < n) {
- Errors.inst.printError(EK_SCL_SUNDERFLOW, NDROP.toString());
- return false;
- }
-
- curStack.drop(n);
- return true;
- }
-
- /* Handle toggling the executable flag on an array. */
- private boolean toggleExec(final boolean exec) {
- final SCLToken top = curStack.top();
-
- if (exec) {
- if (top.type != ARRAY) {
- Errors.inst.printError(EK_SCL_INVARG, top.toString());
- return false;
- }
-
- top.type = WORDS;
- } else {
- if (top.type != WORDS) {
- Errors.inst.printError(EK_SCL_INVARG, top.toString());
- return false;
- }
-
- top.type = ARRAY;
- }
-
- return true;
- }
-
- /* Handle creating an array. */
- private boolean makeArray() {
- final SCLToken num = curStack.pop();
-
- if (num.type != ILIT) {
- Errors.inst.printError(EK_SCL_INVARG, num.type.toString());
- }
-
- final IList<SCLToken> arr = new FunctionalList<>();
-
- for (int i = 0; i < ((IntSCLToken) num).intVal; i++) {
- arr.add(curStack.pop());
- }
-
- curStack.push(new ArraySCLToken(arr));
-
- return true;
- }
-
- /* Handle a delimited series of tokens. */
- private int handleDelim(final int i, final String[] tokens, final String delim) {
- final IList<SCLToken> toks = new FunctionalList<>();
-
- int n = i + 1;
-
- if (n >= tokens.length) {
- Errors.inst.printError(EK_SCL_MMQUOTE);
- return -1;
- }
-
- String tok = tokens[n];
-
- while (!tok.equals(delim)) {
- final SCLToken ntok = SCLToken.tokenizeString(tok);
-
- switch (ntok.type) {
- case SQUOTE:
- n = handleSingleQuote(n, tokens);
- if (n == -1) {
- return -1;
- }
- toks.add(curStack.pop());
- break;
- case OBRACKET:
- n = handleDelim(n, tokens, "]");
- if (n == -1) {
- return -1;
- }
- toks.add(curStack.pop());
- break;
- case OBRACE:
- n = handleDelim(i, tokens, "}");
- if (n == -1) {
- return -1;
- }
- final SCLToken brak = curStack.pop();
- toks.add(new ArraySCLToken(((WordListSCLToken) brak).tokenVals));
- break;
- default:
- toks.add(ntok);
- }
-
- /* Move to the next token */
- n += 1;
-
- if (n >= tokens.length) {
- Errors.inst.printError(EK_SCL_MMQUOTE);
- return -1;
- }
-
- tok = tokens[n];
- }
-
- /* Skip the closing bracket */
- n += 1;
-
- /*
- * @NOTE Instead of being hardcoded, this should be a parameter.
- */
- curStack.push(new WordsSCLToken(toks));
-
- return n;
- }
-
- /* Handle a single-quoted string. */
- private int handleSingleQuote(final int i, final String[] tokens) {
- final StringBuilder sb = new StringBuilder();
-
- int n = i + 1;
-
- if (n >= tokens.length) {
- Errors.inst.printError(EK_SCL_MMQUOTE);
- return -1;
- }
-
- String tok = tokens[n];
-
- while (!tok.equals("'")) {
- if (tok.matches("\\\\+'")) {
- /* Handle escaped quotes. */
- sb.append(tok.substring(1));
- } else {
- sb.append(tok);
- }
-
- /* Move to the next token */
- n += 1;
-
- if (n >= tokens.length) {
- Errors.inst.printError(EK_SCL_MMQUOTE);
- return -1;
- }
-
- tok = tokens[n];
- }
-
- /*
- * Skip the single quote
- */
- n += 1;
-
- String strang = TokenUtils.descapeString(sb.toString());
-
- curStack.push(new StringSCLToken(false, strang));
-
- return n;
- }
-}
diff --git a/base/src/bjc/dicelang/scl/StreamEngine.java b/base/src/bjc/dicelang/scl/StreamEngine.java
deleted file mode 100644
index 2d931b9..0000000
--- a/base/src/bjc/dicelang/scl/StreamEngine.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package bjc.dicelang.scl;
-
-import bjc.dicelang.DiceLangEngine;
-import bjc.dicelang.Errors;
-import bjc.utils.esodata.SingleTape;
-import bjc.utils.esodata.Tape;
-import bjc.utils.esodata.TapeLibrary;
-import bjc.utils.funcdata.FunctionalList;
-import bjc.utils.funcdata.IList;
-import bjc.utils.funcutils.ListUtils;
-
-import java.util.Arrays;
-
-import static bjc.dicelang.Errors.ErrorKey.*;
-
-/**
- * Implements multiple interleaved parse streams, as well as a command language
- * for the streams.
- *
- * The idea for the interleaved streams came from the language Oozylbub &amp;
- * Murphy, but the command language was my own idea.
- *
- * @author Ben Culkin
- */
-public class StreamEngine {
- /* Whether or not we're doing debugging. */
- public final boolean debug = true;
-
- /* The engine we're attached to. */
- DiceLangEngine eng;
-
- /* Our streams. */
- Tape<IList<String>> streams;
- IList<String> currStream;
-
- /* Saved streams */
- TapeLibrary<IList<String>> savedStreams;
-
- /* Handler for SCL programs */
- private final StreamControlEngine scleng;
-
- /**
- * Create a new stream engine.
- *
- * @param engine
- * The dice engine we're attached to.
- */
- public StreamEngine(final DiceLangEngine engine) {
- eng = engine;
-
- savedStreams = new TapeLibrary<>();
- scleng = new StreamControlEngine(this);
- }
-
- /* Do pre-run (re)initialization. */
- private void init() {
- /* Reinitialize our list of streams. */
- streams = new SingleTape<>();
-
- /* Create an initial stream. */
- currStream = new FunctionalList<>();
- streams.insertBefore(currStream);
- }
-
- /**
- * Process a possibly interleaved set of streams.
- *
- * @param toks
- * The raw token to read streams from.
- *
- * @param dest
- * The list to write the final stream to.
- *
- * @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);
- }
-
- /**
- * Process a possibly interleaved set of streams.
- *
- * @param toks
- * The raw token to read streams from.
- *
- * @param dest
- * The list to write the final stream to.
- *
- * @return Whether or not the streams were successfully processed.
- */
- public boolean doStreams(final Iterable<String> toks, final IList<String> dest) {
- /* Initialize per-run state. */
- init();
-
- /* Are we currently quoting things? */
- boolean quoteMode = false;
-
- /* Process each token. */
- for (final String tk : toks) {
- /* Process stream commands. */
- if (tk.startsWith("{@S") && !quoteMode) {
- if (tk.equals("{@SQ}")) {
- /* Start quoting. */
- quoteMode = true;
- } else if (!processCommand(tk)) {
- return false;
- }
- } else {
- if (tk.equals("{@SU}")) {
- /* Stop quoting. */
- quoteMode = false;
- } else if (tk.startsWith("\\") && tk.endsWith("{@SU}")) {
- /* Unquote quoted end. */
- currStream.add(tk.substring(1));
- } else {
- currStream.add(tk);
- }
- }
- }
-
- for (final String tk : currStream) {
- /* Collect tokens from the current stream. */
- dest.add(tk);
- }
-
- return true;
- }
-
- /** Create a new stream. */
- public void newStream() {
- streams.insertAfter(new FunctionalList<>());
- }
-
- /**
- * Move to a stream to the right.
- *
- * @return Whether or not the move was successful.
- */
- public boolean rightStream() {
- if (!streams.right()) {
- Errors.inst.printError(EK_STRM_NONEX);
- return false;
- }
-
- currStream = streams.item();
- return true;
- }
-
- /**
- * Move to a stream to the left.
- *
- * @return Whether or not the move was successful.
- */
- public boolean leftStream() {
- if (!streams.left()) {
- Errors.inst.printError(EK_STRM_NONEX);
- return false;
- }
-
- currStream = streams.item();
- return true;
- }
-
- /**
- * Delete the current stream.
- *
- * @return Whether or not the delete succeeded.
- */
- public boolean deleteStream() {
- if (streams.size() == 1) {
- Errors.inst.printError(EK_STRM_LAST);
- return false;
- }
-
- streams.remove();
- currStream = streams.item();
-
- return true;
- }
-
- /**
- * Merge the current stream into the previous stream.
- *
- * @return Whether or not the merge succeded.
- */
- public boolean mergeStream() {
- if (streams.size() == 1) {
- Errors.inst.printError(EK_STRM_LAST);
- return false;
- }
-
- final IList<String> stringLit = streams.remove();
- currStream = streams.item();
- currStream.add(ListUtils.collapseTokens(stringLit, " "));
-
- return true;
- }
-
- private boolean processCommand(final String tk) {
- char[] comms = null;
-
- if (tk.length() > 5) {
- /* Pull off {@S and closing } */
- comms = tk.substring(3, tk.length() - 1).toCharArray();
- } else {
- /* Its a single char. command. */
- comms = new char[1];
- comms[0] = tk.charAt(3);
- }
-
- boolean succ;
-
- /* Process each command. */
- /*
- * @TODO 10/09/17 Ben Culkin :StreamCommands This should probably be refactored
- * in some way, so as to make it easier to add new commands.
- */
- for (final char comm : comms) {
- switch (comm) {
- case '+':
- newStream();
- break;
- case '>':
- succ = rightStream();
- if (!succ) {
- return false;
- }
- break;
- case '<':
- succ = leftStream();
- if (!succ) {
- return false;
- }
- break;
- case '-':
- succ = deleteStream();
- if (!succ) {
- return false;
- }
- break;
- case 'M':
- succ = mergeStream();
- if (!succ) {
- return false;
- }
- break;
- case 'L':
- succ = scleng.runProgram(currStream.toArray(new String[0]));
- if (!succ) {
- return false;
- }
- break;
- default:
- Errors.inst.printError(EK_STRM_INVCOM, tk);
- return false;
- }
- }
-
- return true;
- }
-}
diff --git a/base/src/bjc/dicelang/scl/StringLitSCLToken.java b/base/src/bjc/dicelang/scl/StringLitSCLToken.java
deleted file mode 100644
index caf425a..0000000
--- a/base/src/bjc/dicelang/scl/StringLitSCLToken.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package bjc.dicelang.scl;
-
-public class StringLitSCLToken extends StringSCLToken {
-
- public StringLitSCLToken(String val) {
- super(false, val);
- }
-
- @Override
- public String toString() {
- return "StringLitSCLToken [stringVal=" + stringVal + "]";
- }
-}
diff --git a/base/src/bjc/dicelang/scl/StringSCLToken.java b/base/src/bjc/dicelang/scl/StringSCLToken.java
deleted file mode 100644
index 1436bc3..0000000
--- a/base/src/bjc/dicelang/scl/StringSCLToken.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package bjc.dicelang.scl;
-
-public class StringSCLToken extends SCLToken {
- /* Used for SYMBOL & SLIT */
- public String stringVal;
-
- protected StringSCLToken(boolean isSymbol, String val) {
- if (isSymbol) {
- type = Type.SYMBOL;
- } else {
- type = Type.SLIT;
- }
-
- stringVal = val;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + ((stringVal == null) ? 0 : stringVal.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
- return false;
- StringSCLToken other = (StringSCLToken) obj;
- if (stringVal == null) {
- if (other.stringVal != null)
- return false;
- } else if (!stringVal.equals(other.stringVal))
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- return "StringSCLToken [stringVal=" + stringVal + "]";
- }
-}
diff --git a/base/src/bjc/dicelang/scl/SymbolSCLToken.java b/base/src/bjc/dicelang/scl/SymbolSCLToken.java
deleted file mode 100644
index f841654..0000000
--- a/base/src/bjc/dicelang/scl/SymbolSCLToken.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package bjc.dicelang.scl;
-
-public class SymbolSCLToken extends StringSCLToken {
-
- public SymbolSCLToken(String val) {
- super(true, val);
- }
-
- @Override
- public String toString() {
- return "SymbolSCLToken [stringVal=" + stringVal + "]";
- }
-}
diff --git a/base/src/bjc/dicelang/scl/WordListSCLToken.java b/base/src/bjc/dicelang/scl/WordListSCLToken.java
deleted file mode 100644
index ffa0e85..0000000
--- a/base/src/bjc/dicelang/scl/WordListSCLToken.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package bjc.dicelang.scl;
-
-import bjc.utils.funcdata.IList;
-
-public class WordListSCLToken extends SCLToken {
- /* Used for WORDS & ARRAY */
- public IList<SCLToken> tokenVals;
-
- protected WordListSCLToken(boolean isArray, IList<SCLToken> tokens) {
- if (isArray) {
- type = Type.ARRAY;
- } else {
- type = Type.WORDS;
- }
-
- tokenVals = tokens;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + ((tokenVals == null) ? 0 : tokenVals.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
- return false;
- WordListSCLToken other = (WordListSCLToken) obj;
- if (tokenVals == null) {
- if (other.tokenVals != null)
- return false;
- } else if (!tokenVals.equals(other.tokenVals))
- return false;
- return true;
- }
-
- @Override
- public String toString() {
- return "WordsSCLToken [tokenVals=" + tokenVals + "]";
- }
-}
diff --git a/base/src/bjc/dicelang/scl/WordSCLToken.java b/base/src/bjc/dicelang/scl/WordSCLToken.java
deleted file mode 100644
index ea3118e..0000000
--- a/base/src/bjc/dicelang/scl/WordSCLToken.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package bjc.dicelang.scl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static bjc.dicelang.scl.WordSCLToken.Word.*;
-
-public class WordSCLToken extends SCLToken {
- public static enum Word {
- /* Array manipulation */
- MAKEARRAY, MAKEEXEC, MAKEUNEXEC,
- /* Stream manipulation */
- NEWSTREAM, LEFTSTREAM, RIGHTSTREAM, DELETESTREAM, MERGESTREAM,
- /* Stack manipulation */
- STACKCOUNT, STACKEMPTY, DROP, NDROP, NIP, NNIP,
- }
-
- public Word wordVal;
-
- public WordSCLToken(String wrd) {
- this(builtinWords.get(wrd));
- }
-
- public WordSCLToken(Word wrd) {
- super(Type.WORD);
-
- wordVal = wrd;
- }
-
- @Override
- public String toString() {
- return "WordSCLToken [wordVal=" + wordVal + "]";
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = super.hashCode();
- result = prime * result + ((wordVal == null) ? 0 : wordVal.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
- return false;
- WordSCLToken other = (WordSCLToken) obj;
- if (wordVal != other.wordVal)
- return false;
- return true;
- }
-
- public static boolean isBuiltinWord(String wrd) {
- return builtinWords.containsKey(wrd);
- }
-
- private static final Map<String, WordSCLToken.Word> builtinWords;
-
- static {
- /* Init builtin words. */
- builtinWords = new HashMap<>();
-
- builtinWords.put("makearray", MAKEARRAY);
- builtinWords.put("+stream", NEWSTREAM);
- builtinWords.put(">stream", LEFTSTREAM);
- builtinWords.put("<stream", RIGHTSTREAM);
- builtinWords.put("-stream", DELETESTREAM);
- builtinWords.put("<-stream", MERGESTREAM);
- builtinWords.put("cvx", MAKEEXEC);
- builtinWords.put("cvux", MAKEUNEXEC);
- builtinWords.put("#", STACKCOUNT);
- builtinWords.put("empty?", STACKEMPTY);
- builtinWords.put("drop", DROP);
- builtinWords.put("ndrop", NDROP);
- builtinWords.put("nip", NIP);
- builtinWords.put("nnip", NNIP);
- }
-}
diff --git a/base/src/bjc/dicelang/scl/WordsSCLToken.java b/base/src/bjc/dicelang/scl/WordsSCLToken.java
deleted file mode 100644
index 9a57176..0000000
--- a/base/src/bjc/dicelang/scl/WordsSCLToken.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package bjc.dicelang.scl;
-
-import bjc.utils.funcdata.IList;
-
-public class WordsSCLToken extends WordListSCLToken {
-
- public WordsSCLToken(IList<SCLToken> tokens) {
- super(false, tokens);
- }
-
- @Override
- public String toString() {
- return "WordsSCLToken [tokenVals=" + tokenVals + "]";
- }
-}
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-10 05:23:21 +0000