Merge pull request #834 from null-a/fix-790

Fix top level use of `else if`
probmods · Apr 21, 2017 · 02fa610 · 02fa610
2 parents 83adc18 + 31c4a45
commit 02fa610
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/syntax.js b/src/syntax.js
@@ -109,7 +109,7 @@ function returnify(nodes) {
         return build.ifStatement(
             test,
             build.blockStatement(returnify(consequent.body)),
-            alternate === null ? null : build.blockStatement(returnify(alternate.body)));
+            alternate === null ? null : build.blockStatement(returnify([alternate])));
       }),
       clause(Syntax.ReturnStatement, function(argument) {
         return build.returnStatement(argument);

diff --git a/tests/test-transforms.js b/tests/test-transforms.js
@@ -525,7 +525,27 @@ var tests = {
              '  };' +
              '};' +
              'foo(10);'),
-      expected: 1 }
+      expected: 1 },
+
+    { name: 'testTopLevelIf1',
+      code: 'if (true) { 1 }',
+      expected: 1
+    },
+
+    { name: 'testTopLevelIf2',
+      code: 'if (false) { 1 } else { 2 }',
+      expected: 2
+    },
+
+    { name: 'testTopLevelIf3',
+      code: 'if (false) { 1 } else if (true) { 2 }',
+      expected: 2
+    },
+
+    { name: 'testTopLevelIf4',
+      code: 'if (false) { 1 } else if (false) { 2 } else { 3 }',
+      expected: 3
+    }
 
   ],