From 493d00f3ccf6af2d4ccb4421a82c143d96945178 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 31 Oct 2015 18:47:20 +0000 Subject: Support reading of boxed booleans --- .../org/zwobble/couscous/frontends/java/JavaReader.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/main/java/org/zwobble/couscous/frontends') 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: -- cgit v1.2.3