Refactor to add backtracking support

This probably doesn't help w/ error messages, but it enables some cool
ideas where syntax can be reused in cases where it would otherwise be
invalid

1 files changed, 6 insertions, 2 deletions

diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/DenestingCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/DenestingCommand.java
index fbcd35c..4935c81 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/DenestingCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/DenestingCommand.java
@@ -2,6 +2,8 @@ package bjc.pratt.commands.impls;
 
 import bjc.pratt.ParserContext;
 import bjc.pratt.commands.AbstractInitialCommand;
+import bjc.pratt.commands.CommandResult;
+import bjc.pratt.commands.CommandResult.Status;
 import bjc.pratt.commands.InitialCommand;
 import bjc.pratt.tokens.Token;
 import bjc.data.Tree;
@@ -39,8 +41,10 @@ public class DenestingCommand<K, V, C> extends AbstractInitialCommand<K, V, C> {
 	}
 
 	@Override
-	protected Tree<Token<K, V>> intNullDenotation(final Token<K, V> operator, final ParserContext<K, V, C> ctx)
+	protected CommandResult<K, V> intNullDenotation(final Token<K, V> operator, final ParserContext<K, V, C> ctx)
 			throws ParserException {
-		return wrapped.denote(operator, ctx).getChild(0);
+		CommandResult<K, V> res = wrapped.denote(operator, ctx);
+		if (res.status != Status.SUCCESS) return res;
+		return CommandResult.success(res.success().getChild(0));
 	}
 }
\ No newline at end of file