From 56f07e9a3aaa873fe385d224f088f048dbafa8f7 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Mon, 10 Apr 2017 16:49:54 -0400 Subject: Cleanup --- .../java/bjc/pratt/blocks/SimpleParseBlock.java | 35 +++++++++++----------- 1 file changed, 17 insertions(+), 18 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 acddd3b..db94034 100644 --- a/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java +++ b/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java @@ -10,39 +10,40 @@ import bjc.utils.parserutils.ParserException; /** * Simple implementation of {@link ParseBlock} - * + * * @author bjculkin * * @param * The key type of the tokens. - * + * * @param * The value type of the tokens. - * + * * @param * The state type of the parser. */ public class SimpleParseBlock implements ParseBlock { - private int pow; + private final int pow; - private K term; + private final K term; - private Predicate>> validatr; + private final Predicate>> validatr; /** * Create a new block. - * + * * @param precedence * The precedence of this block. - * + * * @param terminator * The token type that terminates the block. If this is * null, don't check for a terminator. - * + * * @param validator * The predicate to apply to blocks. */ - public SimpleParseBlock(int precedence, K terminator, Predicate>> validator) { + public SimpleParseBlock(final int precedence, final K terminator, + final Predicate>> validator) { if (precedence < 0) throw new IllegalArgumentException("Precedence must be non-negative"); pow = precedence; @@ -51,16 +52,14 @@ public class SimpleParseBlock implements ParseBlock { } @Override - public ITree> parse(ParserContext ctx) throws ParserException { - ITree> res = ctx.parse.parseExpression(pow, ctx.tokens, ctx.state, false); + public ITree> parse(final ParserContext ctx) throws ParserException { + final ITree> res = ctx.parse.parseExpression(pow, ctx.tokens, ctx.state, false); if (term != null) { ctx.tokens.expect(term); } - if (validatr == null || validatr.test(res)) { - return res; - } + if (validatr == null || validatr.test(res)) return res; throw new ParserException("Block failed validation"); } @@ -72,18 +71,18 @@ public class SimpleParseBlock implements ParseBlock { int result = 1; result = prime * result + pow; - result = prime * result + ((term == null) ? 0 : term.hashCode()); + result = prime * result + (term == null ? 0 : term.hashCode()); return result; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) return true; if (obj == null) return false; if (!(obj instanceof SimpleParseBlock)) return false; - SimpleParseBlock other = (SimpleParseBlock) obj; + final SimpleParseBlock other = (SimpleParseBlock) obj; if (pow != other.pow) return false; -- cgit v1.2.3 From 7a510ceb37780a7d0da37117a5cfce23c2919257 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Mon, 10 Apr 2017 22:55:22 -0400 Subject: More work on parse blocks --- .../src/main/java/bjc/pratt/blocks/SimpleParseBlock.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 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 db94034..0fb5097 100644 --- a/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java +++ b/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java @@ -34,16 +34,14 @@ public class SimpleParseBlock implements ParseBlock { * * @param precedence * The precedence of this block. - * + * @param validator + * The predicate to apply to blocks. * @param terminator * The token type that terminates the block. If this is * null, don't check for a terminator. - * - * @param validator - * The predicate to apply to blocks. */ - public SimpleParseBlock(final int precedence, final K terminator, - 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"); pow = precedence; @@ -92,9 +90,4 @@ public class SimpleParseBlock implements ParseBlock { return true; } - - @Override - public String toString() { - return String.format("ParseBlock [pow=%s, term='%s']", pow, term); - } } \ No newline at end of file -- cgit v1.2.3 From f394306a4b65a3328551f9f6b8d4abff8bfd5b27 Mon Sep 17 00:00:00 2001 From: bjculkin Date: Wed, 12 Apr 2017 10:46:51 -0400 Subject: Package reorganization --- JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 0fb5097..1ff561c 100644 --- a/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java +++ b/JPratt/src/main/java/bjc/pratt/blocks/SimpleParseBlock.java @@ -2,9 +2,8 @@ package bjc.pratt.blocks; import java.util.function.Predicate; -import bjc.pratt.ParseBlock; import bjc.pratt.ParserContext; -import bjc.pratt.Token; +import bjc.pratt.tokens.Token; import bjc.utils.data.ITree; import bjc.utils.parserutils.ParserException; -- cgit v1.2.3