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, 14 insertions, 7 deletions

diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/PreTernaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/impls/PreTernaryCommand.java
index e315804..5d5cbe1 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/impls/PreTernaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/impls/PreTernaryCommand.java
@@ -3,6 +3,8 @@ package bjc.pratt.commands.impls;
 import bjc.pratt.ParserContext;
 import bjc.pratt.blocks.ParseBlock;
 import bjc.pratt.commands.AbstractInitialCommand;
+import bjc.pratt.commands.CommandResult;
+import bjc.pratt.commands.CommandResult.Status;
 import bjc.pratt.tokens.Token;
 import bjc.data.Tree;
 import bjc.data.SimpleTree;
@@ -63,14 +65,19 @@ public class PreTernaryCommand<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 {
-		final Tree<Token<K, V>> cond = condBlock.parse(ctx);
+		final CommandResult<K,V> condRes = condBlock.parse(ctx);
+		if (condRes.status != Status.SUCCESS) return condRes;
+		Tree<Token<K, V>> cond = condRes.success();
+		
+		final CommandResult<K,V> op1Res = opblock1.parse(ctx);
+		if (op1Res.status != Status.SUCCESS) return op1Res;
+		Tree<Token<K, V>> op1 = op1Res.success();
 
-		final Tree<Token<K, V>> op1 = opblock1.parse(ctx);
-
-		final Tree<Token<K, V>> op2 = opblock2.parse(ctx);
-
-		return new SimpleTree<>(trm, cond, op1, op2);
+		final CommandResult<K,V> op2Res = opblock2.parse(ctx);
+		if (op2Res.status != Status.SUCCESS) return op2Res;
+		Tree<Token<K, V>> op2 = op2Res.success();
+		return CommandResult.success(new SimpleTree<>(trm, cond, op1, op2));
 	}
 }
\ No newline at end of file