aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/zwobble/couscous/frontends
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-01-10 15:26:43 +0000
committerMichael Williamson <mike@zwobble.org>2016-01-10 15:26:43 +0000
commitbea8f44c058369bd175fb6b9e8da5b456669854d (patch)
treed770a82903efd712d286d200f207bfbfedcaff73 /src/main/java/org/zwobble/couscous/frontends
parentf5472abda7010c63a18b55e322de52a3f9f0c5ca (diff)
Read boolean and/or operators
Diffstat (limited to 'src/main/java/org/zwobble/couscous/frontends')
-rw-r--r--src/main/java/org/zwobble/couscous/frontends/java/JavaOperators.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaOperators.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaOperators.java
index f3a18f9..824c134 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaOperators.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaOperators.java
@@ -17,7 +17,11 @@ public class JavaOperators {
}
static Operator readOperator(InfixExpression.Operator operator) {
- if (operator == InfixExpression.Operator.PLUS) {
+ if (operator == InfixExpression.Operator.CONDITIONAL_AND) {
+ return Operator.BOOLEAN_AND;
+ } else if (operator == InfixExpression.Operator.CONDITIONAL_OR) {
+ return Operator.BOOLEAN_OR;
+ } else if (operator == InfixExpression.Operator.PLUS) {
return Operator.ADD;
} else if (operator == InfixExpression.Operator.MINUS) {
return Operator.SUBTRACT;