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