From 28895cad07c7aec1b324a2c75e5da5ce728cad91 Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Thu, 3 Dec 2020 19:22:06 -0500 Subject: Adapt to esodata changes --- base/src/bjc/dicelang/DiceLangEngine.java | 60 +++++----- base/src/bjc/dicelang/Node.java | 4 +- base/src/bjc/dicelang/Parser.java | 46 +++---- base/src/bjc/dicelang/Shunter.java | 10 +- base/src/bjc/dicelang/Tokenizer.java | 8 +- base/src/bjc/dicelang/cli/DiceLangConsole.java | 4 +- base/src/bjc/dicelang/eval/Evaluator.java | 132 ++++++++++----------- .../bjc/dicelang/eval/FailureEvaluatorResult.java | 8 +- base/src/bjc/dicelang/expr/ExprREPL.java | 8 +- base/src/bjc/dicelang/expr/Lexer.java | 6 +- base/src/bjc/dicelang/expr/Parser.java | 8 +- base/src/bjc/dicelang/expr/Shunter.java | 6 +- base/src/bjc/dicelang/tokens/Token.java | 6 +- 13 files changed, 153 insertions(+), 153 deletions(-) (limited to 'base/src/bjc/dicelang') diff --git a/base/src/bjc/dicelang/DiceLangEngine.java b/base/src/bjc/dicelang/DiceLangEngine.java index 549faf6..e0cddb1 100644 --- a/base/src/bjc/dicelang/DiceLangEngine.java +++ b/base/src/bjc/dicelang/DiceLangEngine.java @@ -14,12 +14,12 @@ import bjc.dicelang.eval.EvaluatorResult; import bjc.dicelang.eval.FailureEvaluatorResult; import bjc.dicelang.scl.StreamEngine; import bjc.dicelang.tokens.Token; -import bjc.data.ITree; +import bjc.data.Tree; import bjc.funcdata.FunctionalList; import bjc.funcdata.FunctionalMap; import bjc.funcdata.FunctionalStringTokenizer; -import bjc.funcdata.IList; -import bjc.funcdata.IMap; +import bjc.funcdata.ListEx; +import bjc.funcdata.MapEx; import bjc.utils.funcutils.ListUtils; import bjc.utils.parserutils.TokenUtils; import bjc.utils.parserutils.splitter.ConfigurableTokenSplitter; @@ -71,15 +71,15 @@ public class DiceLangEngine { /** * The symbol table. */ - public final IMap symTable; + public final MapEx symTable; /* String literal tables */ - private final IMap stringLits; - private final IMap stringLiterals; + private final MapEx stringLits; + private final MapEx stringLiterals; /* Lists of defns. */ - private final IList lineDefns; - private final IList tokenDefns; + private final ListEx lineDefns; + private final ListEx tokenDefns; /* Are defns currently sorted by priority? */ private boolean defnsSorted; @@ -237,21 +237,21 @@ public class DiceLangEngine { * * Instead of strings, this should maybe use a RawToken class or something. */ - final IList preprocessedTokens = preprocessCommand(command); + final ListEx preprocessedTokens = preprocessCommand(command); if (preprocessedTokens == null) { return false; } /* Lex the string tokens into token-tokens */ - final IList lexedTokens = lexTokens(preprocessedTokens); + final ListEx lexedTokens = lexTokens(preprocessedTokens); if (lexedTokens == null) { return false; } /* Parse the tokens into an AST forest */ - final IList> astForest = new FunctionalList<>(); + final ListEx> astForest = new FunctionalList<>(); final boolean succ = Parser.parseTokens(lexedTokens, astForest); if (!succ) { @@ -264,8 +264,8 @@ public class DiceLangEngine { } /* Lex string tokens into token-tokens */ - private IList lexTokens(final IList preprocessedTokens) { - final IList lexedTokens = new FunctionalList<>(); + private ListEx lexTokens(final ListEx preprocessedTokens) { + final ListEx lexedTokens = new FunctionalList<>(); for (final String token : preprocessedTokens) { String newTok = token; @@ -308,8 +308,8 @@ public class DiceLangEngine { } /* Preshunt preshunt-marked groups of tokens */ - IList shuntedTokens = lexedTokens; - final IList preparedTokens = new FunctionalList<>(); + ListEx shuntedTokens = lexedTokens; + final ListEx preparedTokens = new FunctionalList<>(); boolean succ = removePreshuntTokens(lexedTokens, preparedTokens); @@ -348,7 +348,7 @@ public class DiceLangEngine { } /* Expand token groups */ - final IList readyTokens = shuntedTokens.flatMap(tk -> { + final ListEx readyTokens = shuntedTokens.flatMap(tk -> { if (tk.type == Token.Type.TOKGROUP || tk.type == Token.Type.TAGOP || tk.type == Token.Type.TAGOPR) { String msg = String.format("Expanding token group to: %s\n", tk.tokenValues.toString()); LOG.finer(msg); @@ -396,14 +396,14 @@ public class DiceLangEngine { } /* Preprocess a command into a list of string tokens. */ - private IList preprocessCommand(final String command) { + private ListEx preprocessCommand(final String command) { /* Sort the defines if they aren't sorted */ if (!defnsSorted) { sortDefns(); } /* Run the tokens through the stream engine */ - final IList streamToks = new FunctionalList<>(); + final ListEx streamToks = new FunctionalList<>(); final boolean succ = streamEng.doStreams(command.split(" "), streamToks); if (!succ) { @@ -486,10 +486,10 @@ public class DiceLangEngine { /* Split the command into tokens */ final String strang = destringedCommand.toString(); - IList tokens = FunctionalStringTokenizer.fromString(strang).toList(); + ListEx tokens = FunctionalStringTokenizer.fromString(strang).toList(); /* Temporarily remove non-expanding tokens */ - final IMap nonExpandedTokens = new FunctionalMap<>(); + final MapEx nonExpandedTokens = new FunctionalMap<>(); tokens = tokens.map(tk -> { final Matcher nonExpandMatcher = nonExpandPattern.matcher(tk); @@ -518,7 +518,7 @@ public class DiceLangEngine { } /* Expand tokens */ - IList fullyExpandedTokens = tokens.flatMap(opExpander::split); + ListEx fullyExpandedTokens = tokens.flatMap(opExpander::split); if (debugMode) { String msg = String.format("\tCommand after token expansion: %s\n", fullyExpandedTokens.toString()); @@ -549,10 +549,10 @@ public class DiceLangEngine { } /* Evaluate a forest of AST nodes. */ - private void evaluateForest(final IList> astForest) { + private void evaluateForest(final ListEx> astForest) { int treeNo = 1; - for (final ITree ast : astForest) { + for (final Tree ast : astForest) { if (debugMode) { System.out.printf("\t\tTree %d in forest:\n%s\n", treeNo, ast.toString()); } @@ -564,8 +564,8 @@ public class DiceLangEngine { int step = 1; /* Evaluate it step by step */ - for (final Iterator> itr = eval.stepDebug(ast); itr.hasNext();) { - final ITree nodeStep = itr.next(); + for (final Iterator> itr = eval.stepDebug(ast); itr.hasNext();) { + final Tree nodeStep = itr.next(); System.out.printf("\t\tStep %d: Node is %s", step, nodeStep); @@ -590,7 +590,7 @@ public class DiceLangEngine { } if (res.type == EvaluatorResult.Type.FAILURE) { - ITree otree = ((FailureEvaluatorResult) res).origVal; + Tree otree = ((FailureEvaluatorResult) res).origVal; System.out.printf(" (original tree is %s)", otree); } @@ -626,13 +626,13 @@ public class DiceLangEngine { } /* Preshunt preshunt-marked groups of tokens. */ - private boolean removePreshuntTokens(final IList lexedTokens, final IList preparedTokens) { + private boolean removePreshuntTokens(final ListEx lexedTokens, final ListEx preparedTokens) { /* Current nesting level of tokens. */ int curBraceCount = 0; /* Data storage. */ - final Deque> bracedTokens = new LinkedList<>(); - IList curBracedTokens = new FunctionalList<>(); + final Deque> bracedTokens = new LinkedList<>(); + ListEx curBracedTokens = new FunctionalList<>(); for (final Token tk : lexedTokens) { if (tk.type == Token.Type.OBRACE && tk.intValue == 2) { @@ -659,7 +659,7 @@ public class DiceLangEngine { curBraceCount -= 1; - final IList preshuntTokens = new FunctionalList<>(); + final ListEx preshuntTokens = new FunctionalList<>(); /* Shunt preshunt group. */ final boolean success = shunt.shuntTokens(curBracedTokens, preshuntTokens); diff --git a/base/src/bjc/dicelang/Node.java b/base/src/bjc/dicelang/Node.java index 1a3c2d6..d410695 100644 --- a/base/src/bjc/dicelang/Node.java +++ b/base/src/bjc/dicelang/Node.java @@ -3,7 +3,7 @@ package bjc.dicelang; import bjc.dicelang.eval.EvaluatorResult; import bjc.dicelang.eval.FailureEvaluatorResult; import bjc.dicelang.tokens.Token; -import bjc.data.ITree; +import bjc.data.Tree; /* * @TODO 10/09/17 Ben Culkin :NodeReorg @@ -124,7 +124,7 @@ public class Node { return new Node(Type.RESULT, res); } - public static Node FAIL(final ITree orig) { + public static Node FAIL(final Tree orig) { FailureEvaluatorResult res = new FailureEvaluatorResult(orig); return new Node(Type.RESULT, res); diff --git a/base/src/bjc/dicelang/Parser.java b/base/src/bjc/dicelang/Parser.java index 49cc312..6879c4f 100644 --- a/base/src/bjc/dicelang/Parser.java +++ b/base/src/bjc/dicelang/Parser.java @@ -17,9 +17,9 @@ import java.util.Deque; import java.util.LinkedList; import bjc.dicelang.tokens.Token; -import bjc.data.ITree; import bjc.data.Tree; -import bjc.funcdata.IList; +import bjc.data.SimpleTree; +import bjc.funcdata.ListEx; /** * Parse a series of tree into tokens. @@ -44,15 +44,15 @@ public class Parser { * * @return Whether or not the parse was successful. */ - public static boolean parseTokens(final IList tokens, final IList> results) { - final Deque> working = new LinkedList<>(); + public static boolean parseTokens(final ListEx tokens, final ListEx> results) { + final Deque> working = new LinkedList<>(); for(final Token tk : tokens) { switch(tk.type) { case OBRACKET: case OBRACE: /* Parse opening delims. */ - working.push(new Tree<>(new Node(OGROUP, tk))); + working.push(new SimpleTree<>(new Node(OGROUP, tk))); break; case CBRACKET: @@ -90,8 +90,8 @@ public class Parser { Errors.inst.printError(EK_PARSE_UNOPERAND, tk.toString()); return false; } else if(working.size() == 1) { - final ITree operand = working.pop(); - final ITree opNode = new Tree<>(new Node(UNARYOP, tk.type)); + final Tree operand = working.pop(); + final Tree opNode = new SimpleTree<>(new Node(UNARYOP, tk.type)); opNode.addChild(operand); @@ -108,8 +108,8 @@ public class Parser { if(working.size() == 0) { Errors.inst.printError(EK_PARSE_UNOPERAND, tk.toString()); } else { - final ITree operand = working.pop(); - final ITree opNode = new Tree<>(new Node(UNARYOP, tk.type)); + final Tree operand = working.pop(); + final Tree opNode = new SimpleTree<>(new Node(UNARYOP, tk.type)); opNode.addChild(operand); @@ -123,7 +123,7 @@ public class Parser { case VREF: case DICE_LIT: /* Handle literals. */ - working.push(new Tree<>(new Node(TOKREF, tk))); + working.push(new SimpleTree<>(new Node(TOKREF, tk))); break; default: Errors.inst.printError(EK_PARSE_INVTOKEN, tk.type.toString()); @@ -135,7 +135,7 @@ public class Parser { * Collect the remaining nodes as the roots of the trees in the * AST forest. */ - for(final ITree ast : working) { + for(final Tree ast : working) { /* Make sure that the tree are well-formed */ if(ast.containsMatching((val) -> { switch(val.type) { @@ -157,11 +157,11 @@ public class Parser { } /* Handle a binary operator. */ - private static void handleBinaryNode(final Deque> working, final Token tk) { - final ITree right = working.pop(); - final ITree left = working.pop(); + private static void handleBinaryNode(final Deque> working, final Token tk) { + final Tree right = working.pop(); + final Tree left = working.pop(); - final ITree opNode = new Tree<>(new Node(BINOP, tk.type)); + final Tree opNode = new SimpleTree<>(new Node(BINOP, tk.type)); opNode.addChild(left); opNode.addChild(right); @@ -170,20 +170,20 @@ public class Parser { } /* Parse a closing delimiter. */ - private static boolean parseClosingGrouper(final Deque> working, final Token tk) { + private static boolean parseClosingGrouper(final Deque> working, final Token tk) { if(working.size() == 0) { Errors.inst.printError(EK_PARSE_NOCLOSE); return false; } - ITree groupNode = null; + Tree groupNode = null; switch(tk.type) { case CBRACE: - groupNode = new Tree<>(new Node(GROUP, Node.GroupType.CODE)); + groupNode = new SimpleTree<>(new Node(GROUP, Node.GroupType.CODE)); break; case CBRACKET: - groupNode = new Tree<>(new Node(GROUP, Node.GroupType.ARRAY)); + groupNode = new SimpleTree<>(new Node(GROUP, Node.GroupType.ARRAY)); break; default: Errors.inst.printError(EK_PARSE_UNCLOSE, tk.type.toString()); @@ -198,7 +198,7 @@ public class Parser { matching = new Token(Token.Type.OBRACE, tk.intValue); } - final ITree matchNode = new Tree<>(new Node(OGROUP, matching)); + final Tree matchNode = new SimpleTree<>(new Node(OGROUP, matching)); if(!working.contains(matchNode)) { Errors.inst.printError(EK_PARSE_UNCLOSE, tk.toString(), matchNode.toString()); @@ -207,14 +207,14 @@ public class Parser { int treeNo = 1; - for(final ITree ast : working) { + for(final Tree ast : working) { System.out.println("Tree " + treeNo++ + ": " + ast.toString()); } return false; } - final Deque> childs = new LinkedList<>(); + final Deque> childs = new LinkedList<>(); while(!working.peek().equals(matchNode)) { childs.push(working.pop()); @@ -223,7 +223,7 @@ public class Parser { /* Discard opener */ working.pop(); - for(final ITree child : childs) { + for(final Tree child : childs) { groupNode.addChild(child); } diff --git a/base/src/bjc/dicelang/Shunter.java b/base/src/bjc/dicelang/Shunter.java index 0e3cf1d..366c459 100644 --- a/base/src/bjc/dicelang/Shunter.java +++ b/base/src/bjc/dicelang/Shunter.java @@ -8,8 +8,8 @@ import java.util.Set; import bjc.dicelang.tokens.Token; import bjc.funcdata.FunctionalList; import bjc.funcdata.FunctionalMap; -import bjc.funcdata.IList; -import bjc.funcdata.IMap; +import bjc.funcdata.ListEx; +import bjc.funcdata.MapEx; import static bjc.dicelang.Errors.ErrorKey.EK_SHUNT_INVSEP; import static bjc.dicelang.Errors.ErrorKey.EK_SHUNT_NOGROUP; @@ -26,7 +26,7 @@ import static bjc.dicelang.tokens.Token.Type.*; */ public class Shunter { /* The binary operators and their priorities. */ - IMap ops; + MapEx ops; /* Operators that are right-associative */ Set rightAssoc; @@ -116,7 +116,7 @@ public class Shunter { * * @return Whether or not the shunt succeeded. */ - public boolean shuntTokens(final IList tks, final IList returned) { + public boolean shuntTokens(final ListEx tks, final ListEx returned) { /* Operator stack for normal and unary operators. */ final Deque opStack = new LinkedList<>(); final Deque unaryOps = new LinkedList<>(); @@ -274,7 +274,7 @@ public class Shunter { opStack.pop(); } else if(tk.type == GROUPSEP) { /* Add a grouped token. */ - final IList group = new FunctionalList<>(); + final ListEx group = new FunctionalList<>(); while(currReturned.size() != 0 && !currReturned.peek().isGrouper()) { group.add(currReturned.pop()); diff --git a/base/src/bjc/dicelang/Tokenizer.java b/base/src/bjc/dicelang/Tokenizer.java index d0e0539..7aed861 100644 --- a/base/src/bjc/dicelang/Tokenizer.java +++ b/base/src/bjc/dicelang/Tokenizer.java @@ -8,7 +8,7 @@ import bjc.dicelang.tokens.DiceToken; import bjc.dicelang.tokens.FloatToken; import bjc.dicelang.tokens.Token; import bjc.funcdata.FunctionalMap; -import bjc.funcdata.IMap; +import bjc.funcdata.MapEx; import bjc.utils.funcutils.StringUtils; import bjc.utils.parserutils.TokenUtils; @@ -20,7 +20,7 @@ import static bjc.dicelang.tokens.Token.Type.*; */ public class Tokenizer { /* Literal tokens for tokenization */ - private static final IMap litTokens; + private static final MapEx litTokens; private final DiceLangEngine eng; @@ -67,7 +67,7 @@ public class Tokenizer { * * @return A lexed token. */ - public Token lexToken(final String token, final IMap stringLts) { + public Token lexToken(final String token, final MapEx stringLts) { if (token.equals("")) { return null; } @@ -139,7 +139,7 @@ public class Tokenizer { private final Pattern stringLitMatcher = Pattern.compile("\\AstringLiteral(\\d+)\\Z"); /* Tokenize a literal value. */ - private Token tokenizeLiteral(final String rtoken, final IMap stringLts) { + private Token tokenizeLiteral(final String rtoken, final MapEx stringLts) { Token tk = Token.NIL_TOKEN; String token = rtoken.trim(); diff --git a/base/src/bjc/dicelang/cli/DiceLangConsole.java b/base/src/bjc/dicelang/cli/DiceLangConsole.java index 54dc49d..bd25b9b 100644 --- a/base/src/bjc/dicelang/cli/DiceLangConsole.java +++ b/base/src/bjc/dicelang/cli/DiceLangConsole.java @@ -4,7 +4,7 @@ import bjc.dicelang.Define; import bjc.dicelang.DiceLangEngine; import bjc.dicelang.Errors; import bjc.funcdata.FunctionalMap; -import bjc.funcdata.IMap; +import bjc.funcdata.MapEx; import java.io.IOException; import java.util.LinkedList; @@ -34,7 +34,7 @@ public class DiceLangConsole { /* Are we in multi-line mode? */ private boolean multiLine; - private static IMap pragmas; + private static MapEx pragmas; static { pragmas = new FunctionalMap<>(); diff --git a/base/src/bjc/dicelang/eval/Evaluator.java b/base/src/bjc/dicelang/eval/Evaluator.java index fbcdcec..9e41017 100644 --- a/base/src/bjc/dicelang/eval/Evaluator.java +++ b/base/src/bjc/dicelang/eval/Evaluator.java @@ -18,11 +18,11 @@ import bjc.dicelang.dice.SimpleDieList; import bjc.dicelang.tokens.DiceToken; import bjc.dicelang.tokens.FloatToken; import bjc.dicelang.tokens.Token; -import bjc.data.ITree; +import bjc.data.Tree; import bjc.data.SingleIterator; import bjc.data.TopDownTransformIterator; import bjc.data.TopDownTransformResult; -import bjc.data.Tree; +import bjc.data.SimpleTree; import static bjc.dicelang.Errors.ErrorKey.*; import static bjc.dicelang.eval.EvaluatorResult.Type.*; @@ -47,7 +47,7 @@ public class Evaluator { /* The context during iteration. */ private static class Context { - public Consumer>> thunk; + public Consumer>> thunk; public boolean isDebug; @@ -77,7 +77,7 @@ public class Evaluator { * * @return The result of the tree. */ - public EvaluatorResult evaluate(final ITree comm) { + public EvaluatorResult evaluate(final Tree comm) { final Context ctx = new Context(); ctx.isDebug = false; @@ -92,7 +92,7 @@ public class Evaluator { }; /* The result. */ - final ITree res = comm.topDownTransform(this::pickEvaluationType, node -> this.evaluateNode(node, ctx)); + final Tree res = comm.topDownTransform(this::pickEvaluationType, node -> this.evaluateNode(node, ctx)); return res.getHead().resultVal; } @@ -105,7 +105,7 @@ public class Evaluator { * Make it public once we know it works again. */ @SuppressWarnings("javadoc") - public Iterator> stepDebug(final ITree comm) { + public Iterator> stepDebug(final Tree comm) { final Context ctx = new Context(); ctx.isDebug = true; @@ -136,7 +136,7 @@ public class Evaluator { } /* Evaluate a node. */ - private ITree evaluateNode(final ITree ast, final Context ctx) { + private Tree evaluateNode(final Tree ast, final Context ctx) { switch (ast.getHead().type) { case UNARYOP: return evaluateUnaryOp(ast, ctx); @@ -150,16 +150,16 @@ public class Evaluator { return ast; default: Errors.inst.printError(EK_EVAL_INVNODE, ast.getHead().type.toString()); - return new Tree<>(Node.FAIL(ast)); + return new SimpleTree<>(Node.FAIL(ast)); } } /* Evaluate a unary operator. */ - private ITree evaluateUnaryOp(final ITree ast, final Context ctx) { + private Tree evaluateUnaryOp(final Tree ast, final Context ctx) { /* Unary operators only take one operand. */ if (ast.getChildrenCount() != 1) { Errors.inst.printError(EK_EVAL_UNUNARY, Integer.toString(ast.getChildrenCount())); - return new Tree<>(Node.FAIL(ast)); + return new SimpleTree<>(Node.FAIL(ast)); } switch (ast.getHead().operatorType) { @@ -179,7 +179,7 @@ public class Evaluator { final EvaluatorResult sres = new DiceEvaluatorResult(die); - return new Tree<>(new Node(Node.Type.RESULT, sres)); + return new SimpleTree<>(new Node(Node.Type.RESULT, sres)); } case DICEFUDGE: { final EvaluatorResult oprn = ast.getChild(0).getHead().resultVal; @@ -194,12 +194,12 @@ public class Evaluator { final EvaluatorResult fres = new DiceEvaluatorResult(die); - return new Tree<>(new Node(Node.Type.RESULT, fres)); + return new SimpleTree<>(new Node(Node.Type.RESULT, fres)); } default: { Errors.inst.printError(EK_EVAL_INVUNARY, ast.getHead().operatorType.toString()); - return new Tree<>(Node.FAIL(ast)); + return new SimpleTree<>(Node.FAIL(ast)); } } } @@ -216,36 +216,36 @@ public class Evaluator { * Coerce also needs to be able to coerce things to dice and ratios (whenever * they get added). */ - private ITree doTypeCoercion(final ITree ast, final Context ctx) { - final ITree toCoerce = ast.getChild(0); - final ITree retVal = new Tree<>(toCoerce.getHead()); - final Deque> children = new LinkedList<>(); + private Tree doTypeCoercion(final Tree ast, final Context ctx) { + final Tree toCoerce = ast.getChild(0); + final Tree retVal = new SimpleTree<>(toCoerce.getHead()); + final Deque> children = new LinkedList<>(); /* The current type we are coercing to. */ CoerceSteps curLevel = CoerceSteps.INTEGER; for (int i = 0; i < toCoerce.getChildrenCount(); i++) { - final ITree child = toCoerce.getChild(i); - ITree nChild = null; + final Tree child = toCoerce.getChild(i); + Tree nChild = null; /* Tell our thunk we processed a node. */ if (ctx.isDebug) { /* Evaluate each step of the child. */ - final Iterator> nd = stepDebug(child); + final Iterator> nd = stepDebug(child); for (; nd.hasNext(); nChild = nd.next()) { ctx.thunk.accept(new SingleIterator<>(child)); } } else { /* Evaluate the child. */ - nChild = new Tree<>(new Node(Node.Type.RESULT, evaluate(child))); + nChild = new SimpleTree<>(new Node(Node.Type.RESULT, evaluate(child))); ctx.thunk.accept(new SingleIterator<>(nChild)); } if (nChild == null) { Errors.inst.printError(EK_EVAL_INVNODE); - return new Tree<>(Node.FAIL(ast)); + return new SimpleTree<>(Node.FAIL(ast)); } final Node childNode = nChild.getHead(); @@ -259,7 +259,7 @@ public class Evaluator { children.add(nChild); } - for (final ITree child : children) { + for (final Tree child : children) { final Node nd = child.getHead(); final EvaluatorResult res = nd.resultVal; @@ -285,18 +285,18 @@ public class Evaluator { } /* Evaluate a binary operator. */ - private static ITree evaluateBinaryOp(final ITree ast, final Context ctx) { + private static Tree evaluateBinaryOp(final Tree ast, final Context ctx) { final Token.Type binOp = ast.getHead().operatorType; /* Binary operators always have two children. */ if (ast.getChildrenCount() != 2) { Errors.inst.printError(EK_EVAL_INVBIN, Integer.toString(ast.getChildrenCount()), ast.toString()); - return new Tree<>(Node.FAIL(ast)); + return new SimpleTree<>(Node.FAIL(ast)); } - final ITree left = ast.getChild(0); - final ITree right = ast.getChild(1); + final Tree left = ast.getChild(0); + final Tree right = ast.getChild(1); final EvaluatorResult leftRes = left.getHead().resultVal; final EvaluatorResult rightRes = right.getHead().resultVal; @@ -317,16 +317,16 @@ public class Evaluator { return evaluateStringBinary(binOp, leftRes, rightRes, ctx); default: Errors.inst.printError(EK_EVAL_UNBIN, binOp.toString()); - return new Tree<>(Node.FAIL(ast)); + return new SimpleTree<>(Node.FAIL(ast)); } } /* Evaluate a binary operator on strings. */ - private static ITree evaluateStringBinary(final Token.Type op, final EvaluatorResult left, + private static Tree evaluateStringBinary(final Token.Type op, final EvaluatorResult left, final EvaluatorResult right, final Context ctx) { if (left.type != STRING) { Errors.inst.printError(EK_EVAL_INVSTRING, left.type.toString()); - return new Tree<>(Node.FAIL(left)); + return new SimpleTree<>(Node.FAIL(left)); } final String strang = ((StringEvaluatorResult) left).stringVal; @@ -335,18 +335,18 @@ public class Evaluator { case STRCAT: { if (right.type != STRING) { Errors.inst.printError(EK_EVAL_UNSTRING, right.type.toString()); - return new Tree<>(Node.FAIL(right)); + return new SimpleTree<>(Node.FAIL(right)); } final String strung = ((StringEvaluatorResult) right).stringVal; final EvaluatorResult cres = new StringEvaluatorResult(strang + strung); - return new Tree<>(new Node(Node.Type.RESULT, cres)); + return new SimpleTree<>(new Node(Node.Type.RESULT, cres)); } case STRREP: { if (right.type != INT) { Errors.inst.printError(EK_EVAL_INVSTRING, right.type.toString()); - return new Tree<>(Node.FAIL(right)); + return new SimpleTree<>(Node.FAIL(right)); } String res = strang; @@ -356,16 +356,16 @@ public class Evaluator { res += strang; } - return new Tree<>(new Node(Node.Type.RESULT, new StringEvaluatorResult(res))); + return new SimpleTree<>(new Node(Node.Type.RESULT, new StringEvaluatorResult(res))); } default: Errors.inst.printError(EK_EVAL_UNSTRING, op.toString()); - return new Tree<>(Node.FAIL()); + return new SimpleTree<>(Node.FAIL()); } } /* Evaluate dice binary operators. */ - private static ITree evaluateDiceBinary(final Token.Type op, final EvaluatorResult left, + private static Tree evaluateDiceBinary(final Token.Type op, final EvaluatorResult left, final EvaluatorResult right, final Context ctx) { EvaluatorResult res = null; @@ -391,7 +391,7 @@ public class Evaluator { res = new DiceEvaluatorResult(new SimpleDie(lhs, ((IntegerEvaluatorResult) right).value)); } else { Errors.inst.printError(EK_EVAL_INVDGROUP, right.type.toString()); - return new Tree<>(Node.FAIL(right)); + return new SimpleTree<>(Node.FAIL(right)); } } else if (left.type == INT) { IntegerEvaluatorResult irs = (IntegerEvaluatorResult) left; @@ -404,20 +404,20 @@ public class Evaluator { res = new DiceEvaluatorResult(new SimpleDie(irs.value, ((IntegerEvaluatorResult) right).value)); } else { Errors.inst.printError(EK_EVAL_INVDGROUP, right.type.toString()); - return new Tree<>(Node.FAIL(right)); + return new SimpleTree<>(Node.FAIL(right)); } } else { Errors.inst.printError(EK_EVAL_INVDGROUP, left.type.toString()); - return new Tree<>(Node.FAIL(left)); + return new SimpleTree<>(Node.FAIL(left)); } } case DICECONCAT: { if (left.type != DICE || ((DiceEvaluatorResult) left).diceVal.isList()) { Errors.inst.printError(EK_EVAL_INVDICE, left.type.toString()); - return new Tree<>(Node.FAIL(left)); + return new SimpleTree<>(Node.FAIL(left)); } else if (right.type != DICE || ((DiceEvaluatorResult) right).diceVal.isList()) { Errors.inst.printError(EK_EVAL_INVDICE, right.type.toString()); - return new Tree<>(Node.FAIL(right)); + return new SimpleTree<>(Node.FAIL(right)); } else { Die lhs = ((ScalarDiceExpression) ((DiceEvaluatorResult) left).diceVal).scalar; Die rhs = ((ScalarDiceExpression) ((DiceEvaluatorResult) right).diceVal).scalar; @@ -430,10 +430,10 @@ public class Evaluator { case DICELIST: { if (left.type != DICE || ((DiceEvaluatorResult) left).diceVal.isList()) { Errors.inst.printError(EK_EVAL_INVDICE, left.type.toString()); - return new Tree<>(Node.FAIL(left)); + return new SimpleTree<>(Node.FAIL(left)); } else if (right.type != DICE || ((DiceEvaluatorResult) right).diceVal.isList()) { Errors.inst.printError(EK_EVAL_INVDICE, right.type.toString()); - return new Tree<>(Node.FAIL(right)); + return new SimpleTree<>(Node.FAIL(right)); } else { Die lhs = ((ScalarDiceExpression) ((DiceEvaluatorResult) left).diceVal).scalar; Die rhs = ((ScalarDiceExpression) ((DiceEvaluatorResult) right).diceVal).scalar; @@ -445,38 +445,38 @@ public class Evaluator { } default: Errors.inst.printError(EK_EVAL_UNDICE, op.toString()); - return new Tree<>(Node.FAIL()); + return new SimpleTree<>(Node.FAIL()); } - return new Tree<>(new Node(Node.Type.RESULT, res)); + return new SimpleTree<>(new Node(Node.Type.RESULT, res)); } /* Evaluate a binary math operator. */ - private static ITree evaluateMathBinary(final Token.Type op, final EvaluatorResult left, + private static Tree evaluateMathBinary(final Token.Type op, final EvaluatorResult left, final EvaluatorResult right, final Context ctx) { if (left.type == STRING || right.type == STRING) { Errors.inst.printError(EK_EVAL_STRINGMATH); - return new Tree<>(Node.FAIL()); + return new SimpleTree<>(Node.FAIL()); } else if (left.type == FAILURE || right.type == FAILURE) { - return new Tree<>(Node.FAIL()); + return new SimpleTree<>(Node.FAIL()); } else if (left.type == INT && right.type != INT) { Errors.inst.printError(EK_EVAL_MISMATH); - return new Tree<>(Node.FAIL(right)); + return new SimpleTree<>(Node.FAIL(right)); } else if (left.type == FLOAT && right.type != FLOAT) { Errors.inst.printError(EK_EVAL_MISMATH); - return new Tree<>(Node.FAIL(right)); + return new SimpleTree<>(Node.FAIL(right)); } else if (left.type == DICE && right.type != DICE) { Errors.inst.printError(EK_EVAL_MISMATH); - return new Tree<>(Node.FAIL(right)); + return new SimpleTree<>(Node.FAIL(right)); } else if (right.type == INT && left.type != INT) { Errors.inst.printError(EK_EVAL_MISMATH); - return new Tree<>(Node.FAIL(left)); + return new SimpleTree<>(Node.FAIL(left)); } else if (right.type == FLOAT && left.type != FLOAT) { Errors.inst.printError(EK_EVAL_MISMATH); - return new Tree<>(Node.FAIL(left)); + return new SimpleTree<>(Node.FAIL(left)); } else if (right.type == DICE && left.type != DICE) { Errors.inst.printError(EK_EVAL_MISMATH); - return new Tree<>(Node.FAIL(left)); + return new SimpleTree<>(Node.FAIL(left)); } EvaluatorResult res = null; @@ -491,10 +491,10 @@ public class Evaluator { } else if (left.type == DICE) { if (((DiceEvaluatorResult) left).diceVal.isList()) { Errors.inst.printError(EK_EVAL_INVDICE, left.toString()); - return new Tree<>(Node.FAIL(left)); + return new SimpleTree<>(Node.FAIL(left)); } else if (((DiceEvaluatorResult) right).diceVal.isList()) { Errors.inst.printError(EK_EVAL_INVDICE, right.toString()); - return new Tree<>(Node.FAIL(right)); + return new SimpleTree<>(Node.FAIL(right)); } Die lhs = ((ScalarDiceExpression) ((DiceEvaluatorResult) left).diceVal).scalar; @@ -517,10 +517,10 @@ public class Evaluator { } else if (left.type == DICE) { if (((DiceEvaluatorResult) left).diceVal.isList()) { Errors.inst.printError(EK_EVAL_INVDICE, left.toString()); - return new Tree<>(Node.FAIL(left)); + return new SimpleTree<>(Node.FAIL(left)); } else if (((DiceEvaluatorResult) right).diceVal.isList()) { Errors.inst.printError(EK_EVAL_INVDICE, right.toString()); - return new Tree<>(Node.FAIL(right)); + return new SimpleTree<>(Node.FAIL(right)); } Die lhs = ((ScalarDiceExpression) ((DiceEvaluatorResult) left).diceVal).scalar; @@ -543,10 +543,10 @@ public class Evaluator { } else if (left.type == DICE) { if (((DiceEvaluatorResult) left).diceVal.isList()) { Errors.inst.printError(EK_EVAL_INVDICE, left.toString()); - return new Tree<>(Node.FAIL(left)); + return new SimpleTree<>(Node.FAIL(left)); } else if (((DiceEvaluatorResult) right).diceVal.isList()) { Errors.inst.printError(EK_EVAL_INVDICE, right.toString()); - return new Tree<>(Node.FAIL(right)); + return new SimpleTree<>(Node.FAIL(right)); } Die lhs = ((ScalarDiceExpression) ((DiceEvaluatorResult) left).diceVal).scalar; @@ -581,7 +581,7 @@ public class Evaluator { } } else { Errors.inst.printError(EK_EVAL_DIVDICE); - return new Tree<>(Node.FAIL()); + return new SimpleTree<>(Node.FAIL()); } break; @@ -607,21 +607,21 @@ public class Evaluator { } } else { Errors.inst.printError(EK_EVAL_DIVDICE); - return new Tree<>(Node.FAIL()); + return new SimpleTree<>(Node.FAIL()); } break; } default: Errors.inst.printError(EK_EVAL_UNMATH, op.toString()); - return new Tree<>(Node.FAIL()); + return new SimpleTree<>(Node.FAIL()); } - return new Tree<>(new Node(Node.Type.RESULT, res)); + return new SimpleTree<>(new Node(Node.Type.RESULT, res)); } /* Evaluate a token reference. */ - private ITree evaluateTokenRef(final Token tk, final Context ctx) { + private Tree evaluateTokenRef(final Token tk, final Context ctx) { EvaluatorResult res = null; switch (tk.type) { @@ -643,6 +643,6 @@ public class Evaluator { res = new EvaluatorResult(FAILURE); } - return new Tree<>(new Node(Node.Type.RESULT, res)); + return new SimpleTree<>(new Node(Node.Type.RESULT, res)); } } diff --git a/base/src/bjc/dicelang/eval/FailureEvaluatorResult.java b/base/src/bjc/dicelang/eval/FailureEvaluatorResult.java index 1d0ad7b..dee725e 100644 --- a/base/src/bjc/dicelang/eval/FailureEvaluatorResult.java +++ b/base/src/bjc/dicelang/eval/FailureEvaluatorResult.java @@ -1,8 +1,8 @@ package bjc.dicelang.eval; import bjc.dicelang.Node; -import bjc.data.ITree; import bjc.data.Tree; +import bjc.data.SimpleTree; /** * Represents an evaluation ending in failure. @@ -14,7 +14,7 @@ public class FailureEvaluatorResult extends EvaluatorResult { /** * Original node data */ - public ITree origVal; + public Tree origVal; /** * Create a new generic failure. @@ -29,7 +29,7 @@ public class FailureEvaluatorResult extends EvaluatorResult { * @param orig * The tree that caused the failure. */ - public FailureEvaluatorResult(final ITree orig) { + public FailureEvaluatorResult(final Tree orig) { super(Type.FAILURE); origVal = orig; @@ -42,7 +42,7 @@ public class FailureEvaluatorResult extends EvaluatorResult { * The node that caused the failure. */ public FailureEvaluatorResult(final Node orig) { - this(new Tree<>(orig)); + this(new SimpleTree<>(orig)); } /** diff --git a/base/src/bjc/dicelang/expr/ExprREPL.java b/base/src/bjc/dicelang/expr/ExprREPL.java index bbfeeb2..7cc53ee 100644 --- a/base/src/bjc/dicelang/expr/ExprREPL.java +++ b/base/src/bjc/dicelang/expr/ExprREPL.java @@ -2,8 +2,8 @@ package bjc.dicelang.expr; import java.util.Scanner; -import bjc.data.ITree; -import bjc.funcdata.IList; +import bjc.data.Tree; +import bjc.funcdata.ListEx; import bjc.utils.parserutils.TreeConstructor; /** @@ -54,7 +54,7 @@ public class ExprREPL { System.out.println(); /* Shunt infix tokens to postfix tokens. */ - final IList postfixTokens = Shunter.shuntTokens(infixTokens); + final ListEx postfixTokens = Shunter.shuntTokens(infixTokens); System.out.println("Lexed tokens: "); for(final Token tok : postfixTokens) { System.out.println("\t" + tok); @@ -73,7 +73,7 @@ public class ExprREPL { /* * Construct a tree from the list of postfixed tokens. */ - final ITree ast = TreeConstructor.constructTree(postfixTokens, + final Tree ast = TreeConstructor.constructTree(postfixTokens, tok -> tok.typ.isOperator); /* diff --git a/base/src/bjc/dicelang/expr/Lexer.java b/base/src/bjc/dicelang/expr/Lexer.java index 20e2a40..f9a645a 100644 --- a/base/src/bjc/dicelang/expr/Lexer.java +++ b/base/src/bjc/dicelang/expr/Lexer.java @@ -3,7 +3,7 @@ package bjc.dicelang.expr; import java.util.LinkedList; import java.util.List; -import bjc.funcdata.IList; +import bjc.funcdata.ListEx; import bjc.utils.parserutils.splitter.ConfigurableTokenSplitter; /* @@ -50,10 +50,10 @@ public class Lexer { /* Process each token. */ for(final String spacedToken : spacedTokens) { /* Split on operators. */ - final IList splitTokens = split.split(spacedToken); + final ListEx splitTokens = split.split(spacedToken); /* Convert strings to tokens. */ - final IList rawTokens = splitTokens.map(tok -> { + final ListEx rawTokens = splitTokens.map(tok -> { return tks.lexToken(tok, spacedToken); }); diff --git a/base/src/bjc/dicelang/expr/Parser.java b/base/src/bjc/dicelang/expr/Parser.java index 8f02853..990b2c8 100644 --- a/base/src/bjc/dicelang/expr/Parser.java +++ b/base/src/bjc/dicelang/expr/Parser.java @@ -1,6 +1,6 @@ package bjc.dicelang.expr; -import bjc.data.ITree; +import bjc.data.Tree; /** * Parser for simple math expressions. @@ -16,7 +16,7 @@ public class Parser { * The AST to canonicalize. * @return The canonicalized AST. */ - public static String toCanonicalExpr(final ITree ast) { + public static String toCanonicalExpr(final Tree ast) { final Token data = ast.getHead(); if (ast.getChildrenCount() == 0) { @@ -25,8 +25,8 @@ public class Parser { } /* The left/right children. */ - final ITree left = ast.getChild(0); - final ITree right = ast.getChild(1); + final Tree left = ast.getChild(0); + final Tree right = ast.getChild(1); /* Recursively canonicalize them. */ String leftExpr = toCanonicalExpr(left); diff --git a/base/src/bjc/dicelang/expr/Shunter.java b/base/src/bjc/dicelang/expr/Shunter.java index f1d3414..bfc0a83 100644 --- a/base/src/bjc/dicelang/expr/Shunter.java +++ b/base/src/bjc/dicelang/expr/Shunter.java @@ -4,7 +4,7 @@ import java.util.Deque; import java.util.LinkedList; import bjc.funcdata.FunctionalList; -import bjc.funcdata.IList; +import bjc.funcdata.ListEx; /** * Converts a infix series of tokens into a prefix series of tokens. @@ -20,9 +20,9 @@ public class Shunter { * * @return The tokens in postfix order. */ - public static IList shuntTokens(final Token[] infixTokens) { + public static ListEx shuntTokens(final Token[] infixTokens) { /* The returned tokens. */ - final IList postfixTokens = new FunctionalList<>(); + final ListEx postfixTokens = new FunctionalList<>(); /* The current stack of operators. */ final Deque opStack = new LinkedList<>(); diff --git a/base/src/bjc/dicelang/tokens/Token.java b/base/src/bjc/dicelang/tokens/Token.java index e4b97d1..e8fc605 100644 --- a/base/src/bjc/dicelang/tokens/Token.java +++ b/base/src/bjc/dicelang/tokens/Token.java @@ -1,6 +1,6 @@ package bjc.dicelang.tokens; -import bjc.funcdata.IList; +import bjc.funcdata.ListEx; /* * @TODO 10/09/17 Ben Culkin :TokenReorg @@ -85,7 +85,7 @@ public class Token { * - TAG* (the tagged construct) * */ - public IList tokenValues; + public ListEx tokenValues; public Token(final Type typ) { type = typ; @@ -97,7 +97,7 @@ public class Token { intValue = val; } - public Token(final Type typ, final IList tkVals) { + public Token(final Type typ, final ListEx tkVals) { this(typ); tokenValues = tkVals; -- cgit v1.2.3