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/load.c | |
| 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/load.c')
| -rw-r--r-- | src/load.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/load.c b/src/load.c index e2f74d504..d6397d652 100644 --- a/src/load.c +++ b/src/load.c @@ -510,7 +510,7 @@ mrb_load_irep(mrb_state *mrb, const uint8_t *bin) irep_error(mrb, n); return mrb_nil_value(); } - return mrb_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb)); + return mrb_context_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb), 0); } #ifdef ENABLE_STDIO @@ -760,6 +760,6 @@ mrb_load_irep_file(mrb_state *mrb, FILE* fp) irep_error(mrb, n); return mrb_nil_value(); } - return mrb_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb)); + return mrb_context_run(mrb, mrb_proc_new(mrb, mrb->irep[n]), mrb_top_self(mrb), 0); } #endif /* ENABLE_STDIO */ |