diff options
| author | Michael Williamson <mike@zwobble.org> | 2015-11-15 13:26:38 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2015-11-15 13:26:38 +0000 |
| commit | b590542b4cb33e456a2d5e5922fbd68c391e681d (patch) | |
| tree | 85bfc1acf5bf09aef80094d5c7cfffb04b67ead8 /src/main/java/org/zwobble/couscous/frontends | |
| parent | 44ef2b3f95091e96b1985410c494e3e8757fb427 (diff) | |
Add NOT_EQUALS operator
Diffstat (limited to 'src/main/java/org/zwobble/couscous/frontends')
| -rw-r--r-- | src/main/java/org/zwobble/couscous/frontends/java/JavaOperators.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java | 17 |
2 files changed, 7 insertions, 12 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 09d880f..f3a18f9 100644 --- a/src/main/java/org/zwobble/couscous/frontends/java/JavaOperators.java +++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaOperators.java @@ -29,6 +29,8 @@ public class JavaOperators { return Operator.MOD; } else if (operator == InfixExpression.Operator.EQUALS) { return Operator.EQUALS; + } else if (operator == InfixExpression.Operator.NOT_EQUALS) { + return Operator.NOT_EQUALS; } else if (operator == InfixExpression.Operator.GREATER) { return Operator.GREATER_THAN; } else if (operator == InfixExpression.Operator.GREATER_EQUALS) { diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java index 02d14c1..dee5430 100644 --- a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java +++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java @@ -329,18 +329,11 @@ public class JavaReader { private static ExpressionNode readInfixExpression(InfixExpression expression) { TypeName operandType = typeOf(expression.getLeftOperand()); if (operandType.equals(IntegerValue.REF)) { - if (expression.getOperator() == InfixExpression.Operator.NOT_EQUALS) { - return MethodCallNode.not(readOperation( - Operator.EQUALS, - expression.getLeftOperand(), - expression.getRightOperand())); - } else { - Operator operator = readOperator(expression.getOperator()); - return readOperation( - operator, - expression.getLeftOperand(), - expression.getRightOperand()); - } + Operator operator = readOperator(expression.getOperator()); + return readOperation( + operator, + expression.getLeftOperand(), + expression.getRightOperand()); } else { ExpressionNode left = readExpression(ObjectValues.OBJECT, expression.getLeftOperand()); ExpressionNode right = readExpression(ObjectValues.OBJECT, expression.getRightOperand()); |
