diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-11-25 09:25:51 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-11-25 09:25:51 +0900 |
| commit | cc2786c84e048123e4bce40cf4ea06ac172de5a4 (patch) | |
| tree | 302461ab1ffd553429d0e952815030d065ac9e59 /mrbgems/mruby-compiler | |
| parent | 0d48a9786f9202f4890df53682117429b9350516 (diff) | |
| parent | 12539825773ddb13fac38091d13341b816ac23fa (diff) | |
| download | mruby-cc2786c84e048123e4bce40cf4ea06ac172de5a4.tar.gz mruby-cc2786c84e048123e4bce40cf4ea06ac172de5a4.zip | |
resolve conflict; ref #3285
Diffstat (limited to 'mrbgems/mruby-compiler')
| -rw-r--r-- | mrbgems/mruby-compiler/core/codegen.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c index 5f42bf08d..8de15aee3 100644 --- a/mrbgems/mruby-compiler/core/codegen.c +++ b/mrbgems/mruby-compiler/core/codegen.c @@ -2030,6 +2030,7 @@ codegen(codegen_scope *s, node *tree, int val) } genop(s, MKOP_sBx(OP_JMP, s->loop->pc2 - s->pc)); } + if (val) push(); break; case NODE_RETRY: @@ -2064,6 +2065,7 @@ codegen(codegen_scope *s, node *tree, int val) genop(s, MKOP_sBx(OP_JMP, lp->pc1 - s->pc)); } } + if (val) push(); } break; |