From dbd36128ad652c743ecb9331f7c4b9ba4a9fb933 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 30 Jul 2013 01:33:02 +0900 Subject: forget to re-initialize target_class for top-level eval; close #1418 --- src/parse.y | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/parse.y') diff --git a/src/parse.y b/src/parse.y index 9a83d5cbd..168dca9f0 100644 --- a/src/parse.y +++ b/src/parse.y @@ -5207,9 +5207,13 @@ mrb_parse_string(mrb_state *mrb, const char *s, mrbc_context *c) return mrb_parse_nstring(mrb, s, strlen(s), c); } +struct RProc* mrb_proc_new_with_target(mrb_state *mrb, mrb_irep *irep, struct RClass *target); + static mrb_value load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c) { + struct RClass *target = mrb->object_class; + struct RProc *proc; int n; mrb_value v; @@ -5243,8 +5247,11 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c) if (c) { if (c->dump_result) codedump_all(mrb, n); if (c->no_exec) return mrb_fixnum_value(n); + if (c->target_class) target = c->target_class; } - v = mrb_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb)); + proc = mrb_proc_new(mrb, mrb->irep[n]); + proc->target_class = target; + v = mrb_run(mrb, proc, mrb_top_self(mrb)); if (mrb->exc) return mrb_nil_value(); return v; } -- cgit v1.2.3 From 326396a6e365ccaf7692aca216c85693f790ed22 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 31 Jul 2013 00:16:55 +0900 Subject: remove unused mrb_proc_new_with_target() --- src/parse.y | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/parse.y') diff --git a/src/parse.y b/src/parse.y index 168dca9f0..50ba0b1c8 100644 --- a/src/parse.y +++ b/src/parse.y @@ -5207,8 +5207,6 @@ mrb_parse_string(mrb_state *mrb, const char *s, mrbc_context *c) return mrb_parse_nstring(mrb, s, strlen(s), c); } -struct RProc* mrb_proc_new_with_target(mrb_state *mrb, mrb_irep *irep, struct RClass *target); - static mrb_value load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c) { -- cgit v1.2.3 From 7f282429b0a6d8033be44db012d75a571eab7273 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Thu, 1 Aug 2013 11:56:20 +0900 Subject: ci->target_class should be updated as well; #1418 --- src/parse.y | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/parse.y') diff --git a/src/parse.y b/src/parse.y index 50ba0b1c8..4fa9e70de 100644 --- a/src/parse.y +++ b/src/parse.y @@ -5245,10 +5245,15 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c) if (c) { if (c->dump_result) codedump_all(mrb, n); if (c->no_exec) return mrb_fixnum_value(n); - if (c->target_class) target = c->target_class; + if (c->target_class) { + target = c->target_class; + } } proc = mrb_proc_new(mrb, mrb->irep[n]); proc->target_class = target; + if (mrb->c->ci) { + mrb->c->ci->target_class = target; + } v = mrb_run(mrb, proc, mrb_top_self(mrb)); if (mrb->exc) return mrb_nil_value(); return v; -- cgit v1.2.3