resolve conflict; ref #3286

mruby · Nov 25, 2016 · 0b4017f · 0b4017f
2 parents d77b254 + 71641bb
commit 0b4017f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c
@@ -1362,6 +1362,10 @@ codegen(codegen_scope *s, node *tree, int val)
       int pos1, pos2;
       node *e = tree->cdr->cdr->car;
 
+      if (!tree->car) {
+        codegen(s, e, val);
+        return;
+      }
       switch ((intptr_t)tree->car->car) {
       case NODE_TRUE:
       case NODE_INT:

diff --git a/test/t/codegen.rb b/test/t/codegen.rb
@@ -9,3 +9,7 @@ def method
     method(&a &&= 0)
   end
 end
+
+assert('empty condition in ternary expression parses correctly') do
+  assert_equal(() ? 1 : 2, 2)
+end