diff options
| author | Michael Williamson <mike@zwobble.org> | 2018-01-27 18:42:03 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2018-01-27 18:42:03 +0000 |
| commit | a34b03537f1ee6e7f3d4ee88bf5dd4f93d1bf7e4 (patch) | |
| tree | 4cd44814081b36452225f9d1dc444299d1fa7a7d /src/main/java/org/zwobble/couscous | |
| parent | ca151d1aa03a6ca5855b447cc1f81081388bc720 (diff) | |
Read integer negation
Diffstat (limited to 'src/main/java/org/zwobble/couscous')
3 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/org/zwobble/couscous/ast/Operations.java b/src/main/java/org/zwobble/couscous/ast/Operations.java index 308d070..a94235e 100644 --- a/src/main/java/org/zwobble/couscous/ast/Operations.java +++ b/src/main/java/org/zwobble/couscous/ast/Operations.java @@ -33,6 +33,10 @@ public class Operations { return booleanOperation(Operator.BOOLEAN_OR, left, right); } + public static ExpressionNode integerNegation(ExpressionNode value) { + return OperationNode.operation(Operator.INTEGER_NEGATION, list(value), Types.INT); + } + public static ExpressionNode integerAdd(ExpressionNode left, ExpressionNode right) { return integerOperation(Operator.ADD, left, right); } diff --git a/src/main/java/org/zwobble/couscous/ast/Operator.java b/src/main/java/org/zwobble/couscous/ast/Operator.java index a77a135..54ab6c6 100644 --- a/src/main/java/org/zwobble/couscous/ast/Operator.java +++ b/src/main/java/org/zwobble/couscous/ast/Operator.java @@ -5,6 +5,7 @@ public enum Operator { BOOLEAN_OR("||", true, OperatorType.INFIX), BOOLEAN_NOT("!", true, OperatorType.PREFIX), + INTEGER_NEGATION("-", false, OperatorType.PREFIX), ADD("+", false, OperatorType.INFIX), SUBTRACT("-", false, OperatorType.INFIX), MULTIPLY("*", false, OperatorType.INFIX), diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java index 22a9895..33acb80 100644 --- a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java +++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java @@ -374,6 +374,8 @@ public class JavaExpressionReader { private ExpressionNode readPrefixExpression(PrefixExpression expression) { if (expression.getOperator() == PrefixExpression.Operator.NOT) { return not(readExpression(Types.BOOLEAN, expression.getOperand())); + } else if (expression.getOperator() == PrefixExpression.Operator.MINUS) { + return Operations.integerNegation(readExpression(Types.INT, expression.getOperand())); } else { Operator operator = readOperator(expression.getOperator()); return AssignmentNode.assign( |