diff options
Diffstat (limited to 'src/main/java/org/zwobble/couscous/frontends')
| -rw-r--r-- | src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java | 14 |
1 files changed, 13 insertions, 1 deletions
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 a74cb35..99d0268 100644 --- a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java +++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java @@ -166,13 +166,25 @@ public class JavaReader { private static ExpressionNode readExpression(TypeName targetType, Expression expression) { ExpressionNode couscousExpression = readExpressionWithoutBoxing(expression); - if (couscousExpression.getType().equals(IntegerValue.REF) && !targetType.equals(IntegerValue.REF)) { + if (isIntegerBox(targetType, couscousExpression)) { return StaticMethodCallNode.boxInt(couscousExpression); + } else if (isBooleanBox(targetType, couscousExpression)) { + return StaticMethodCallNode.boxBoolean(couscousExpression); } else { return couscousExpression; } } + private static boolean isIntegerBox(TypeName targetType, ExpressionNode expression) { + return expression.getType().equals(IntegerValue.REF) && + !targetType.equals(IntegerValue.REF); + } + + private static boolean isBooleanBox(TypeName targetType, ExpressionNode expression) { + return expression.getType().equals(BooleanValue.REF) && + !targetType.equals(BooleanValue.REF); + } + private static ExpressionNode readExpressionWithoutBoxing(Expression expression) { switch (expression.getNodeType()) { case ASTNode.BOOLEAN_LITERAL: |
