diff options
15 files changed, 89 insertions, 88 deletions
diff --git a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java index 1198ec5..4ba5d01 100644 --- a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java +++ b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java @@ -4,8 +4,8 @@ import java.util.Scanner; import bjc.utils.funcdata.FunctionalMap; import bjc.utils.funcdata.FunctionalStringTokenizer; -import bjc.utils.funcdata.IFunctionalList; -import bjc.utils.funcdata.IFunctionalMap; +import bjc.utils.funcdata.IList; +import bjc.utils.funcdata.IMap; import bjc.utils.funcdata.ITree; import bjc.dicelang.ast.DiceASTEvaluator; @@ -25,7 +25,7 @@ import bjc.dicelang.ast.optimization.OperationCondenser; * */ public class DiceASTLanguageTest { - private static IFunctionalMap<String, DiceASTPragma> actions; + private static IMap<String, DiceASTPragma> actions; private static DiceASTOptimizer optimizer; @@ -54,11 +54,11 @@ public class DiceASTLanguageTest { private static void handleInlineAction( FunctionalStringTokenizer tokenizer, - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment) { + IMap<String, ITree<IDiceASTNode>> enviroment) { // Skip the pragma name tokenizer.nextToken(); - IFunctionalList<String> pragmaArgs = tokenizer.toList(); + IList<String> pragmaArgs = tokenizer.toList(); if (pragmaArgs.getSize() < 3) { System.err.println( @@ -70,7 +70,7 @@ public class DiceASTLanguageTest { String inlineExpression = pragmaArgs.getByIndex(0); String variableName = pragmaArgs.getByIndex(1); - IFunctionalList<String> inlinedVariables = pragmaArgs.tail() + IList<String> inlinedVariables = pragmaArgs.tail() .tail(); ITree<IDiceASTNode> inlinedExpression = DiceASTInliner @@ -95,7 +95,7 @@ public class DiceASTLanguageTest { String currentLine = inputSource.nextLine(); // The enviroment for variables - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment = new FunctionalMap<>(); + IMap<String, ITree<IDiceASTNode>> enviroment = new FunctionalMap<>(); while (!currentLine.equalsIgnoreCase("quit")) { String possibleActionName = currentLine.split(" ")[0]; @@ -120,7 +120,7 @@ public class DiceASTLanguageTest { // Build an AST from the string expression ITree<IDiceASTNode> builtAST; - IFunctionalList<String> preparedTokens = DiceExpressionPreparer + IList<String> preparedTokens = DiceExpressionPreparer .prepareCommand(currentLine); try { @@ -173,7 +173,7 @@ public class DiceASTLanguageTest { private static ITree<IDiceASTNode> transformAST( ITree<IDiceASTNode> builtAST, - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment) { + IMap<String, ITree<IDiceASTNode>> enviroment) { ITree<IDiceASTNode> optimizedTree = optimizer .optimizeTree(builtAST, enviroment); diff --git a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTPragma.java b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTPragma.java index 4bde0c2..87065f1 100644 --- a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTPragma.java +++ b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTPragma.java @@ -3,7 +3,7 @@ package bjc.dicelang.examples; import java.util.function.BiConsumer; import bjc.utils.funcdata.FunctionalStringTokenizer; -import bjc.utils.funcdata.IFunctionalMap; +import bjc.utils.funcdata.IMap; import bjc.utils.funcdata.ITree; import bjc.dicelang.ast.nodes.IDiceASTNode; @@ -15,6 +15,6 @@ import bjc.dicelang.ast.nodes.IDiceASTNode; * */ public interface DiceASTPragma extends - BiConsumer<FunctionalStringTokenizer, IFunctionalMap<String, ITree<IDiceASTNode>>> { + BiConsumer<FunctionalStringTokenizer, IMap<String, ITree<IDiceASTNode>>> { // Just an alias } diff --git a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceExpressionPreparer.java b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceExpressionPreparer.java index b281fd8..7489b5c 100644 --- a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceExpressionPreparer.java +++ b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceExpressionPreparer.java @@ -6,7 +6,7 @@ import java.util.LinkedList; import bjc.utils.data.IPair; import bjc.utils.data.Pair; import bjc.utils.funcdata.FunctionalStringTokenizer; -import bjc.utils.funcdata.IFunctionalList; +import bjc.utils.funcdata.IList; import bjc.utils.funcutils.ListUtils; import bjc.utils.parserutils.ShuntingYard; @@ -47,8 +47,8 @@ public class DiceExpressionPreparer { // to a variable expression } - static IFunctionalList<String> prepareCommand(String currentLine) { - IFunctionalList<String> tokens = FunctionalStringTokenizer + static IList<String> prepareCommand(String currentLine) { + IList<String> tokens = FunctionalStringTokenizer .fromString(currentLine).toList(); Deque<IPair<String, String>> ops = new LinkedList<>(); @@ -60,7 +60,7 @@ public class DiceExpressionPreparer { ops.add(new Pair<>(":=", ":=")); ops.add(new Pair<>("=>", "=>")); - IFunctionalList<String> semiExpandedTokens = ListUtils + IList<String> semiExpandedTokens = ListUtils .splitTokens(tokens, ops); ops = new LinkedList<>(); @@ -70,7 +70,7 @@ public class DiceExpressionPreparer { ops.add(new Pair<>("[", "\\[")); ops.add(new Pair<>("]", "\\]")); - IFunctionalList<String> fullyExpandedTokens = ListUtils + IList<String> fullyExpandedTokens = ListUtils .deAffixTokens(semiExpandedTokens, ops); fullyExpandedTokens.removeIf((strang) -> strang.equals("")); diff --git a/dice-lang/src/main/java/bjc/dicelang/DiceExpressionParser.java b/dice-lang/src/main/java/bjc/dicelang/DiceExpressionParser.java index 0926147..0b20934 100644 --- a/dice-lang/src/main/java/bjc/dicelang/DiceExpressionParser.java +++ b/dice-lang/src/main/java/bjc/dicelang/DiceExpressionParser.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Stack; import bjc.utils.funcdata.FunctionalStringTokenizer; -import bjc.utils.funcdata.IFunctionalList; +import bjc.utils.funcdata.IList; import bjc.utils.parserutils.ShuntingYard; import org.apache.commons.lang3.StringUtils; @@ -51,7 +51,7 @@ public class DiceExpressionParser { /* * Shunt the expression to postfix form */ - IFunctionalList<String> list = yard.postfix(tokenizer.toList(), + IList<String> list = yard.postfix(tokenizer.toList(), s -> s); /* diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java b/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java index c97471d..ac53c81 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java @@ -4,7 +4,7 @@ import java.util.function.BinaryOperator; import bjc.utils.data.IPair; import bjc.utils.data.Pair; -import bjc.utils.funcdata.IFunctionalList; +import bjc.utils.funcdata.IList; import bjc.utils.funcdata.ITree; import bjc.utils.funcdata.Tree; @@ -30,7 +30,7 @@ final class ArithmeticCollapser implements IOperatorCollapser { @Override public IPair<IResult, ITree<IDiceASTNode>> apply( - IFunctionalList<IPair<IResult, ITree<IDiceASTNode>>> nodes) { + IList<IPair<IResult, ITree<IDiceASTNode>>> nodes) { IPair<IResult, ITree<IDiceASTNode>> initState = new Pair<>( new IntegerResult(0), new Tree<>(type)); @@ -49,11 +49,11 @@ final class ArithmeticCollapser implements IOperatorCollapser { return reducedState; } - private IFunctionalList<IResult> combineArrayResults( + private IList<IResult> combineArrayResults( IResult accumulatedValue, IResult currentValue) { - IFunctionalList<IResult> currentList = ((ArrayResult) currentValue) + IList<IResult> currentList = ((ArrayResult) currentValue) .getValue(); - IFunctionalList<IResult> accumulatedList = ((ArrayResult) accumulatedValue) + IList<IResult> accumulatedList = ((ArrayResult) accumulatedValue) .getValue(); if (currentList.getSize() != accumulatedList.getSize()) { @@ -61,7 +61,7 @@ final class ArithmeticCollapser implements IOperatorCollapser { "Can only apply operations to equal-length arrays"); } - IFunctionalList<IResult> resultList = currentList.combineWith( + IList<IResult> resultList = currentList.combineWith( accumulatedList, (currentNode, accumulatedNode) -> { boolean currentNotInt = currentNode .getType() != ResultType.INTEGER; @@ -95,21 +95,21 @@ final class ArithmeticCollapser implements IOperatorCollapser { if (!currentIsInt) { if (!accumulatedIsInt) { - IFunctionalList<IResult> resultList = combineArrayResults( + IList<IResult> resultList = combineArrayResults( accumulatedValue, currentValue); return new Pair<>(new ArrayResult(resultList), accumulatedTree); } - IFunctionalList<IResult> resultList = halfCombineLists( + IList<IResult> resultList = halfCombineLists( ((ArrayResult) currentValue).getValue(), accumulatedValue, true); return new Pair<>(new ArrayResult(resultList), accumulatedTree); } else if (!accumulatedIsInt) { - IFunctionalList<IResult> resultList = halfCombineLists( + IList<IResult> resultList = halfCombineLists( ((ArrayResult) accumulatedValue).getValue(), currentValue, false); @@ -126,8 +126,8 @@ final class ArithmeticCollapser implements IOperatorCollapser { accumulatedTree); } - private IFunctionalList<IResult> halfCombineLists( - IFunctionalList<IResult> list, IResult scalar, + private IList<IResult> halfCombineLists( + IList<IResult> list, IResult scalar, boolean scalarLeft) { if (scalar.getType() != ResultType.INTEGER) { throw new UnsupportedOperationException( diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/ArrayResult.java b/dice-lang/src/main/java/bjc/dicelang/ast/ArrayResult.java index 1bd0940..ac78287 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/ArrayResult.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/ArrayResult.java @@ -1,6 +1,6 @@ package bjc.dicelang.ast; -import bjc.utils.funcdata.IFunctionalList; +import bjc.utils.funcdata.IList; /** * Represents a result that is an array of other results @@ -10,7 +10,7 @@ import bjc.utils.funcdata.IFunctionalList; * TODO finish implementing me */ public class ArrayResult implements IResult { - private IFunctionalList<IResult> arrayContents; + private IList<IResult> arrayContents; /** * Create a new array-valued result @@ -18,7 +18,7 @@ public class ArrayResult implements IResult { * @param results * The results in the array */ - public ArrayResult(IFunctionalList<IResult> results) { + public ArrayResult(IList<IResult> results) { this.arrayContents = results; } @@ -32,7 +32,7 @@ public class ArrayResult implements IResult { * * @return The value of this result */ - public IFunctionalList<IResult> getValue() { + public IList<IResult> getValue() { return arrayContents; } diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTEvaluator.java b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTEvaluator.java index 4e7d6fb..d2c127f 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTEvaluator.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTEvaluator.java @@ -9,8 +9,8 @@ import bjc.utils.data.LazyPair; import bjc.utils.data.Pair; import bjc.utils.funcdata.FunctionalList; import bjc.utils.funcdata.FunctionalMap; -import bjc.utils.funcdata.IFunctionalList; -import bjc.utils.funcdata.IFunctionalMap; +import bjc.utils.funcdata.IList; +import bjc.utils.funcdata.IMap; import bjc.utils.funcdata.ITree; import bjc.utils.funcdata.Tree; @@ -32,7 +32,7 @@ import bjc.dicelang.ast.nodes.VariableDiceNode; */ public class DiceASTEvaluator { private static IResult bindLiteralValue(IDiceASTNode leafNode, - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment) { + IMap<String, ITree<IDiceASTNode>> enviroment) { String variableName = ((VariableDiceNode) leafNode).getVariable(); if (enviroment.containsKey(variableName)) { @@ -53,9 +53,9 @@ public class DiceASTEvaluator { * The enviroment to evaluate bindings and such against * @return The operations to use when collapsing the AST */ - private static IFunctionalMap<IDiceASTNode, IOperatorCollapser> buildOperations( - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment) { - IFunctionalMap<IDiceASTNode, IOperatorCollapser> operatorCollapsers = new FunctionalMap<>(); + private static IMap<IDiceASTNode, IOperatorCollapser> buildOperations( + IMap<String, ITree<IDiceASTNode>> enviroment) { + IMap<IDiceASTNode, IOperatorCollapser> operatorCollapsers = new FunctionalMap<>(); operatorCollapsers.put(OperatorDiceNode.ADD, new ArithmeticCollapser(OperatorDiceNode.ADD, @@ -95,7 +95,7 @@ public class DiceASTEvaluator { // This is so that arrays respect lazy results properly Supplier<IResult> resultSupplier = () -> { - IFunctionalList<IResult> resultList = new FunctionalList<>(); + IList<IResult> resultList = new FunctionalList<>(); nodes.forEach((node) -> { resultList.add(node.getLeft()); @@ -122,7 +122,7 @@ public class DiceASTEvaluator { } private static void doArrayAssign( - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment, + IMap<String, ITree<IDiceASTNode>> enviroment, IPair<IResult, ITree<IDiceASTNode>> nameNode, ITree<IDiceASTNode> nameTree, ITree<IDiceASTNode> valueTree, IHolder<Integer> childCount, ITree<IDiceASTNode> child) { @@ -151,8 +151,8 @@ public class DiceASTEvaluator { * @return The integer value of the expression */ public static IResult evaluateAST(ITree<IDiceASTNode> expression, - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment) { - IFunctionalMap<IDiceASTNode, IOperatorCollapser> collapsers = buildOperations( + IMap<String, ITree<IDiceASTNode>> enviroment) { + IMap<IDiceASTNode, IOperatorCollapser> collapsers = buildOperations( enviroment); return expression.collapse( @@ -162,7 +162,7 @@ public class DiceASTEvaluator { private static IPair<IResult, ITree<IDiceASTNode>> evaluateLeaf( IDiceASTNode leafNode, - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment) { + IMap<String, ITree<IDiceASTNode>> enviroment) { ITree<IDiceASTNode> returnedAST = new Tree<>(leafNode); switch (leafNode.getType()) { @@ -203,8 +203,8 @@ public class DiceASTEvaluator { } private static IPair<IResult, ITree<IDiceASTNode>> parseBinding( - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment, - IFunctionalList<IPair<IResult, ITree<IDiceASTNode>>> nodes) { + IMap<String, ITree<IDiceASTNode>> enviroment, + IList<IPair<IResult, ITree<IDiceASTNode>>> nodes) { if (nodes.getSize() != 2) { throw new UnsupportedOperationException( "Can only bind nodes with two children. Problem children are " @@ -265,7 +265,7 @@ public class DiceASTEvaluator { } private static IPair<IResult, ITree<IDiceASTNode>> parseGroup( - IFunctionalList<IPair<IResult, ITree<IDiceASTNode>>> nodes) { + IList<IPair<IResult, ITree<IDiceASTNode>>> nodes) { if (nodes.getSize() != 2) { throw new UnsupportedOperationException( "Can only form a group from two dice"); @@ -290,8 +290,8 @@ public class DiceASTEvaluator { } private static IPair<IResult, ITree<IDiceASTNode>> parseLet( - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment, - IFunctionalList<IPair<IResult, ITree<IDiceASTNode>>> nodes) { + IMap<String, ITree<IDiceASTNode>> enviroment, + IList<IPair<IResult, ITree<IDiceASTNode>>> nodes) { if (nodes.getSize() != 2) { throw new UnsupportedOperationException( "Can only use let with two expressions."); @@ -301,13 +301,13 @@ public class DiceASTEvaluator { ITree<IDiceASTNode> expressionTree = nodes.getByIndex(1) .getRight(); - IFunctionalMap<String, ITree<IDiceASTNode>> letEnviroment = enviroment + IMap<String, ITree<IDiceASTNode>> letEnviroment = enviroment .extend(); evaluateAST(bindTree, letEnviroment); IResult exprResult = evaluateAST(expressionTree, letEnviroment); - IFunctionalList<ITree<IDiceASTNode>> childrn = nodes + IList<ITree<IDiceASTNode>> childrn = nodes .map((pair) -> pair.getRight()); return new Pair<>(exprResult, diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTInliner.java b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTInliner.java index 5032dc4..ea5a844 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTInliner.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTInliner.java @@ -1,8 +1,8 @@ package bjc.dicelang.ast; import bjc.utils.funcdata.FunctionalList; -import bjc.utils.funcdata.IFunctionalList; -import bjc.utils.funcdata.IFunctionalMap; +import bjc.utils.funcdata.IList; +import bjc.utils.funcdata.IMap; import bjc.utils.funcdata.ITree; import bjc.utils.funcdata.Tree; @@ -27,16 +27,16 @@ public class DiceASTInliner { * @return The inlined AST */ public static ITree<IDiceASTNode> inlineAll(ITree<IDiceASTNode> ast, - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment) { + IMap<String, ITree<IDiceASTNode>> enviroment) { // Tell the compiler that the null is for the entire varargs // parameter, not a single one with a null value return selectiveInline(ast, enviroment, (String[]) null); } private static ITree<IDiceASTNode> inlineNode(IDiceASTNode node, - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment, + IMap<String, ITree<IDiceASTNode>> enviroment, boolean specificInline, - IFunctionalList<String> variableNames) { + IList<String> variableNames) { if (node.getType() != DiceASTType.VARIABLE) { return new Tree<>(node); } @@ -79,8 +79,8 @@ public class DiceASTInliner { */ public static ITree<IDiceASTNode> selectiveInline( ITree<IDiceASTNode> ast, - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment, - IFunctionalList<String> variables) { + IMap<String, ITree<IDiceASTNode>> enviroment, + IList<String> variables) { return selectiveInline(ast, enviroment, variables.toArray(new String[0])); } @@ -98,10 +98,10 @@ public class DiceASTInliner { */ public static ITree<IDiceASTNode> selectiveInline( ITree<IDiceASTNode> ast, - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment, + IMap<String, ITree<IDiceASTNode>> enviroment, String... variables) { if (variables != null && variables.length > 0) { - IFunctionalList<String> variableNames = new FunctionalList<>( + IList<String> variableNames = new FunctionalList<>( variables); return ast.flatMapTree((node) -> { diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTOptimizer.java b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTOptimizer.java index e96c620..d7fc23c 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTOptimizer.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTOptimizer.java @@ -1,8 +1,8 @@ package bjc.dicelang.ast; import bjc.utils.funcdata.FunctionalList; -import bjc.utils.funcdata.IFunctionalList; -import bjc.utils.funcdata.IFunctionalMap; +import bjc.utils.funcdata.IList; +import bjc.utils.funcdata.IMap; import bjc.utils.funcdata.ITree; import bjc.dicelang.ast.nodes.IDiceASTNode; @@ -15,7 +15,7 @@ import bjc.dicelang.ast.optimization.IOptimizationPass; * */ public class DiceASTOptimizer { - private IFunctionalList<IOptimizationPass> passes; + private IList<IOptimizationPass> passes; /** * Create a new optimizer @@ -44,7 +44,7 @@ public class DiceASTOptimizer { * @return The optimized tree */ public ITree<IDiceASTNode> optimizeTree(ITree<IDiceASTNode> ast, - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment) { + IMap<String, ITree<IDiceASTNode>> enviroment) { ITree<IDiceASTNode> optimizedTree = passes.reduceAux(ast, (currentPass, currentTree) -> { return currentTree.collapse(currentPass::optimizeLeaf, diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java index f14df74..c149c0a 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java @@ -7,8 +7,8 @@ import java.util.function.Predicate; import bjc.utils.funcdata.FunctionalList; import bjc.utils.funcdata.FunctionalMap; -import bjc.utils.funcdata.IFunctionalList; -import bjc.utils.funcdata.IFunctionalMap; +import bjc.utils.funcdata.IList; +import bjc.utils.funcdata.IMap; import bjc.utils.funcdata.ITree; import bjc.utils.funcdata.Tree; import bjc.utils.funcutils.StringUtils; @@ -31,8 +31,8 @@ import bjc.dicelang.ast.nodes.VariableDiceNode; */ public class DiceASTParser { private static IDiceASTNode convertLeafNode(String leafNode) { - DiceLiteralType literalType = ILiteralDiceNode - .getLiteralType(leafNode); + DiceLiteralType literalType = + ILiteralDiceNode.getLiteralType(leafNode); if (literalType != null) { switch (literalType) { @@ -73,7 +73,7 @@ public class DiceASTParser { * @return An AST built from the tokens */ public static ITree<IDiceASTNode> createFromString( - IFunctionalList<String> tokens) { + IList<String> tokens) { Predicate<String> specialPicker = (operator) -> { if (StringUtils.containsOnly(operator, "\\[")) { return true; @@ -84,7 +84,8 @@ public class DiceASTParser { return false; }; - IFunctionalMap<String, Function<Deque<ITree<String>>, ITree<String>>> operators = new FunctionalMap<>(); + IMap<String, Function<Deque<ITree<String>>, ITree<String>>> operators = + new FunctionalMap<>(); operators.put("[", (queuedTrees) -> { Tree<String> openTree = new Tree<>("["); @@ -96,14 +97,14 @@ public class DiceASTParser { return parseCloseArray(queuedTrees); }); - ITree<String> rawTokens = TreeConstructor.constructTree(tokens, - (token) -> { + ITree<String> rawTokens = + TreeConstructor.constructTree(tokens, (token) -> { return isOperatorNode(token); }, specialPicker, operators::get); - ITree<IDiceASTNode> tokenizedTree = rawTokens.rebuildTree( - DiceASTParser::convertLeafNode, - DiceASTParser::convertOperatorNode); + ITree<IDiceASTNode> tokenizedTree = + rawTokens.rebuildTree(DiceASTParser::convertLeafNode, + DiceASTParser::convertOperatorNode); return tokenizedTree; } @@ -131,7 +132,7 @@ public class DiceASTParser { private static ITree<String> parseCloseArray( Deque<ITree<String>> queuedTrees) { - IFunctionalList<ITree<String>> children = new FunctionalList<>(); + IList<ITree<String>> children = new FunctionalList<>(); while (shouldContinuePopping(queuedTrees)) { children.add(queuedTrees.pop()); diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTReferenceSanitizer.java b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTReferenceSanitizer.java index 082c94a..a862602 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTReferenceSanitizer.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTReferenceSanitizer.java @@ -2,7 +2,7 @@ package bjc.dicelang.ast; import bjc.utils.data.IHolder; import bjc.utils.data.Identity; -import bjc.utils.funcdata.IFunctionalMap; +import bjc.utils.funcdata.IMap; import bjc.utils.funcdata.ITree; import bjc.utils.funcdata.TopDownTransformResult; import bjc.utils.funcdata.Tree; @@ -21,7 +21,7 @@ import bjc.dicelang.ast.nodes.VariableDiceNode; */ public class DiceASTReferenceSanitizer { private static ITree<IDiceASTNode> doSanitize(ITree<IDiceASTNode> ast, - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment) { + IMap<String, ITree<IDiceASTNode>> enviroment) { if (ast.getChildrenCount() != 2) { throw new UnsupportedOperationException( "Assignment must have two arguments."); @@ -134,7 +134,7 @@ public class DiceASTReferenceSanitizer { private static ITree<IDiceASTNode> doSingleSanitize( ITree<IDiceASTNode> ast, - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment, + IMap<String, ITree<IDiceASTNode>> enviroment, ITree<IDiceASTNode> nameTree, ITree<IDiceASTNode> valueTree, String variableName) { if (enviroment.containsKey(variableName)) { @@ -169,7 +169,7 @@ public class DiceASTReferenceSanitizer { * @return The sanitized AST */ public static ITree<IDiceASTNode> sanitize(ITree<IDiceASTNode> ast, - IFunctionalMap<String, ITree<IDiceASTNode>> enviroment) { + IMap<String, ITree<IDiceASTNode>> enviroment) { return ast.topDownTransform( DiceASTReferenceSanitizer::shouldSanitize, (subTree) -> { return doSanitize(subTree, enviroment); diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/IOperatorCollapser.java b/dice-lang/src/main/java/bjc/dicelang/ast/IOperatorCollapser.java index a3050a1..0efaca9 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/IOperatorCollapser.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/IOperatorCollapser.java @@ -3,7 +3,7 @@ package bjc.dicelang.ast; import java.util.function.Function; import bjc.utils.data.IPair; -import bjc.utils.funcdata.IFunctionalList; +import bjc.utils.funcdata.IList; import bjc.utils.funcdata.ITree; import bjc.dicelang.ast.nodes.IDiceASTNode; @@ -15,6 +15,6 @@ import bjc.dicelang.ast.nodes.IDiceASTNode; * */ public interface IOperatorCollapser extends - Function<IFunctionalList<IPair<IResult, ITree<IDiceASTNode>>>, IPair<IResult, ITree<IDiceASTNode>>> { + Function<IList<IPair<IResult, ITree<IDiceASTNode>>>, IPair<IResult, ITree<IDiceASTNode>>> { // Just an alias } diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ArithmeticCollapser.java b/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ArithmeticCollapser.java index 2b2a9ad..70e518e 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ArithmeticCollapser.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ArithmeticCollapser.java @@ -2,7 +2,7 @@ package bjc.dicelang.ast.optimization; import java.util.function.BinaryOperator; -import bjc.utils.funcdata.IFunctionalList; +import bjc.utils.funcdata.IList; import bjc.utils.funcdata.ITree; import bjc.utils.funcdata.Tree; @@ -24,7 +24,7 @@ class ArithmeticCollapser { } public ITree<IDiceASTNode> collapse( - IFunctionalList<ITree<IDiceASTNode>> children) { + IList<ITree<IDiceASTNode>> children) { boolean allConstant = children.allMatch((subtree) -> { return subtree.transformHead((node) -> { if (node.getType() == DiceASTType.LITERAL) { diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java b/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java index 63c9037..3b43ff6 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java @@ -1,6 +1,6 @@ package bjc.dicelang.ast.optimization; -import bjc.utils.funcdata.IFunctionalList; +import bjc.utils.funcdata.IList; import bjc.utils.funcdata.ITree; import bjc.utils.funcdata.Tree; @@ -42,7 +42,7 @@ public class ConstantCollapser implements IOptimizationPass { @Override public ITree<IDiceASTNode> optimizeOperator(IDiceASTNode operator, - IFunctionalList<ITree<IDiceASTNode>> children) { + IList<ITree<IDiceASTNode>> children) { if (!operator.isOperator()) { return new Tree<>(operator, children); } diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/optimization/IOptimizationPass.java b/dice-lang/src/main/java/bjc/dicelang/ast/optimization/IOptimizationPass.java index 7dbea18..36b03f1 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/optimization/IOptimizationPass.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/optimization/IOptimizationPass.java @@ -1,6 +1,6 @@ package bjc.dicelang.ast.optimization; -import bjc.utils.funcdata.IFunctionalList; +import bjc.utils.funcdata.IList; import bjc.utils.funcdata.ITree; import bjc.dicelang.ast.nodes.IDiceASTNode; @@ -31,5 +31,5 @@ public interface IOptimizationPass { * @return The optimized node */ public ITree<IDiceASTNode> optimizeOperator(IDiceASTNode operator, - IFunctionalList<ITree<IDiceASTNode>> children); + IList<ITree<IDiceASTNode>> children); } |