Adapt to esodata changes

8 files changed, 18 insertions, 18 deletions

diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/ChainTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/ChainTokenSplitter.java
index 0844b5b..c60b6f2 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/ChainTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/ChainTokenSplitter.java
@@ -1,7 +1,7 @@
 package bjc.utils.parserutils.splitter;
 
 import bjc.funcdata.FunctionalList;
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 
 /**
  * A token splitter that chains several other splitters together.
@@ -10,7 +10,7 @@ import bjc.funcdata.IList;
  *
  */
 public class ChainTokenSplitter implements TokenSplitter {
-	private final IList<TokenSplitter> spliters;
+	private final ListEx<TokenSplitter> spliters;
 
 	/**
 	 * Create a new chain token splitter.
@@ -40,8 +40,8 @@ public class ChainTokenSplitter implements TokenSplitter {
 	}
 
 	@Override
-	public IList<String> split(final String input) {
-		final IList<String> initList = new FunctionalList<>(input);
+	public ListEx<String> split(final String input) {
+		final ListEx<String> initList = new FunctionalList<>(input);
 
 		return spliters.reduceAux(initList, (splitter, strangs) -> strangs.flatMap(splitter::split));
 	}
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java
index 16c1dc3..26d9dbe 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/ConfigurableTokenSplitter.java
@@ -6,7 +6,7 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 
 /**
  * Split a string into pieces around a regular expression, and offer an easy way
@@ -111,7 +111,7 @@ public class ConfigurableTokenSplitter extends SimpleTokenSplitter {
 	}
 
 	@Override
-	public IList<String> split(final String input) {
+	public ListEx<String> split(final String input) {
 		if (spliter == null)
 			throw new IllegalStateException("Must compile splitter before use");
 
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java
index 9a0cd65..52ce4bf 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java
@@ -5,7 +5,7 @@ import java.util.Set;
 import java.util.function.Predicate;
 
 import bjc.funcdata.FunctionalList;
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 
 /**
  * A token splitter that will not split certain tokens.
@@ -15,7 +15,7 @@ import bjc.funcdata.IList;
  */
 public class ExcludingTokenSplitter implements TokenSplitter {
 	private final Set<String> literalExclusions;
-	private final IList<Predicate<String>> predExclusions;
+	private final ListEx<Predicate<String>> predExclusions;
 
 	private final TokenSplitter spliter;
 
@@ -59,7 +59,7 @@ public class ExcludingTokenSplitter implements TokenSplitter {
 	}
 
 	@Override
-	public IList<String> split(final String input) {
+	public ListEx<String> split(final String input) {
 		if (literalExclusions.contains(input))
 			return new FunctionalList<>(input);
 		else if (predExclusions.anyMatch(pred -> pred.test(input)))
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/FilteredTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/FilteredTokenSplitter.java
index 85d72e2..70abbbc 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/FilteredTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/FilteredTokenSplitter.java
@@ -2,7 +2,7 @@ package bjc.utils.parserutils.splitter;
 
 import java.util.function.Predicate;
 
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 
 /**
  * A token splitter that removes tokens that match a predicate from the stream
@@ -31,7 +31,7 @@ public class FilteredTokenSplitter implements TokenSplitter {
 	}
 
 	@Override
-	public IList<String> split(String input) {
+	public ListEx<String> split(String input) {
 		return source.split(input).getMatching(filter);
 	}
 }
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/IdentityTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/IdentityTokenSplitter.java
index 6be0e7f..b3b1b29 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/IdentityTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/IdentityTokenSplitter.java
@@ -10,7 +10,7 @@ import bjc.funcdata.*;
  */
 public class IdentityTokenSplitter implements TokenSplitter {
 	@Override
-	public IList<String> split(String input) {
+	public ListEx<String> split(String input) {
 		return new FunctionalList<>(input);
 	}
 }
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java
index 6d88b20..df9ce70 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java
@@ -2,7 +2,7 @@ package bjc.utils.parserutils.splitter;
 
 import java.util.regex.Pattern;
 
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 import bjc.functypes.ID;
 import bjc.utils.ioutils.RegexStringEditor;
 
@@ -39,7 +39,7 @@ public class SimpleTokenSplitter implements TokenSplitter {
 	}
 
 	@Override
-	public IList<String> split(final String input) {
+	public ListEx<String> split(final String input) {
 		if (keepDelim) {
 			return RegexStringEditor.mapOccurances(input, spliter, ID.id(), ID.id());
 		}
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/TokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/TokenSplitter.java
index 59e73e8..e833c21 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/TokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/TokenSplitter.java
@@ -1,6 +1,6 @@
 package bjc.utils.parserutils.splitter;
 
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 
 /**
  * Split a string into a list of pieces.
@@ -17,5 +17,5 @@ public interface TokenSplitter {
 	 *
 	 * @return The pieces of the string.
 	 */
-	public IList<String> split(String input);
+	public ListEx<String> split(String input);
 }
diff --git a/base/src/main/java/bjc/utils/parserutils/splitter/TransformTokenSplitter.java b/base/src/main/java/bjc/utils/parserutils/splitter/TransformTokenSplitter.java
index b9fbedc..63c3206 100644
--- a/base/src/main/java/bjc/utils/parserutils/splitter/TransformTokenSplitter.java
+++ b/base/src/main/java/bjc/utils/parserutils/splitter/TransformTokenSplitter.java
@@ -2,7 +2,7 @@ package bjc.utils.parserutils.splitter;
 
 import java.util.function.UnaryOperator;
 
-import bjc.funcdata.IList;
+import bjc.funcdata.ListEx;
 
 /**
  * A token splitter that performs a transform on the tokens from another
@@ -31,7 +31,7 @@ public class TransformTokenSplitter implements TokenSplitter {
 	}
 
 	@Override
-	public IList<String> split(String input) {
+	public ListEx<String> split(String input) {
 		return source.split(input).map(transform);
 	}