yugui	2009-01-20 18:52:51 +0900 (Tue, 20 Jan 2009)

  New Revision: 21689

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21689

  Log:
    merges r21661 from trunk into ruby_1_9_1.
    * ruby.c (require_libraries): reset th->parse_in_eval while
      loading libraries.  fixes [ruby-dev:37780]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ruby.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21688)
+++ ruby_1_9_1/ChangeLog	(revision 21689)
@@ -1,3 +1,8 @@
+Mon Jan 19 13:34:25 2009  Koichi Sasada  <ko1@a...>
+
+	* 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@y...>
 
 	* lib/erb.rb: changes style of the rdoc for suppressing
Index: ruby_1_9_1/ruby.c
===================================================================
--- ruby_1_9_1/ruby.c	(revision 21688)
+++ ruby_1_9_1/ruby.c	(revision 21689)
@@ -455,7 +455,9 @@
     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 @@
 	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;
 }
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/