2 files changed, 31 insertions, 0 deletions
diff --git a/src/main/java/org/zwobble/couscous/ast/StaticMethodCallNode.java b/src/main/java/org/zwobble/couscous/ast/StaticMethodCallNode.java
index 06c63da..b33e94c 100644
--- a/src/main/java/org/zwobble/couscous/ast/StaticMethodCallNode.java
+++ b/src/main/java/org/zwobble/couscous/ast/StaticMethodCallNode.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.zwobble.couscous.ast.visitors.ExpressionNodeMapper;
 import org.zwobble.couscous.values.BooleanValue;
+import org.zwobble.couscous.values.IntegerValue;
 import org.zwobble.couscous.values.InternalCouscousValue;
 import org.zwobble.couscous.values.ObjectValues;
 
@@ -21,6 +22,14 @@ public class StaticMethodCallNode implements ExpressionNode {
             asList(value),
             ObjectValues.BOXED_INT);
     }
+
+    public static ExpressionNode unboxInt(ExpressionNode value) {
+        return staticMethodCall(
+            InternalCouscousValue.REF,
+            "unboxInt",
+            asList(value),
+            IntegerValue.REF);
+    }
     
     public static ExpressionNode boxBoolean(ExpressionNode value) {
         return staticMethodCall(
@@ -29,6 +38,14 @@ public class StaticMethodCallNode implements ExpressionNode {
             asList(value),
             ObjectValues.BOXED_BOOLEAN);
     }
+
+    public static ExpressionNode unboxBoolean(ExpressionNode value) {
+        return staticMethodCall(
+            InternalCouscousValue.REF,
+            "unboxBoolean",
+            asList(value),
+            BooleanValue.REF);
+    }
     
     public static StaticMethodCallNode staticMethodCall(
             String className,
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 99d0268..a47c4e9 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
@@ -168,8 +168,12 @@ public class JavaReader {
         ExpressionNode couscousExpression = readExpressionWithoutBoxing(expression);
         if (isIntegerBox(targetType, couscousExpression)) {
             return StaticMethodCallNode.boxInt(couscousExpression);
+        } else if (isIntegerUnbox(targetType, couscousExpression)) {
+            return StaticMethodCallNode.unboxInt(couscousExpression);
         } else if (isBooleanBox(targetType, couscousExpression)) {
             return StaticMethodCallNode.boxBoolean(couscousExpression);
+        } else if (isBooleanUnbox(targetType, couscousExpression)) {
+            return StaticMethodCallNode.unboxBoolean(couscousExpression);
         } else {
             return couscousExpression;
         }
@@ -180,11 +184,21 @@ public class JavaReader {
             !targetType.equals(IntegerValue.REF);
     }
 
+    private static boolean isIntegerUnbox(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 boolean isBooleanUnbox(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: