From 002516bd03b2ea3f731c8139c9a5f716902ab702 Mon Sep 17 00:00:00 2001
From: Ben Culkin <scorpress@gmail.com>
Date: Tue, 7 Apr 2020 21:03:53 -0400
Subject: Finish remove utils.data

utils.data now lives in the esodata project; not in this one
---
 .../main/java/bjc/utils/parserutils/delims/DelimiterGroup.java    | 8 ++++----
 base/src/main/java/bjc/utils/parserutils/delims/RegexOpener.java  | 4 ++--
 .../main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java | 6 +++---
 .../main/java/bjc/utils/parserutils/delims/StringDelimiter.java   | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'base/src/main/java/bjc/utils/parserutils/delims')

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 e89ba08..72184b6 100644
--- a/base/src/main/java/bjc/utils/parserutils/delims/DelimiterGroup.java
+++ b/base/src/main/java/bjc/utils/parserutils/delims/DelimiterGroup.java
@@ -11,10 +11,10 @@ import java.util.Set;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 
-import bjc.utils.data.IPair;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Pair;
-import bjc.utils.data.Tree;
+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;
 
diff --git a/base/src/main/java/bjc/utils/parserutils/delims/RegexOpener.java b/base/src/main/java/bjc/utils/parserutils/delims/RegexOpener.java
index a84b148..64dc81c 100644
--- a/base/src/main/java/bjc/utils/parserutils/delims/RegexOpener.java
+++ b/base/src/main/java/bjc/utils/parserutils/delims/RegexOpener.java
@@ -4,8 +4,8 @@ import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import bjc.utils.data.IPair;
-import bjc.utils.data.Pair;
+import bjc.data.IPair;
+import bjc.data.Pair;
 
 /**
  * A predicated opener for use with {@link RegexCloser}
diff --git a/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java b/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java
index ff4b348..1dfefef 100644
--- a/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java
+++ b/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java
@@ -9,9 +9,9 @@ import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multiset;
 
-import bjc.utils.data.IPair;
-import bjc.utils.data.ITree;
-import bjc.utils.data.Tree;
+import bjc.data.IPair;
+import bjc.data.ITree;
+import bjc.data.Tree;
 import bjc.utils.esodata.PushdownMap;
 import bjc.utils.esodata.SimpleStack;
 import bjc.utils.esodata.Stack;
diff --git a/base/src/main/java/bjc/utils/parserutils/delims/StringDelimiter.java b/base/src/main/java/bjc/utils/parserutils/delims/StringDelimiter.java
index 10c680c..1f8f166 100644
--- a/base/src/main/java/bjc/utils/parserutils/delims/StringDelimiter.java
+++ b/base/src/main/java/bjc/utils/parserutils/delims/StringDelimiter.java
@@ -1,6 +1,6 @@
 package bjc.utils.parserutils.delims;
 
-import bjc.utils.data.ITree;
+import bjc.data.ITree;
 
 /**
  * A sequence delimiter specialized for strings.
-- 
cgit v1.2.3