* ruby.c (require_libraries): reset th->parse_in_eval while
loading libraries. fixes [ruby-dev:37780] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9b520ddcec
commit
d31e1d4a52
@ -1,3 +1,8 @@
|
|||||||
|
Mon Jan 19 13:34:25 2009 Koichi Sasada <ko1@atdot.net>
|
||||||
|
|
||||||
|
* ruby.c (require_libraries): reset th->parse_in_eval while
|
||||||
|
loading libraries. fixes [ruby-dev:37780]
|
||||||
|
|
||||||
Mon Jan 19 11:46:39 2009 Koichi Sasada <ko1@atdot.net>
|
Mon Jan 19 11:46:39 2009 Koichi Sasada <ko1@atdot.net>
|
||||||
|
|
||||||
* vm_eval.c, eval.c (rb_f_block_given_p): move definition of
|
* vm_eval.c, eval.c (rb_f_block_given_p): move definition of
|
||||||
|
4
ruby.c
4
ruby.c
@ -458,7 +458,9 @@ require_libraries(struct cmdline_options *opt)
|
|||||||
ID require;
|
ID require;
|
||||||
rb_thread_t *th = GET_THREAD();
|
rb_thread_t *th = GET_THREAD();
|
||||||
rb_block_t *prev_base_block = th->base_block;
|
rb_block_t *prev_base_block = th->base_block;
|
||||||
|
int prev_parse_in_eval = th->parse_in_eval;
|
||||||
th->base_block = 0;
|
th->base_block = 0;
|
||||||
|
th->parse_in_eval = 0;
|
||||||
|
|
||||||
Init_ext(); /* should be called here for some reason :-( */
|
Init_ext(); /* should be called here for some reason :-( */
|
||||||
CONST_ID(require, "require");
|
CONST_ID(require, "require");
|
||||||
@ -467,6 +469,8 @@ require_libraries(struct cmdline_options *opt)
|
|||||||
rb_funcall2(rb_vm_top_self(), require, 1, &feature);
|
rb_funcall2(rb_vm_top_self(), require, 1, &feature);
|
||||||
}
|
}
|
||||||
opt->req_list = 0;
|
opt->req_list = 0;
|
||||||
|
|
||||||
|
th->parse_in_eval = prev_parse_in_eval;
|
||||||
th->base_block = prev_base_block;
|
th->base_block = prev_base_block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user