summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-compiler
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2016-11-25 09:24:09 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2016-11-25 09:24:09 +0900
commit0d48a9786f9202f4890df53682117429b9350516 (patch)
tree1697f3afde842fd206bb1a1d15fdcbde45029bff /mrbgems/mruby-compiler
parentd77b25410880f0c79bd215c406ec44a9dac07769 (diff)
parent0b4017fd6918005475ace8f46d5279e18ef49eb6 (diff)
downloadmruby-0d48a9786f9202f4890df53682117429b9350516.tar.gz
mruby-0d48a9786f9202f4890df53682117429b9350516.zip
Merge branch 'bouk-empty-ternary'
Diffstat (limited to 'mrbgems/mruby-compiler')
-rw-r--r--mrbgems/mruby-compiler/core/codegen.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c
index 39d62348a..5f42bf08d 100644
--- 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: