diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ruby.c | 4 |
2 files changed, 9 insertions, 0 deletions
@@ -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] + Sat Jan 17 21:04:27 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> * lib/erb.rb: changes style of the rdoc for suppressing @@ -455,7 +455,9 @@ require_libraries(struct cmdline_options *opt) ID require; rb_thread_t *th = GET_THREAD(); rb_block_t *prev_base_block = th->base_block; + int prev_parse_in_eval = th->parse_in_eval; th->base_block = 0; + th->parse_in_eval = 0; Init_ext(); /* should be called here for some reason :-( */ CONST_ID(require, "require"); @@ -464,6 +466,8 @@ require_libraries(struct cmdline_options *opt) rb_funcall2(rb_vm_top_self(), require, 1, &feature); } opt->req_list = 0; + + th->parse_in_eval = prev_parse_in_eval; th->base_block = prev_base_block; } |