From 81f07e5af0a7229f63e6f85c51fdb58c1f107c43 Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Thu, 3 Dec 2020 19:22:48 -0500 Subject: Adapt to esodata changes --- JPratt/src/main/java/bjc/pratt/blocks/ChainParseBlock.java | 12 ++++++------ JPratt/src/main/java/bjc/pratt/blocks/GrammarParseBlock.java | 10 +++++----- JPratt/src/main/java/bjc/pratt/blocks/ParseBlock.java | 4 ++-- JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java | 4 ++-- .../src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java | 8 ++++---- JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java | 10 +++++----- .../src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java | 6 +++--- 7 files changed, 27 insertions(+), 27 deletions(-) (limited to 'JPratt/src/main/java/bjc/pratt/blocks') diff --git a/JPratt/src/main/java/bjc/pratt/blocks/ChainParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/ChainParseBlock.java index 434b47f..038b6ea 100644 --- a/JPratt/src/main/java/bjc/pratt/blocks/ChainParseBlock.java +++ b/JPratt/src/main/java/bjc/pratt/blocks/ChainParseBlock.java @@ -4,8 +4,8 @@ import java.util.Set; import bjc.pratt.ParserContext; import bjc.pratt.tokens.Token; -import bjc.data.ITree; import bjc.data.Tree; +import bjc.data.SimpleTree; import bjc.utils.parserutils.ParserException; /** @@ -51,19 +51,19 @@ public class ChainParseBlock implements ParseBlock { } @Override - public ITree> parse(ParserContext ctx) throws ParserException { - ITree> expression = iner.parse(ctx); + public Tree> parse(ParserContext ctx) throws ParserException { + Tree> expression = iner.parse(ctx); Token currentToken = ctx.tokens.current(); if(indicators.contains(currentToken.getKey())) { - ITree> res = new Tree<>(trm); + Tree> res = new SimpleTree<>(trm); res.addChild(expression); while(indicators.contains(currentToken.getKey())) { - res.addChild(new Tree<>(currentToken)); + res.addChild(new SimpleTree<>(currentToken)); ctx.tokens.next(); - ITree> innerExpression = iner.parse(ctx); + Tree> innerExpression = iner.parse(ctx); res.addChild(innerExpression); currentToken = ctx.tokens.current(); diff --git a/JPratt/src/main/java/bjc/pratt/blocks/GrammarParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/GrammarParseBlock.java index 0b1fb36..2432d6e 100644 --- a/JPratt/src/main/java/bjc/pratt/blocks/GrammarParseBlock.java +++ b/JPratt/src/main/java/bjc/pratt/blocks/GrammarParseBlock.java @@ -6,7 +6,7 @@ import bjc.pratt.ParserContext; import bjc.pratt.PrattParser; import bjc.pratt.tokens.Token; import bjc.pratt.tokens.TokenStream; -import bjc.data.ITree; +import bjc.data.Tree; import bjc.functypes.*; import bjc.utils.parserutils.ParserException; @@ -41,7 +41,7 @@ public class GrammarParseBlock implements ParseBlock, TokenStream> tkenTransform; private final Isomorphism stteTransform; - private final Function>, ITree>> xpressionTransform; + private final Function>, Tree>> xpressionTransform; /** * Create a new grammar parser block. @@ -56,7 +56,7 @@ public class GrammarParseBlock implements ParseBlock inner, final int precedence, final boolean isStatement, final Function, TokenStream> tokenTransform, final Isomorphism stateTransform, - final Function>, ITree>> expressionTransform) { + final Function>, Tree>> expressionTransform) { innr = inner; prcedence = precedence; isStatemnt = isStatement; @@ -66,12 +66,12 @@ public class GrammarParseBlock implements ParseBlock> parse(final ParserContext ctx) throws ParserException { + public Tree> parse(final ParserContext ctx) throws ParserException { final C2 newState = stteTransform.to(ctx.state); final TokenStream newTokens = tkenTransform.apply(ctx.tokens); - final ITree> expression = innr.parseExpression(prcedence, newTokens, newState, + final Tree> expression = innr.parseExpression(prcedence, newTokens, newState, isStatemnt); ctx.state = stteTransform.from(newState); diff --git a/JPratt/src/main/java/bjc/pratt/blocks/ParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/ParseBlock.java index d6cfda9..81ba508 100644 --- a/JPratt/src/main/java/bjc/pratt/blocks/ParseBlock.java +++ b/JPratt/src/main/java/bjc/pratt/blocks/ParseBlock.java @@ -2,7 +2,7 @@ package bjc.pratt.blocks; import bjc.pratt.ParserContext; import bjc.pratt.tokens.Token; -import bjc.data.ITree; +import bjc.data.Tree; import bjc.utils.parserutils.ParserException; /** @@ -34,6 +34,6 @@ public interface ParseBlock { * If something goes wrong during parsing, or the block fails * validation. */ - ITree> parse(ParserContext ctx) throws ParserException; + Tree> parse(ParserContext ctx) throws ParserException; } \ No newline at end of file diff --git a/JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java b/JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java index e0d63f3..96b9737 100644 --- a/JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java +++ b/JPratt/src/main/java/bjc/pratt/blocks/ParseBlocks.java @@ -4,7 +4,7 @@ import java.util.function.Predicate; import java.util.function.UnaryOperator; import bjc.pratt.tokens.Token; -import bjc.data.ITree; +import bjc.data.Tree; /** * Utility class for creating common implementations of {@link ParseBlock} @@ -91,7 +91,7 @@ public class ParseBlocks { * @return A configured simple parse block. */ public static ParseBlock simple(final int precedence, final K terminator, - final Predicate>> validator) { + final Predicate>> validator) { return new SimpleParseBlock<>(precedence, validator, terminator); } } \ No newline at end of file diff --git a/JPratt/src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java index fafccf1..4c21358 100644 --- a/JPratt/src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java +++ b/JPratt/src/main/java/bjc/pratt/blocks/RepeatingParseBlock.java @@ -4,8 +4,8 @@ import java.util.function.UnaryOperator; import bjc.pratt.ParserContext; import bjc.pratt.tokens.Token; -import bjc.data.ITree; import bjc.data.Tree; +import bjc.data.SimpleTree; import bjc.utils.parserutils.ParserException; /** @@ -72,13 +72,13 @@ public class RepeatingParseBlock implements ParseBlock { } @Override - public ITree> parse(final ParserContext ctx) throws ParserException { - final ITree> ret = new Tree<>(mark); + public Tree> parse(final ParserContext ctx) throws ParserException { + final Tree> ret = new SimpleTree<>(mark); Token tok = ctx.tokens.current(); while(!tok.getKey().equals(term)) { - final ITree> kid = innerBlock.parse(ctx); + final Tree> kid = innerBlock.parse(ctx); ret.addChild(kid); tok = ctx.tokens.current(); diff --git a/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java index 6dd925e..83e1d91 100644 --- a/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java +++ b/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java @@ -4,7 +4,7 @@ import java.util.function.Predicate; import bjc.pratt.ParserContext; import bjc.pratt.tokens.Token; -import bjc.data.ITree; +import bjc.data.Tree; import bjc.utils.parserutils.ParserException; /** @@ -26,7 +26,7 @@ public class SimpleParseBlock implements ParseBlock { private final K term; - private final Predicate>> validatr; + private final Predicate>> validatr; /** * Create a new block. @@ -39,7 +39,7 @@ public class SimpleParseBlock implements ParseBlock { * The token type that terminates the block. If this is null, * don't check for a terminator. */ - public SimpleParseBlock(final int precedence, final Predicate>> validator, + public SimpleParseBlock(final int precedence, final Predicate>> validator, final K terminator) { if(precedence < 0) throw new IllegalArgumentException("Precedence must be non-negative"); @@ -49,8 +49,8 @@ public class SimpleParseBlock implements ParseBlock { } @Override - public ITree> parse(final ParserContext ctx) throws ParserException { - final ITree> res = ctx.parse.parseExpression(pow, ctx.tokens, ctx.state, false); + public Tree> parse(final ParserContext ctx) throws ParserException { + final Tree> res = ctx.parse.parseExpression(pow, ctx.tokens, ctx.state, false); if(term != null) { ctx.tokens.expect(term); diff --git a/JPratt/src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java b/JPratt/src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java index f29e3b7..bfe5ab3 100644 --- a/JPratt/src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java +++ b/JPratt/src/main/java/bjc/pratt/blocks/TriggeredParseBlock.java @@ -4,7 +4,7 @@ import java.util.function.UnaryOperator; import bjc.pratt.ParserContext; import bjc.pratt.tokens.Token; -import bjc.data.ITree; +import bjc.data.Tree; import bjc.utils.parserutils.ParserException; /** @@ -45,12 +45,12 @@ public class TriggeredParseBlock implements ParseBlock { } @Override - public ITree> parse(final ParserContext ctx) throws ParserException { + public Tree> parse(final ParserContext ctx) throws ParserException { final C newState = onEntr.apply(ctx.state); final ParserContext newCtx = new ParserContext<>(ctx.tokens, ctx.parse, newState); - final ITree> res = sourc.parse(newCtx); + final Tree> res = sourc.parse(newCtx); ctx.state = onExt.apply(newState); -- cgit v1.2.3