Update Pratt parser

1 files changed, 31 insertions, 10 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/commands/GroupingCommand.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/commands/GroupingCommand.java
index 407a39e..37cc6ee 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/commands/GroupingCommand.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/commands/GroupingCommand.java
@@ -3,27 +3,48 @@ package bjc.utils.parserutils.pratt.commands;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.parserutils.ParserException;
+import bjc.utils.parserutils.pratt.ParseBlock;
 import bjc.utils.parserutils.pratt.ParserContext;
 import bjc.utils.parserutils.pratt.Token;
 
+/**
+ * A grouping operator.
+ * 
+ * @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 GroupingCommand<K, V, C> extends AbstractInitialCommand<K, V, C> {
-	private K		term;
-	private Token<K, V>	mark;
-	private int		inner;
+	private ParseBlock<K, V, C> innerBlock;
+
+	private Token<K, V> mark;
+
+	/**
+	 * Create a new grouping command.
+	 * 
+	 * @param inner
+	 *                The inner block.
+	 * 
+	 * @param marker
+	 *                The token to use as the node in the AST.
+	 */
+	public GroupingCommand(ParseBlock<K, V, C> inner, Token<K, V> marker) {
+		innerBlock = inner;
 
-	public GroupingCommand(int innerPrec, K terminator, Token<K, V> marker) {
-		inner = innerPrec;
-		term = terminator;
 		mark = marker;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	protected ITree<Token<K, V>> intNullDenotation(Token<K, V> operator, ParserContext<K, V, C> ctx)
 			throws ParserException {
-		ITree<Token<K, V>> opr = ctx.parse.parseExpression(inner, ctx.tokens, ctx.state, false);
-
-		ctx.tokens.expect(term);
+		ITree<Token<K, V>> opr = innerBlock.parse(ctx);
 
 		return new Tree<>(mark, opr);
 	}