Skip to content

M
mruby
Commit 3123549b authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

Fixed a bug in NODE_XSTR code generation; fix #3605

parent 4e84bdb5
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 14 deletions
mrbgems/mruby-compiler/core/codegen.c
View file @ 3123549b
...@@ -2377,9 +2377,7 @@ codegen(codegen_scope *s, node *tree, int val) ...@@ -2377,9 +2377,7 @@ codegen(codegen_scope *s, node *tree, int val)
int ai = mrb_gc_arena_save(s->mrb); int ai = mrb_gc_arena_save(s->mrb);
int sym = new_sym(s, mrb_intern_lit(s->mrb, "Kernel")); int sym = new_sym(s, mrb_intern_lit(s->mrb, "Kernel"));
if (val == NOVAL) { push(); } genop(s, MKOP_A(OP_LOADSELF, cursp()));
genop(s, MKOP_A(OP_OCLASS, cursp()));
genop(s, MKOP_ABx(OP_GETMCNST, cursp(), sym));
push(); push();
codegen(s, tree->car, VAL); codegen(s, tree->car, VAL);
n = tree->cdr; n = tree->cdr;
...@@ -2394,12 +2392,11 @@ codegen(codegen_scope *s, node *tree, int val) ...@@ -2394,12 +2392,11 @@ codegen(codegen_scope *s, node *tree, int val)
push(); push();
n = n->cdr; n = n->cdr;
} }
pop(); push(); /* for block */
pop(); pop_n(3);
sym = new_sym(s, mrb_intern_lit(s->mrb, "`")); sym = new_sym(s, mrb_intern_lit(s->mrb, "`"));
genop(s, MKOP_ABC(OP_SEND, cursp(), sym, 1)); genop(s, MKOP_ABC(OP_SEND, cursp(), sym, 1));
if (val == NOVAL) { pop(); } if (val) push();
else { push(); }
mrb_gc_arena_restore(s->mrb, ai); mrb_gc_arena_restore(s->mrb, ai);
} }
break; break;
...@@ -2409,19 +2406,17 @@ codegen(codegen_scope *s, node *tree, int val) ...@@ -2409,19 +2406,17 @@ codegen(codegen_scope *s, node *tree, int val)
char *p = (char*)tree->car; char *p = (char*)tree->car;
size_t len = (intptr_t)tree->cdr; size_t len = (intptr_t)tree->cdr;
int ai = mrb_gc_arena_save(s->mrb); int ai = mrb_gc_arena_save(s->mrb);
int sym = new_sym(s, mrb_intern_lit(s->mrb, "Kernel"));
int off = new_lit(s, mrb_str_new(s->mrb, p, len)); int off = new_lit(s, mrb_str_new(s->mrb, p, len));
int sym;
if (val == NOVAL) { push(); } genop(s, MKOP_A(OP_LOADSELF, cursp()));
genop(s, MKOP_A(OP_OCLASS, cursp()));
genop(s, MKOP_ABx(OP_GETMCNST, cursp(), sym));
push(); push();
genop(s, MKOP_ABx(OP_STRING, cursp(), off)); genop(s, MKOP_ABx(OP_STRING, cursp(), off));
pop(); push(); push();
pop_n(3);
sym = new_sym(s, mrb_intern_lit(s->mrb, "`")); sym = new_sym(s, mrb_intern_lit(s->mrb, "`"));
genop(s, MKOP_ABC(OP_SEND, cursp(), sym, 1)); genop(s, MKOP_ABC(OP_SEND, cursp(), sym, 1));
if (val == NOVAL) { pop(); } if (val) push();
else { push(); }
mrb_gc_arena_restore(s->mrb, ai); mrb_gc_arena_restore(s->mrb, ai);
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment