From 8212af7c70d1603013da32e0501969ed98431caf Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Wed, 11 May 2016 21:10:53 -0400 Subject: Adapt to upstream changes --- dice-lang/src/main/java/bjc/dicelang/ast/DiceASTOptimizer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dice-lang/src/main/java/bjc/dicelang/ast/DiceASTOptimizer.java') 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 passes; + private IList passes; /** * Create a new optimizer @@ -44,7 +44,7 @@ public class DiceASTOptimizer { * @return The optimized tree */ public ITree optimizeTree(ITree ast, - IFunctionalMap> enviroment) { + IMap> enviroment) { ITree optimizedTree = passes.reduceAux(ast, (currentPass, currentTree) -> { return currentTree.collapse(currentPass::optimizeLeaf, -- cgit v1.2.3