summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjculkin <bjculkin@mix.wvu.edu>2017-03-17 08:34:57 -0400
committerbjculkin <bjculkin@mix.wvu.edu>2017-03-17 08:34:57 -0400
commit9d89261fedf23c11b684eb66cefdd86a9378ad20 (patch)
tree5158fdaedcd2951fbd41d49b72f7e09200fa3192
parenta63c30f5fe9ee302e73bb30e35095d789adb1a80 (diff)
Move parsing utilities.
Moved the parsing utilities SequenceDelimiter and TokenSplitter to the parserutils package, instead of the funcutils package.
-rw-r--r--BJC-Utils2/src/examples/java/bjc/utils/examples/DelimSplitterTest.java8
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/parserutils/SequenceDelimiter.java (renamed from BJC-Utils2/src/main/java/bjc/utils/funcutils/SequenceDelimiter.java)3
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/parserutils/StringDelimiter.java (renamed from BJC-Utils2/src/main/java/bjc/utils/funcutils/StringDelimiter.java)2
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenSplitter.java (renamed from BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java)2
4 files changed, 8 insertions, 7 deletions
diff --git a/BJC-Utils2/src/examples/java/bjc/utils/examples/DelimSplitterTest.java b/BJC-Utils2/src/examples/java/bjc/utils/examples/DelimSplitterTest.java
index feb0631..521c521 100644
--- a/BJC-Utils2/src/examples/java/bjc/utils/examples/DelimSplitterTest.java
+++ b/BJC-Utils2/src/examples/java/bjc/utils/examples/DelimSplitterTest.java
@@ -1,10 +1,10 @@
package bjc.utils.examples;
import bjc.utils.data.ITree;
-import bjc.utils.funcutils.SequenceDelimiter;
-import bjc.utils.funcutils.SequenceDelimiter.DelimiterException;
-import bjc.utils.funcutils.StringDelimiter;
-import bjc.utils.funcutils.TokenSplitter;
+import bjc.utils.parserutils.SequenceDelimiter;
+import bjc.utils.parserutils.StringDelimiter;
+import bjc.utils.parserutils.TokenSplitter;
+import bjc.utils.parserutils.SequenceDelimiter.DelimiterException;
import java.util.Arrays;
import java.util.Scanner;
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/SequenceDelimiter.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/SequenceDelimiter.java
index 625c9ec..1180017 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/SequenceDelimiter.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/SequenceDelimiter.java
@@ -1,4 +1,4 @@
-package bjc.utils.funcutils;
+package bjc.utils.parserutils;
import bjc.utils.data.ITree;
import bjc.utils.data.Tree;
@@ -6,6 +6,7 @@ import bjc.utils.esodata.PushdownMap;
import bjc.utils.esodata.SimpleStack;
import bjc.utils.esodata.Stack;
import bjc.utils.funcdata.IMap;
+import bjc.utils.funcutils.StringUtils;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringDelimiter.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/StringDelimiter.java
index e4303c7..4c5b972 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/StringDelimiter.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/StringDelimiter.java
@@ -1,4 +1,4 @@
-package bjc.utils.funcutils;
+package bjc.utils.parserutils;
import bjc.utils.data.ITree;
diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenSplitter.java
index 206fbcd..e6191b9 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenSplitter.java
@@ -1,4 +1,4 @@
-package bjc.utils.funcutils;
+package bjc.utils.parserutils;
import java.util.regex.Pattern;