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/GrammarParseBlock.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'JPratt/src/main/java/bjc/pratt/blocks/GrammarParseBlock.java') 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); -- cgit v1.2.3