diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-11-05 00:13:01 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-11-05 00:13:01 +0900 |
| commit | f80401de6c9b7dd9e0676c4414aae7a6e033ac5f (patch) | |
| tree | 27663cfee57ca8652671087e01b99d69f814a32a /src/parse.y | |
| parent | e386760cc7b7958a8948b0a23b35b3a9df30c354 (diff) | |
| parent | 82c5b486e0d788aa7a391574c59959da2216990e (diff) | |
| download | mruby-f80401de6c9b7dd9e0676c4414aae7a6e033ac5f.tar.gz mruby-f80401de6c9b7dd9e0676c4414aae7a6e033ac5f.zip | |
resolved conflicts and updated to latest return value change of mrb_generate_code()
Diffstat (limited to 'src/parse.y')
| -rw-r--r-- | src/parse.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/parse.y b/src/parse.y index d82e21dfb..168850bcc 100644 --- a/src/parse.y +++ b/src/parse.y @@ -5387,7 +5387,7 @@ load_exec(mrb_state *mrb, parser_state *p, mrbc_context *c) if (mrb->c->ci) { mrb->c->ci->target_class = target; } - v = mrb_run(mrb, proc, mrb_top_self(mrb)); + v = mrb_context_run(mrb, proc, mrb_top_self(mrb), 0); if (mrb->exc) return mrb_nil_value(); return v; } |