diff options
Diffstat (limited to 'JPratt/src/examples/java')
6 files changed, 21 insertions, 21 deletions
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 f816307..78fec0d 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.data.ITree; import bjc.data.Tree; +import bjc.data.SimpleTree; import bjc.utils.parserutils.ParserException; class AssignCommand extends NonBinaryCommand<String, String, TestContext> { @@ -14,7 +14,7 @@ class AssignCommand extends NonBinaryCommand<String, String, TestContext> { } @Override - public ITree<Token<String, String>> denote(final ITree<Token<String, String>> operand, + public Tree<Token<String, String>> denote(final Tree<Token<String, String>> operand, final Token<String, String> operator, final ParserContext<String, String, TestContext> ctx) throws ParserException { final Token<String, String> name = operand.getHead(); @@ -27,10 +27,10 @@ class AssignCommand extends NonBinaryCommand<String, String, TestContext> { throw new ParserException("Variable name must be simple"); } - final ITree<Token<String, String>> body = ctx.parse.parseExpression(0, ctx.tokens, ctx.state, false); + final Tree<Token<String, String>> body = ctx.parse.parseExpression(0, ctx.tokens, ctx.state, false); ctx.state.scopes.top().putKey(name.getValue(), body); - return new Tree<>(new StringToken("assign", "assign"), operand, body); + return new SimpleTree<>(new StringToken("assign", "assign"), operand, body); } } 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 143678c..e175ff5 100644 --- a/JPratt/src/examples/java/bjc/pratt/examples/lang/BlockEnter.java +++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/BlockEnter.java @@ -3,14 +3,14 @@ package bjc.pratt.examples.lang; import java.util.function.UnaryOperator; import bjc.pratt.tokens.Token; -import bjc.data.ITree; +import bjc.data.Tree; import bjc.esodata.Directory; import bjc.esodata.Stack; final class BlockEnter implements UnaryOperator<TestContext> { @Override public TestContext apply(final TestContext state) { - final Directory<String, ITree<Token<String, String>>> enclosing = state.scopes.top(); + final Directory<String, Tree<Token<String, String>>> enclosing = state.scopes.top(); final Stack<Integer> blockCount = state.blockCount; final int currBlockNumber = blockCount.pop(); 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 8bebb1a..15c0b81 100644 --- a/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java +++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/PrattParserTest.java @@ -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.data.ITree; +import bjc.data.Tree; import bjc.data.TransformIterator; -import bjc.funcdata.IList; +import bjc.funcdata.ListEx; import bjc.utils.parserutils.ParserException; import bjc.utils.parserutils.splitter.ConfigurableTokenSplitter; import bjc.utils.parserutils.splitter.ExcludingTokenSplitter; @@ -142,7 +142,7 @@ public class PrattParserTest { */ tokenStream.next(); - final ITree<Token<String, String>> rawTree = parser.parseExpression(0, tokenStream, ctx, true); + final Tree<Token<String, String>> rawTree = parser.parseExpression(0, tokenStream, ctx, true); if (!tokenStream.headIs("(end)")) { System.out.println("\nMultiple expressions on line"); @@ -185,7 +185,7 @@ public class PrattParserTest { String strang = raw.replaceAll("\\.(\\.+)", "$1"); if (doSplit) { - IList<String> splitStrangs = split.split(strang); + ListEx<String> splitStrangs = split.split(strang); splitStrangs.removeMatching(""); splitStrangs.forEach(splitTokens::add); 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 4ee778d..fb2ae66 100644 --- a/JPratt/src/examples/java/bjc/pratt/examples/lang/SwitchCommand.java +++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/SwitchCommand.java @@ -4,18 +4,18 @@ import bjc.pratt.ParserContext; import bjc.pratt.commands.InitialCommand; import bjc.pratt.tokens.StringToken; import bjc.pratt.tokens.Token; -import bjc.data.ITree; import bjc.data.Tree; +import bjc.data.SimpleTree; import bjc.utils.parserutils.ParserException; class SwitchCommand implements InitialCommand<String, String, TestContext> { @Override - public ITree<Token<String, String>> denote(final Token<String, String> operator, + public Tree<Token<String, String>> denote(final Token<String, String> operator, final ParserContext<String, String, TestContext> ctx) throws ParserException { - final ITree<Token<String, String>> object = ctx.parse.parseExpression(0, ctx.tokens, ctx.state, false); + final Tree<Token<String, String>> object = ctx.parse.parseExpression(0, ctx.tokens, ctx.state, false); - final ITree<Token<String, String>> body = ctx.parse.parseExpression(0, ctx.tokens, ctx.state, false); + final Tree<Token<String, String>> body = ctx.parse.parseExpression(0, ctx.tokens, ctx.state, false); - return new Tree<>(new StringToken("switch", "switch"), object, body); + return new SimpleTree<>(new StringToken("switch", "switch"), object, body); } } 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 7db91e7..b0713ae 100644 --- a/JPratt/src/examples/java/bjc/pratt/examples/lang/TestContext.java +++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/TestContext.java @@ -1,7 +1,7 @@ package bjc.pratt.examples.lang; import bjc.pratt.tokens.Token; -import bjc.data.ITree; +import bjc.data.Tree; import bjc.esodata.Directory; import bjc.esodata.SimpleDirectory; import bjc.esodata.SimpleStack; @@ -17,7 +17,7 @@ public class TestContext { /** * The variable scoping information. */ - public Stack<Directory<String, ITree<Token<String, String>>>> scopes; + public Stack<Directory<String, Tree<Token<String, String>>>> scopes; /** * The current number of scopes inside this scope. 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 6a1e3da..1f47218 100644 --- a/JPratt/src/examples/java/bjc/pratt/examples/lang/VarCommand.java +++ b/JPratt/src/examples/java/bjc/pratt/examples/lang/VarCommand.java @@ -4,14 +4,14 @@ import bjc.pratt.ParserContext; import bjc.pratt.commands.AbstractInitialCommand; import bjc.pratt.tokens.StringToken; import bjc.pratt.tokens.Token; -import bjc.data.ITree; import bjc.data.Tree; +import bjc.data.SimpleTree; import bjc.utils.parserutils.ParserException; class VarCommand extends AbstractInitialCommand<String, String, TestContext> { @Override - protected ITree<Token<String, String>> intNullDenotation(final Token<String, String> operator, + protected Tree<Token<String, String>> intNullDenotation(final Token<String, String> operator, final ParserContext<String, String, TestContext> ctx) throws ParserException { final Token<String, String> name = ctx.tokens.current(); @@ -26,11 +26,11 @@ class VarCommand extends AbstractInitialCommand<String, String, TestContext> { ctx.tokens.expect(":="); - final ITree<Token<String, String>> body = ctx.parse.parseExpression(0, ctx.tokens, ctx.state, false); + final Tree<Token<String, String>> body = ctx.parse.parseExpression(0, ctx.tokens, ctx.state, false); ctx.state.scopes.top().putKey(name.getValue(), body); - return new Tree<>(new StringToken("var-bind", "var-bind"), new Tree<>(name), body); + return new SimpleTree<>(new StringToken("var-bind", "var-bind"), new SimpleTree<>(name), body); } } |