diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-11-25 09:33:20 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-11-25 09:33:20 +0900 |
| commit | 55842c5a3482d507bae16f14f563a5eadfa0b720 (patch) | |
| tree | 410dcc9689d96e13a49b735eb85a4ed0b663670c /mrbgems/mruby-compiler/core/codegen.c | |
| parent | d3ff9d31f0ee3775b5ed722515933aa7e79f7659 (diff) | |
| parent | 73e4f069becaf69707b990d658b34155f8973508 (diff) | |
| download | mruby-55842c5a3482d507bae16f14f563a5eadfa0b720.tar.gz mruby-55842c5a3482d507bae16f14f563a5eadfa0b720.zip | |
resolve conflict; ref #3279
Diffstat (limited to 'mrbgems/mruby-compiler/core/codegen.c')
| -rw-r--r-- | mrbgems/mruby-compiler/core/codegen.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c index 25db887a0..553baa116 100644 --- a/mrbgems/mruby-compiler/core/codegen.c +++ b/mrbgems/mruby-compiler/core/codegen.c @@ -2295,7 +2295,11 @@ codegen(codegen_scope *s, node *tree, int val) if (val) { node *n = tree; - if (!n) break; + if (!n) { + genop(s, MKOP_A(OP_LOADNIL, cursp())); + push(); + break; + } codegen(s, n->car, VAL); n = n->cdr; while (n) { |