From 27d1f0001ae912c0a0338820c3caa7cc01b4397b Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Sun, 12 Apr 2020 14:16:31 -0400 Subject: Adjust to BJC-Utils changes Several packages were moved from BJC-Utils to esodata. This adjusts to those changes --- .../examples/java/bjc/pratt/examples/lang/AssignCommand.java | 4 ++-- .../src/examples/java/bjc/pratt/examples/lang/BlockEnter.java | 6 +++--- .../examples/java/bjc/pratt/examples/lang/PrattParserTest.java | 8 ++++---- .../examples/java/bjc/pratt/examples/lang/SwitchCommand.java | 4 ++-- .../src/examples/java/bjc/pratt/examples/lang/TestContext.java | 10 +++++----- .../src/examples/java/bjc/pratt/examples/lang/VarCommand.java | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'JPratt/src/examples') diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/AssignCommand.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/AssignCommand.java index 1800043..f816307 100644 --- a/JPratt/src/examples/java/bjc/pratt/examples/lang/AssignCommand.java +++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/AssignCommand.java @@ -4,8 +4,8 @@ import bjc.pratt.ParserContext; import bjc.pratt.commands.impls.NonBinaryCommand; import bjc.pratt.tokens.StringToken; import bjc.pratt.tokens.Token; -import bjc.utils.data.ITree; -import bjc.utils.data.Tree; +import bjc.data.ITree; +import bjc.data.Tree; import bjc.utils.parserutils.ParserException; class AssignCommand extends NonBinaryCommand { diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/BlockEnter.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/BlockEnter.java index dedf010..143678c 100644 --- a/JPratt/src/examples/java/bjc/pratt/examples/lang/BlockEnter.java +++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/BlockEnter.java @@ -3,9 +3,9 @@ package bjc.pratt.examples.lang; import java.util.function.UnaryOperator; import bjc.pratt.tokens.Token; -import bjc.utils.data.ITree; -import bjc.utils.esodata.Directory; -import bjc.utils.esodata.Stack; +import bjc.data.ITree; +import bjc.esodata.Directory; +import bjc.esodata.Stack; final class BlockEnter implements UnaryOperator { @Override diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java index e3a3475..8bebb1a 100644 --- a/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java +++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java @@ -13,7 +13,7 @@ import static bjc.pratt.commands.impls.NonInitialCommands.postCircumfix; import static bjc.pratt.commands.impls.NonInitialCommands.postfix; import static bjc.pratt.commands.impls.NonInitialCommands.ternary; import static bjc.pratt.tokens.StringToken.litToken; -import static bjc.utils.functypes.ID.id; +import static bjc.functypes.ID.id; import java.util.Arrays; import java.util.HashSet; @@ -31,9 +31,9 @@ import bjc.pratt.commands.NonInitialCommand; import bjc.pratt.tokens.StringToken; import bjc.pratt.tokens.StringTokenStream; import bjc.pratt.tokens.Token; -import bjc.utils.data.ITree; -import bjc.utils.data.TransformIterator; -import bjc.utils.funcdata.IList; +import bjc.data.ITree; +import bjc.data.TransformIterator; +import bjc.funcdata.IList; import bjc.utils.parserutils.ParserException; import bjc.utils.parserutils.splitter.ConfigurableTokenSplitter; import bjc.utils.parserutils.splitter.ExcludingTokenSplitter; diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/SwitchCommand.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/SwitchCommand.java index e824375..4ee778d 100644 --- a/JPratt/src/examples/java/bjc/pratt/examples/lang/SwitchCommand.java +++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/SwitchCommand.java @@ -4,8 +4,8 @@ import bjc.pratt.ParserContext; import bjc.pratt.commands.InitialCommand; import bjc.pratt.tokens.StringToken; import bjc.pratt.tokens.Token; -import bjc.utils.data.ITree; -import bjc.utils.data.Tree; +import bjc.data.ITree; +import bjc.data.Tree; import bjc.utils.parserutils.ParserException; class SwitchCommand implements InitialCommand { diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/TestContext.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/TestContext.java index 340c83d..7db91e7 100644 --- a/JPratt/src/examples/java/bjc/pratt/examples/lang/TestContext.java +++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/TestContext.java @@ -1,11 +1,11 @@ package bjc.pratt.examples.lang; import bjc.pratt.tokens.Token; -import bjc.utils.data.ITree; -import bjc.utils.esodata.Directory; -import bjc.utils.esodata.SimpleDirectory; -import bjc.utils.esodata.SimpleStack; -import bjc.utils.esodata.Stack; +import bjc.data.ITree; +import bjc.esodata.Directory; +import bjc.esodata.SimpleDirectory; +import bjc.esodata.SimpleStack; +import bjc.esodata.Stack; /** * Simple context for the parser. diff --git a/JPratt/src/examples/java/bjc/pratt/examples/lang/VarCommand.java b/JPratt/src/examples/java/bjc/pratt/examples/lang/VarCommand.java index 4b212b8..6a1e3da 100644 --- a/JPratt/src/examples/java/bjc/pratt/examples/lang/VarCommand.java +++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/VarCommand.java @@ -4,8 +4,8 @@ import bjc.pratt.ParserContext; import bjc.pratt.commands.AbstractInitialCommand; import bjc.pratt.tokens.StringToken; import bjc.pratt.tokens.Token; -import bjc.utils.data.ITree; -import bjc.utils.data.Tree; +import bjc.data.ITree; +import bjc.data.Tree; import bjc.utils.parserutils.ParserException; class VarCommand extends AbstractInitialCommand { -- cgit v1.2.3