General update

4 files changed, 14 insertions, 14 deletions

diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/ShuntTester.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/ShuntTester.java
index 9744653..5148be4 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/ShuntTester.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/ShuntTester.java
@@ -3,7 +3,7 @@ package bjc.utils.examples.parsing;
 import java.util.Scanner;
 
 import bjc.utils.funcdata.FunctionalStringTokenizer;
-import bjc.utils.funcdata.IFunctionalList;
+import bjc.utils.funcdata.IList;
 import bjc.utils.parserutils.ShuntingYard;
 
 /**
@@ -27,7 +27,7 @@ public class ShuntTester {
 
 		ShuntingYard<String> yard = new ShuntingYard<>(true);
 
-		IFunctionalList<String> shuntedTokens = yard
+		IList<String> shuntedTokens = yard
 				.postfix(new FunctionalStringTokenizer(line)
 						.toList((strang) -> strang), (strang) -> strang);
 
diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/TreeConstructTest.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/TreeConstructTest.java
index faeb3a6..e737b4d 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/TreeConstructTest.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/parsing/TreeConstructTest.java
@@ -10,8 +10,8 @@ import bjc.utils.data.IPair;
 import bjc.utils.data.Pair;
 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.utils.funcdata.Tree;
 import bjc.utils.funcutils.ListUtils;
@@ -61,7 +61,7 @@ public class TreeConstructTest {
 		System.out.print("Enter a expression to parse: ");
 		String line = inputSource.nextLine();
 
-		IFunctionalList<String> tokens = new FunctionalStringTokenizer(
+		IList<String> tokens = new FunctionalStringTokenizer(
 				line).toList();
 
 		ShuntingYard<String> yard = new ShuntingYard<>(true);
@@ -75,7 +75,7 @@ public class TreeConstructTest {
 		ops.add(new Pair<>(":=", ":="));
 		ops.add(new Pair<>("=>", "=>"));
 
-		IFunctionalList<String> semiExpandedTokens = ListUtils
+		IList<String> semiExpandedTokens = ListUtils
 				.splitTokens(tokens, ops);
 
 		ops = new LinkedList<>();
@@ -85,12 +85,12 @@ public class TreeConstructTest {
 		ops.add(new Pair<>("[", "\\["));
 		ops.add(new Pair<>("]", "\\]"));
 
-		IFunctionalList<String> fullyExpandedTokens = ListUtils
+		IList<String> fullyExpandedTokens = ListUtils
 				.deAffixTokens(semiExpandedTokens, ops);
 
 		fullyExpandedTokens.removeIf((strang) -> strang.equals(""));
 
-		IFunctionalList<String> shuntedTokens = yard
+		IList<String> shuntedTokens = yard
 				.postfix(fullyExpandedTokens, (token) -> token);
 
 		System.out.println("Shunted: " + shuntedTokens.toString());
@@ -105,7 +105,7 @@ public class TreeConstructTest {
 			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) -> {
 			return null;
diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java
index 09530ba..4686643 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java
@@ -1,7 +1,7 @@
 package bjc.utils.examples.rangen;
 
 import bjc.utils.funcdata.FunctionalStringTokenizer;
-import bjc.utils.funcdata.IFunctionalList;
+import bjc.utils.funcdata.IList;
 import bjc.utils.gen.WeightedGrammar;
 
 /**
@@ -83,7 +83,7 @@ public class DiabloItemGen {
 		addInfixRules();
 
 		for (int i = 0; i < 100; i++) {
-			IFunctionalList<String> ls = rules.generateListValues("<item>",
+			IList<String> ls = rules.generateListValues("<item>",
 					" ");
 
 			StringBuilder sb = new StringBuilder();
diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java
index 4eaeadb..fc1724e 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java
@@ -2,7 +2,7 @@ package bjc.utils.examples.rangen;
 
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.FunctionalStringTokenizer;
-import bjc.utils.funcdata.IFunctionalList;
+import bjc.utils.funcdata.IList;
 import bjc.utils.gen.RandomGrammar;
 
 /**
@@ -15,7 +15,7 @@ public class RandomStringExamples {
 	private static RandomGrammar<String> rg;
 
 	private static void addRule(String rule, String... cases) {
-		IFunctionalList<IFunctionalList<String>> cses = new FunctionalList<>();
+		IList<IList<String>> cses = new FunctionalList<>();
 
 		for (String strang : cases) {
 			cses.add(FunctionalStringTokenizer.fromString(strang)
@@ -56,7 +56,7 @@ public class RandomStringExamples {
 				"<object>");
 
 		for (int i = 0; i < 10; i++) {
-			IFunctionalList<String> ls = rg
+			IList<String> ls = rg
 					.generateListValues("<sentance>", " ");
 
 			StringBuilder sb = new StringBuilder();