diff options
| author | bculkin2442 <bjculkin@mix.wvu.edu> | 2016-05-11 21:10:53 -0400 |
|---|---|---|
| committer | bculkin2442 <bjculkin@mix.wvu.edu> | 2016-05-11 21:10:53 -0400 |
| commit | 8212af7c70d1603013da32e0501969ed98431caf (patch) | |
| tree | 98c327fea8ed5d0f68c72fcb56c01112a5252d4b /dice-lang/src/main/java/bjc/dicelang/ast/DiceASTOptimizer.java | |
| parent | 0fa4f162f4e42a455dbb7e7459854b9467337863 (diff) | |
Adapt to upstream changes
Diffstat (limited to 'dice-lang/src/main/java/bjc/dicelang/ast/DiceASTOptimizer.java')
| -rw-r--r-- | dice-lang/src/main/java/bjc/dicelang/ast/DiceASTOptimizer.java | 8 |
1 files changed, 4 insertions, 4 deletions
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, |