1 files changed, 98 insertions, 0 deletions
diff --git a/JPratt/src/main/java/com/ashardalon/pratt/blocks/SimpleParseBlock.java b/JPratt/src/main/java/com/ashardalon/pratt/blocks/SimpleParseBlock.java
new file mode 100644
index 0000000..8c4a046
--- /dev/null
+++ b/JPratt/src/main/java/com/ashardalon/pratt/blocks/SimpleParseBlock.java
@@ -0,0 +1,98 @@
+package com.ashardalon.pratt.blocks;
+
+import java.util.function.Predicate;
+
+import com.ashardalon.pratt.ParserContext;
+import com.ashardalon.pratt.commands.CommandResult;
+import com.ashardalon.pratt.commands.CommandResult.Status;
+import com.ashardalon.pratt.tokens.Token;
+
+import bjc.data.Tree;
+import bjc.utils.parserutils.ParserException;
+
+/**
+ * Simple implementation of {@link ParseBlock}
+ *
+ * @author bjculkin
+ *
+ * @param <K>
+ *        The key type of the tokens.
+ *
+ * @param <V>
+ *        The value type of the tokens.
+ *
+ * @param <C>
+ *        The state type of the parser.
+ */
+public class SimpleParseBlock<K, V, C> implements ParseBlock<K, V, C> {
+	private final int pow;
+
+	private final K term;
+
+	private final Predicate<Tree<Token<K, V>>> validatr;
+
+	/**
+	 * Create a new block.
+	 *
+	 * @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.
+	 */
+	public SimpleParseBlock(final int precedence, final Predicate<Tree<Token<K, V>>> validator,
+			final K terminator) {
+		if(precedence < 0) throw new IllegalArgumentException("Precedence must be non-negative");
+
+		pow = precedence;
+		term = terminator;
+		validatr = validator;
+	}
+
+	@Override
+	public CommandResult<K, V> parse(final ParserContext<K, V, C> ctx) throws ParserException {
+		final CommandResult<K,V> resBlock = ctx.parse.parseExpression(pow, ctx.tokens, ctx.state, false);
+		if (resBlock.status != Status.SUCCESS) return resBlock;
+		
+		Tree<Token<K, V>> res = resBlock.success();
+		if(term != null) {
+			ctx.tokens.expect(term);
+		}
+
+		if(validatr == null || validatr.test(res)) return CommandResult.success(res);
+
+		// TODO: Figure out the right way to handle error context w/ CommandResult
+		throw new ParserException("Block failed validation");
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+
+		int result = 1;
+
+		result = prime * result + pow;
+		result = prime * result + (term == null ? 0 : term.hashCode());
+
+		return result;
+	}
+
+	@Override
+	public boolean equals(final Object obj) {
+		if(this == obj) return true;
+		if(obj == null) return false;
+		if(!(obj instanceof SimpleParseBlock)) return false;
+
+		final SimpleParseBlock<?, ?, ?> other = (SimpleParseBlock<?, ?, ?>) obj;
+
+		if(pow != other.pow) return false;
+
+		if(term == null) {
+			if(other.term != null) return false;
+		} else if(!term.equals(other.term)) return false;
+
+		return true;
+	}
+}
+\ No newline at end of file