From 8212af7c70d1603013da32e0501969ed98431caf Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Wed, 11 May 2016 21:10:53 -0400
Subject: Adapt to upstream changes

---
 .../main/java/bjc/dicelang/ast/optimization/ArithmeticCollapser.java  | 4 ++--
 .../main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java    | 4 ++--
 .../main/java/bjc/dicelang/ast/optimization/IOptimizationPass.java    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'dice-lang/src/main/java/bjc/dicelang/ast/optimization')

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);
 }
-- 
cgit v1.2.3