diff options
Diffstat (limited to 'base/src/main/java/bjc/utils/parserutils')
11 files changed, 19 insertions, 19 deletions
diff --git a/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java b/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java index 12bc148..bf332f5 100644 --- a/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java +++ b/base/src/main/java/bjc/utils/parserutils/ShuntingYard.java @@ -4,10 +4,10 @@ import java.util.Deque; import java.util.LinkedList; import java.util.function.Function; -import bjc.utils.funcdata.FunctionalList; -import bjc.utils.funcdata.FunctionalMap; -import bjc.utils.funcdata.IList; -import bjc.utils.funcdata.IMap; +import bjc.funcdata.FunctionalList; +import bjc.funcdata.FunctionalMap; +import bjc.funcdata.IList; +import bjc.funcdata.IMap; import bjc.utils.funcutils.StringUtils; /** diff --git a/base/src/main/java/bjc/utils/parserutils/TokenUtils.java b/base/src/main/java/bjc/utils/parserutils/TokenUtils.java index bcce97e..fbffd82 100644 --- a/base/src/main/java/bjc/utils/parserutils/TokenUtils.java +++ b/base/src/main/java/bjc/utils/parserutils/TokenUtils.java @@ -9,8 +9,8 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import bjc.utils.funcdata.FunctionalList; -import bjc.utils.funcdata.IList; +import bjc.funcdata.FunctionalList; +import bjc.funcdata.IList; import bjc.utils.parserutils.splitter.TokenSplitter; /** diff --git a/base/src/main/java/bjc/utils/parserutils/TreeConstructor.java b/base/src/main/java/bjc/utils/parserutils/TreeConstructor.java index 2b3a831..1ebc2d5 100644 --- a/base/src/main/java/bjc/utils/parserutils/TreeConstructor.java +++ b/base/src/main/java/bjc/utils/parserutils/TreeConstructor.java @@ -10,7 +10,7 @@ import bjc.data.IPair; import bjc.data.ITree; import bjc.data.Identity; import bjc.data.Pair; -import bjc.utils.funcdata.IList; +import bjc.funcdata.IList; /** * Creates a parse tree from a postfix expression. diff --git a/base/src/main/java/bjc/utils/parserutils/delims/DelimiterGroup.java b/base/src/main/java/bjc/utils/parserutils/delims/DelimiterGroup.java index 72184b6..96830b2 100644 --- a/base/src/main/java/bjc/utils/parserutils/delims/DelimiterGroup.java +++ b/base/src/main/java/bjc/utils/parserutils/delims/DelimiterGroup.java @@ -15,8 +15,8 @@ import bjc.data.IPair; import bjc.data.ITree; import bjc.data.Pair; import bjc.data.Tree; -import bjc.utils.funcdata.FunctionalList; -import bjc.utils.funcdata.IList; +import bjc.funcdata.FunctionalList; +import bjc.funcdata.IList; /** * Represents a possible delimiter group to match. 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 db851f0..a5a044a 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.utils.funcdata.FunctionalList; -import bjc.utils.funcdata.IList; +import bjc.funcdata.FunctionalList; +import bjc.funcdata.IList; /** * A token splitter that chains several other splitters together. 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 1ca0fc1..603c214 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.utils.funcdata.IList; +import bjc.funcdata.IList; /** * Split a string into pieces around a regular expression, and offer an easy way 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 3e58629..8bdb176 100644 --- a/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java +++ b/base/src/main/java/bjc/utils/parserutils/splitter/ExcludingTokenSplitter.java @@ -4,8 +4,8 @@ import java.util.HashSet; import java.util.Set; import java.util.function.Predicate; -import bjc.utils.funcdata.FunctionalList; -import bjc.utils.funcdata.IList; +import bjc.funcdata.FunctionalList; +import bjc.funcdata.IList; /** * A token splitter that will not split certain tokens. 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 87d950b..3bcbea2 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.utils.funcdata.IList; +import bjc.funcdata.IList; /** * A token splitter that removes tokens that match a predicate from the stream 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 9eb2d48..8f4fb6c 100644 --- a/base/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java +++ b/base/src/main/java/bjc/utils/parserutils/splitter/SimpleTokenSplitter.java @@ -2,8 +2,8 @@ package bjc.utils.parserutils.splitter; import java.util.regex.Pattern; -import bjc.utils.funcdata.IList; -import bjc.utils.functypes.ID; +import bjc.funcdata.IList; +import bjc.functypes.ID; import bjc.utils.ioutils.RegexStringEditor; /** 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 b042b8c..f2d9c73 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.utils.funcdata.IList; +import bjc.funcdata.IList; /** * Split a string into a list of pieces. 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 1aa894d..3cbe103 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.utils.funcdata.IList; +import bjc.funcdata.IList; /** * A token splitter that performs a transform on the tokens from another |