Change method bodies to be optional

3 files changed, 15 insertions, 15 deletions

diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java
index 6f9df81..2f59e57 100644
--- a/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java
@@ -90,7 +90,7 @@ public class ExpressionReadingTests {
                 "    return " + expression + ";" +
                 "}");
 
-        ReturnNode returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get(0);
+        ReturnNode returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get().get(0);
         assertEquals(
             fieldAccess(
                 thisReference(TypeName.of("com.example.Example")),
@@ -116,7 +116,7 @@ public class ExpressionReadingTests {
                 "    return " + expression + ";" +
                 "}");
 
-        ReturnNode returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get(0);
+        ReturnNode returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get().get(0);
         assertEquals(
             fieldAccess(
                 TypeName.of("com.example.Example"),
@@ -145,7 +145,7 @@ public class ExpressionReadingTests {
             "public String loop() {" +
                 "    return loop();" +
                 "}");
-        ReturnNode returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get(0);
+        ReturnNode returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get().get(0);
 
         assertEquals(
             methodCall(
@@ -173,7 +173,7 @@ public class ExpressionReadingTests {
             "public static String loop() {" +
                 "    return loop();" +
                 "}");
-        ReturnNode returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get(0);
+        ReturnNode returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get().get(0);
 
         assertEquals(
             staticMethodCall(
@@ -319,7 +319,7 @@ public class ExpressionReadingTests {
                 "    return name = \"blah\";" +
                 "}");
 
-        ReturnNode returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get(0);
+        ReturnNode returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get().get(0);
         assertEquals(
             assign(
                 fieldAccess(
@@ -338,7 +338,7 @@ public class ExpressionReadingTests {
                 "    return value = 4;" +
                 "}");
 
-        ReturnNode returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get(0);
+        ReturnNode returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get().get(0);
         assertEquals(
             assign(
                 fieldAccess(
@@ -366,7 +366,7 @@ public class ExpressionReadingTests {
         MethodNode method = classNode.getMethods().get(0);
         FormalArgumentNode argument = method.getArguments().get(0);
         ExpressionStatementNode statement = (ExpressionStatementNode)
-            classNode.getMethods().get(0).getBody().get(0);
+            classNode.getMethods().get(0).getBody().get().get(0);
         assertEquals(
             assign(
                 reference(argument),
@@ -392,7 +392,7 @@ public class ExpressionReadingTests {
         MethodNode method = classNode.getMethods().get(0);
         FormalArgumentNode argument = method.getArguments().get(0);
         ExpressionStatementNode statement = (ExpressionStatementNode)
-            classNode.getMethods().get(0).getBody().get(0);
+            classNode.getMethods().get(0).getBody().get().get(0);
         assertEquals(
             assign(
                 reference(argument),
@@ -411,7 +411,7 @@ public class ExpressionReadingTests {
         FormalArgumentNode left = method.getArguments().get(0);
         FormalArgumentNode right = method.getArguments().get(1);
         ExpressionStatementNode statement = (ExpressionStatementNode)
-            classNode.getMethods().get(0).getBody().get(0);
+            classNode.getMethods().get(0).getBody().get().get(0);
         assertEquals(
             assign(
                 reference(left),
@@ -430,7 +430,7 @@ public class ExpressionReadingTests {
         FormalArgumentNode left = method.getArguments().get(0);
         FormalArgumentNode right = method.getArguments().get(1);
         ExpressionStatementNode statement = (ExpressionStatementNode)
-            classNode.getMethods().get(0).getBody().get(0);
+            classNode.getMethods().get(0).getBody().get().get(0);
         assertEquals(
             assign(
                 reference(left),
@@ -448,7 +448,7 @@ public class ExpressionReadingTests {
         MethodNode method = classNode.getMethods().get(0);
         FormalArgumentNode argument = method.getArguments().get(0);
         ExpressionStatementNode statement = (ExpressionStatementNode)
-            classNode.getMethods().get(0).getBody().get(0);
+            classNode.getMethods().get(0).getBody().get().get(0);
         assertEquals(
             assign(
                 reference(argument),
diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java
index 3c88424..454dda7 100644
--- a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java
@@ -78,7 +78,7 @@ public class JavaReaderTests {
         assertEquals(TypeName.of("int"), argument.getType());
         assertEquals(1, method.getArguments().size());
         
-        ReturnNode returnNode = (ReturnNode)method.getBody().get(0);
+        ReturnNode returnNode = (ReturnNode)method.getBody().get().get(0);
         assertEquals(reference(argument), returnNode.getValue());
     }
     
@@ -297,7 +297,7 @@ public class JavaReaderTests {
         MethodNode method = classNode.getMethods().get(0);
         assertEquals(
             list(returns(boxInt(literal(1)))),
-            method.getBody());
+            method.getBody().get());
     }
 
     @Test
diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReading.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReading.java
index 408694c..f7d2c85 100644
--- a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReading.java
+++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReading.java
@@ -20,7 +20,7 @@ public class JavaReading {
                 "}";
 
         ClassNode classNode = readClass(javaClass);
-        ReturnNode returnStatement = (ReturnNode) classNode.getMethods().get(0).getBody().get(0);
+        ReturnNode returnStatement = (ReturnNode) classNode.getMethods().get(0).getBody().get().get(0);
         return returnStatement.getValue();
     }
 
@@ -44,7 +44,7 @@ public class JavaReading {
     static List<StatementNode> readStatements(String returnType, String statementsSource) {
         String javaClass = generateMethodSource(returnType, statementsSource);
         ClassNode classNode = readClass(javaClass);
-        return classNode.getMethods().get(0).getBody();
+        return classNode.getMethods().get(0).getBody().get();
     }
 
     static ClassNode readClass(String classBody) {