More work on parse blocks

4 files changed, 118 insertions, 3 deletions

diff --git a/JPratt/src/main/java/bjc/pratt/commands/BlockInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/BlockInitialCommand.java
new file mode 100644
index 0000000..f0448f7
--- /dev/null
+++ b/JPratt/src/main/java/bjc/pratt/commands/BlockInitialCommand.java
@@ -0,0 +1,41 @@
+package bjc.pratt.commands;
+
+import bjc.pratt.ParseBlock;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
+import bjc.utils.data.ITree;
+import bjc.utils.parserutils.ParserException;
+
+/**
+ * An initial command that delegates all the work to a {@link ParseBlock}
+ * 
+ * @author bjculkin
+ * @param <K>
+ *                The token key type.
+ * 
+ * @param <V>
+ *                The token value type.
+ * 
+ * @param <C>
+ *                The parser state type.
+ *
+ */
+public class BlockInitialCommand<K, V, C> extends AbstractInitialCommand<K, V, C> {
+	private ParseBlock<K, V, C> blck;
+
+	/**
+	 * Create a new block initial command.
+	 * 
+	 * @param block
+	 *                The block to delegate to.
+	 */
+	public BlockInitialCommand(ParseBlock<K, V, C> block) {
+		blck = block;
+	}
+
+	@Override
+	protected ITree<Token<K, V>> intNullDenotation(Token<K, V> operator, ParserContext<K, V, C> ctx)
+			throws ParserException {
+		return blck.parse(ctx);
+	}
+}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/pratt/commands/BlockNonInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/BlockNonInitialCommand.java
new file mode 100644
index 0000000..9a5ffc9
--- /dev/null
+++ b/JPratt/src/main/java/bjc/pratt/commands/BlockNonInitialCommand.java
@@ -0,0 +1,74 @@
+package bjc.pratt.commands;
+
+import bjc.pratt.NonInitialCommand;
+import bjc.pratt.ParseBlock;
+import bjc.pratt.ParserContext;
+import bjc.pratt.Token;
+import bjc.utils.data.ITree;
+import bjc.utils.data.Tree;
+import bjc.utils.parserutils.ParserException;
+
+/**
+ * A non-initial command that delegates all of the work to a {@link ParseBlock}
+ * 
+ * @author bjculkin
+ *
+ * @param <K>
+ *                The token key type.
+ * 
+ * @param <V>
+ *                The token value type.
+ * 
+ * @param <C>
+ *                The parser state type.
+ */
+public class BlockNonInitialCommand<K, V, C> extends NonInitialCommand<K, V, C> {
+	private ParseBlock<K, V, C> innr;
+
+	private int	lftBind;
+	private int	nxtBind;
+
+	private Token<K, V> trm;
+
+	/**
+	 * Create a new non-initial command that delegates to a parse block.
+	 * 
+	 * @param inner
+	 *                The parse block to delegate to.
+	 * 
+	 * @param leftBind
+	 *                The left binding power (precedence).
+	 * 
+	 * @param rightBind
+	 *                The right binding power (associativity control).
+	 * 
+	 * @param term
+	 *                The token to use as the node in the AST.
+	 */
+	public BlockNonInitialCommand(ParseBlock<K, V, C> inner, int leftBind, int rightBind, Token<K, V> term) {
+		innr = inner;
+
+		lftBind = leftBind;
+		nxtBind = rightBind;
+
+		trm = term;
+	}
+
+	@Override
+	public ITree<Token<K, V>> denote(ITree<Token<K, V>> operand, Token<K, V> operator, ParserContext<K, V, C> ctx)
+			throws ParserException {
+		ITree<Token<K, V>> expression = innr.parse(ctx);
+
+		return new Tree<>(trm, expression);
+	}
+
+	@Override
+	public int leftBinding() {
+		return lftBind;
+	}
+
+	@Override
+	public int nextBinding() {
+		return nxtBind;
+	}
+}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/pratt/commands/InitialCommands.java b/JPratt/src/main/java/bjc/pratt/commands/InitialCommands.java
index 5710277..b373a7c 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/InitialCommands.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/InitialCommands.java
@@ -168,4 +168,4 @@ public class InitialCommands {
 	public static <K, V, C> InitialCommand<K, V, C> denest(final InitialCommand<K, V, C> comm) {
 		return new DenestingCommand<>(comm);
 	}
-}
+}
\ No newline at end of file
diff --git a/JPratt/src/main/java/bjc/pratt/commands/NonInitialCommands.java b/JPratt/src/main/java/bjc/pratt/commands/NonInitialCommands.java
index 48922b7..39baf1f 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/NonInitialCommands.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/NonInitialCommands.java
@@ -104,7 +104,7 @@ public class NonInitialCommands {
 	 */
 	public static <K, V, C> NonInitialCommand<K, V, C> postCircumfix(final int precedence,
 			final int insidePrecedence, final K closer, final Token<K, V> marker) {
-		final ParseBlock<K, V, C> innerBlock = new SimpleParseBlock<>(insidePrecedence, closer, null);
+		final ParseBlock<K, V, C> innerBlock = new SimpleParseBlock<>(insidePrecedence, null, closer);
 
 		return new PostCircumfixCommand<>(precedence, innerBlock, marker);
 	}
@@ -134,7 +134,7 @@ public class NonInitialCommands {
 	 */
 	public static <K, V, C> NonInitialCommand<K, V, C> ternary(final int precedence, final int insidePrecedence,
 			final K closer, final Token<K, V> marker, final boolean nonassoc) {
-		final ParseBlock<K, V, C> innerBlock = new SimpleParseBlock<>(insidePrecedence, closer, null);
+		final ParseBlock<K, V, C> innerBlock = new SimpleParseBlock<>(insidePrecedence, null, closer);
 
 		return new TernaryCommand<>(precedence, innerBlock, marker, nonassoc);
 	}