1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ruby.c (process_options): need to acquire env from TOPLEVEL_BINDING

Browse Source 
each time.
  `bind->env' may update after `eval()'.
  [Bug #7536]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2012-12-21 10:39:59 +00:00
parent a598fcc8c1
commit f4ef96e6a2
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Dec 21 19:37:15 2012 Koichi Sasada <ko1@atdot.net>
* ruby.c (process_options): need to acquire env from TOPLEVEL_BINDING
each time.
`bind->env' may update after `eval()'.
[Bug #7536]
Fri Dec 21 18:46:50 2012 Koichi Sasada <ko1@atdot.net> Fri Dec 21 18:46:50 2012 Koichi Sasada <ko1@atdot.net>
* include/ruby/debug.h, vm_core.h: define rb_trace_arg_t at * include/ruby/debug.h, vm_core.h: define rb_trace_arg_t at

11
ruby.c
View File

@ -559,10 +559,9 @@ require_libraries(VALUE *req_list)
} }
static rb_env_t* static rb_env_t*
toplevel_context(void) toplevel_context(VALUE toplevel_binding)
{ {
rb_env_t *env; rb_env_t *env;
VALUE toplevel_binding = rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING"));
rb_binding_t *bind; rb_binding_t *bind;
GetBindingPtr(toplevel_binding, bind); GetBindingPtr(toplevel_binding, bind);
@ -1308,7 +1307,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
char fbuf[MAXPATHLEN]; char fbuf[MAXPATHLEN];
int i = (int)proc_options(argc, argv, opt, 0); int i = (int)proc_options(argc, argv, opt, 0);
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
rb_env_t *env = 0; VALUE toplevel_binding = Qundef;
argc -= i; argc -= i;
argv += i; argv += i;
@ -1438,9 +1437,10 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
ruby_set_argv(argc, argv); ruby_set_argv(argc, argv);
process_sflag(&opt->sflag); process_sflag(&opt->sflag);
env = toplevel_context(); toplevel_binding = rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING"));
#define PREPARE_PARSE_MAIN(expr) do { \ #define PREPARE_PARSE_MAIN(expr) do { \
rb_env_t *env = toplevel_context(toplevel_binding); \
th->parse_in_eval--; \ th->parse_in_eval--; \
th->base_block = &env->block; \ th->base_block = &env->block; \
expr; \ expr; \
@ -1533,8 +1533,9 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
PREPARE_PARSE_MAIN({ PREPARE_PARSE_MAIN({
VALUE path = Qnil; VALUE path = Qnil;
if (!opt->e_script && strcmp(opt->script, "-")) if (!opt->e_script && strcmp(opt->script, "-")) {
path = rb_realpath_internal(Qnil, opt->script_name, 1); path = rb_realpath_internal(Qnil, opt->script_name, 1);
}
iseq = rb_iseq_new_main(tree, opt->script_name, path); iseq = rb_iseq_new_main(tree, opt->script_name, path);
}); });