Adapt to upstream changes

3 files changed, 16 insertions, 16 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(""));