From 780a3da69b66921fb7bf7b5779fb44830bb45ddc Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Tue, 7 Apr 2020 21:21:12 -0400 Subject: Remove utils.esodata utils.esodata now also lives in the esodata project; not here --- .../bjc/utils/parserutils/delims/SequenceDelimiter.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'base/src/main/java/bjc/utils/parserutils') 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 1dfefef..7424770 100644 --- a/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java +++ b/base/src/main/java/bjc/utils/parserutils/delims/SequenceDelimiter.java @@ -12,10 +12,10 @@ import com.google.common.collect.Multiset; 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; -import bjc.utils.funcdata.IMap; +import bjc.esodata.PushdownMap; +import bjc.esodata.SimpleStack; +import bjc.esodata.Stack; +import bjc.funcdata.IMap; import bjc.utils.funcutils.StringUtils; /** @@ -187,7 +187,7 @@ public class SequenceDelimiter { whoForbid.put(exclusion, possibleOpen); } - } else if(!groupStack.empty() && groupStack.top().isClosing(tok)) { + } else if(!groupStack.isEmpty() && groupStack.top().isClosing(tok)) { /* * Close the group. */ @@ -216,7 +216,7 @@ public class SequenceDelimiter { allowedDelimiters.drop(); forbiddenDelimiters.drop(); } - } else if(!groupStack.empty() && groupStack.top().marksSubgroup(tok)) { + } else if(!groupStack.isEmpty() && groupStack.top().marksSubgroup(tok)) { /* * Mark a subgroup. */ @@ -254,7 +254,7 @@ public class SequenceDelimiter { /* * Check if a delimiter is locally forbidden. */ - if(groupStack.empty()) { + if(groupStack.isEmpty()) { localForbid = false; } else { localForbid = groupStack.top().excludes(groupName); -- cgit v1.2.3