Merge branch 'master' of https://github.com/bculkin2442/bjc-utils2

3 files changed, 10 insertions, 10 deletions

diff --git a/base/src/examples/java/bjc/utils/examples/ShuntTest.java b/base/src/examples/java/bjc/utils/examples/ShuntTest.java
index b62a5a6..c5defe4 100644
--- a/base/src/examples/java/bjc/utils/examples/ShuntTest.java
+++ b/base/src/examples/java/bjc/utils/examples/ShuntTest.java
@@ -3,7 +3,7 @@ package bjc.utils.examples;
 import java.util.Scanner;
 
 import bjc.funcdata.FunctionalStringTokenizer;
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 import bjc.utils.parserutils.ShuntingYard;
 
 /**
@@ -27,9 +27,9 @@ public class ShuntTest {
 
 		final ShuntingYard<String> yard = new ShuntingYard<>(true);
 
-		final IList<String> preTokens
+		final ListEx<String> preTokens
 				= new FunctionalStringTokenizer(line).toList(strang -> strang);
-		final IList<String> shuntedTokens = yard.postfix(preTokens, strang -> strang);
+		final ListEx<String> shuntedTokens = yard.postfix(preTokens, strang -> strang);
 
 		System.out.println(shuntedTokens.toString());
 
diff --git a/base/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java b/base/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java
index 935a189..784ff03 100644
--- a/base/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java
+++ b/base/src/examples/java/bjc/utils/examples/rangen/DiabloItemGen.java
@@ -1,7 +1,7 @@
 package bjc.utils.examples.rangen;
 
 import bjc.funcdata.FunctionalStringTokenizer;
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 import bjc.utils.gen.WeightedGrammar;
 
 /**
@@ -15,7 +15,7 @@ public class DiabloItemGen {
 
 	private static void addCase(final String ruleName, final int probability,
 			final String ruleParts) {
-		final IList<String> parts = FunctionalStringTokenizer.fromString(ruleParts)
+		final ListEx<String> parts = FunctionalStringTokenizer.fromString(ruleParts)
 				.toList(strang -> strang);
 
 		rules.addCase(ruleName, probability, parts);
@@ -85,7 +85,7 @@ public class DiabloItemGen {
 		addInfixRules();
 
 		for (int i = 0; i < 100; i++) {
-			final IList<String> ls = rules.generateListValues("<item>", " ");
+			final ListEx<String> ls = rules.generateListValues("<item>", " ");
 
 			final StringBuilder sb = new StringBuilder();
 			ls.forEach(sb::append);
diff --git a/base/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java b/base/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java
index bdc4f53..8458de7 100644
--- a/base/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java
+++ b/base/src/examples/java/bjc/utils/examples/rangen/RandomStringExamples.java
@@ -2,7 +2,7 @@ package bjc.utils.examples.rangen;
 
 import bjc.funcdata.FunctionalList;
 import bjc.funcdata.FunctionalStringTokenizer;
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 import bjc.utils.gen.RandomGrammar;
 
 /**
@@ -15,10 +15,10 @@ public class RandomStringExamples {
 	private static RandomGrammar<String> rg;
 
 	private static void addRule(final String rule, final String... cases) {
-		final IList<IList<String>> cses = new FunctionalList<>();
+		final ListEx<ListEx<String>> cses = new FunctionalList<>();
 
 		for (final String strang : cases) {
-			final IList<String> lst
+			final ListEx<String> lst
 					= FunctionalStringTokenizer.fromString(strang).toList(s -> s);
 
 			cses.add(lst);
@@ -56,7 +56,7 @@ public class RandomStringExamples {
 		addRule("<something>", "<activity>", "<activity> with <person>", "<object>");
 
 		for (int i = 0; i < 10; i++) {
-			final IList<String> ls = rg.generateListValues("<sentance>", " ");
+			final ListEx<String> ls = rg.generateListValues("<sentance>", " ");
 
 			final StringBuilder sb = new StringBuilder();
 			ls.forEach(sb::append);