From 15e441ba197d5cf0ae45823439aaaecec7d5435e Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 13 Feb 2016 15:28:52 +0000
Subject: Read if statements without else clause

---
 .../zwobble/couscous/frontends/java/JavaStatementReader.java |  5 ++++-
 .../couscous/tests/frontends/java/JavaReaderTests.java       | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaStatementReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaStatementReader.java
index 41629bd..fb40ed3 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaStatementReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaStatementReader.java
@@ -89,10 +89,13 @@ class JavaStatementReader {
     }
 
     private StatementNode readIfStatement(IfStatement statement) {
+        List<StatementNode> falseBranch = statement.getElseStatement() == null
+            ? list()
+            : readStatement(statement.getElseStatement());
         return ifStatement(
             readExpression(BooleanValue.REF, statement.getExpression()),
             readStatement(statement.getThenStatement()),
-            readStatement(statement.getElseStatement()));
+            falseBranch);
     }
 
     private List<StatementNode> readSwitchStatement(SwitchStatement switchStatement) {
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 d70f911..de659d3 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
@@ -589,6 +589,18 @@ public class JavaReaderTests {
             readStatement("int", "if (true) { return 1; } else { return 2; }"));
     }
 
+    @Test
+    public void canReadIfStatementsWithoutElse() {
+        assertEquals(
+            list(
+                ifStatement(
+                    literal(true),
+                    list(returns(literal(1))),
+                    list()),
+                returns(literal(2))),
+            readStatements("int", "if (true) { return 1; } return 2;"));
+    }
+
     @Test
     public void canReadWhileLoops() {
         assertEquals(
-- 
cgit v1.2.3