summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-06-28 16:00:59 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2017-06-28 16:00:59 +0900
commit15945e14b91151e5d52f26ea76cb511f0d98fa03 (patch)
tree3b0acd6c5df4756d471f19b3356f51b2baba248c
parentf0abd4241f2a8087db4c460cf4b1f531c17c1404 (diff)
downloadmruby-15945e14b91151e5d52f26ea76cb511f0d98fa03.tar.gz
mruby-15945e14b91151e5d52f26ea76cb511f0d98fa03.zip
Revert "Make `mrb_load_exec` a static function."
This reverts commit 7944d9a6d4ccb94189f37d307d384ed1cfe33e17. Because it voids #3248 and #3331. But we should add better way to check whether compile errors occur without duplicated callings.
-rw-r--r--include/mruby/compile.h1
-rw-r--r--mrbgems/mruby-compiler/core/parse.y2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/mruby/compile.h b/include/mruby/compile.h
index 459d88596..ad3f19db1 100644
--- a/include/mruby/compile.h
+++ b/include/mruby/compile.h
@@ -175,6 +175,7 @@ MRB_API struct mrb_parser_state* mrb_parse_file(mrb_state*,FILE*,mrbc_context*);
MRB_API struct mrb_parser_state* mrb_parse_string(mrb_state*,const char*,mrbc_context*);
MRB_API struct mrb_parser_state* mrb_parse_nstring(mrb_state*,const char*,int,mrbc_context*);
MRB_API struct RProc* mrb_generate_code(mrb_state*, struct mrb_parser_state*);
+MRB_API mrb_value mrb_load_exec(mrb_state *mrb, struct mrb_parser_state *p, mrbc_context *c);
/* program load functions */
#ifndef MRB_DISABLE_STDIO
diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
index b5893ae13..1266bb8f5 100644
--- a/mrbgems/mruby-compiler/core/parse.y
+++ b/mrbgems/mruby-compiler/core/parse.y
@@ -5765,7 +5765,7 @@ mrb_parse_string(mrb_state *mrb, const char *s, mrbc_context *c)
return mrb_parse_nstring(mrb, s, strlen(s), c);
}
-static mrb_value
+MRB_API mrb_value
mrb_load_exec(mrb_state *mrb, struct mrb_parser_state *p, mrbc_context *c)
{
struct RClass *target = mrb->object_class;