summaryrefslogtreecommitdiff
path: root/JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java
diff options
context:
space:
mode:
Diffstat (limited to 'JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java')
-rw-r--r--JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java b/JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java
index 069de78..7a65052 100644
--- a/JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java
+++ b/JPratt/src/main/java/bjc/pratt/commands/BinaryCommand.java
@@ -1,6 +1,7 @@
package bjc.pratt.commands;
import bjc.pratt.ParserContext;
+import bjc.pratt.commands.CommandResult.Status;
import bjc.pratt.tokens.Token;
import bjc.data.Tree;
import bjc.data.SimpleTree;
@@ -39,12 +40,14 @@ public abstract class BinaryCommand<K, V, C> extends BinaryPostCommand<K, V, C>
protected abstract int rightBinding();
@Override
- public Tree<Token<K, V>> denote(final Tree<Token<K, V>> operand,
+ public CommandResult<K, V> denote(final Tree<Token<K, V>> operand,
final Token<K, V> operator, final ParserContext<K, V, C> ctx)
throws ParserException {
- final Tree<Token<K, V>> opr
+ final CommandResult<K,V> opr
= ctx.parse.parseExpression(rightBinding(), ctx.tokens, ctx.state, false);
+
+ if (opr.status != Status.SUCCESS) return opr;
- return new SimpleTree<>(operator, operand, opr);
+ return CommandResult.success(new SimpleTree<>(operator, operand, opr.success()));
}
} \ No newline at end of file