* ruby.c (require_libraries): restore source file/line after

  statically linked extensions initialized.  [ruby-dev:23357]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6137 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 17 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 62b72033fc..e1f7f632ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 11 19:12:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (require_libraries): restore source file/line after
+	  statically linked extensions initialized.  [ruby-dev:23357]
+
 Sun Apr 11 10:47:04 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/code_objects.rb (RDoc::TopLevel::add_class_or_module): Toplevel
@@ -11,7 +16,7 @@ Sat Apr 10 23:51:13 2004  Dave Thomas  <dave@pragprog.com>
 
 Sat Apr 10 00:00:19 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/rdoc/markup/simple_markup/inline.rb: Fix problem 
+	* lib/rdoc/markup/simple_markup/inline.rb: Fix problem
 	  with \_cat_<b>dog</b>
 
 Wed Apr  7 00:19:50 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
@@ -59,7 +64,7 @@ Sun Apr  4 14:01:20 2004  Dave Thomas  <dave@pragprog.com>
 
 Sat Apr  3 17:11:05 2004  why the lucky stiff  <why@ruby-lang.org>
 
-	* ext/syck/syck.h: version 0.43. 
+	* ext/syck/syck.h: version 0.43.
 
 	* ext/syck/lib/gram.c: allow root-level inline collections.
 	 [ruby-talk:94922]
@@ -99,8 +104,8 @@ Fri Apr  2 07:31:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 Thu Apr  1 19:58:37 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/soap/mapping/{factory.rb,registry.rb}: fixed illegal mapped URI
-          object with soap/marshal.
-          added URIFactory class for URI mapping.  BasetypeFactory checks
+	  object with soap/marshal.
+	  added URIFactory class for URI mapping.  BasetypeFactory checks
 
 Thu Apr  1 22:55:33 2004  Dave Thomas  <dave@pragprog.com>
 
@@ -114,12 +119,12 @@ Thu Apr  1 22:55:04 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_options.rb: Fix undefined variable warning.
 
-          instance_variables when original mapping is not allowed (ivar must
-          be empty).  Instance of URI have instance_variables but it must be
-          llowed whenever original mapping is allowed or not.
+	  instance_variables when original mapping is not allowed (ivar must
+	  be empty).  Instance of URI have instance_variables but it must be
+	  llowed whenever original mapping is allowed or not.
 
 	* lib/xsd/datatypes.rb: check the smallest positive non-zero
-          single-precision float exactly instead of packing with "f".
+	  single-precision float exactly instead of packing with "f".
 	  [ruby-talk:88822]
 
 	* lib/soap/mapping/rubytypeFactory.rb: should not dump singleton class.
diff --git a/ruby.c b/ruby.c
index f2d368d8b5..f96a0b47e9 100644
--- a/ruby.c
+++ b/ruby.c
@@ -340,11 +340,14 @@ require_libraries()
     struct req_list *list = req_list_head.next;
     struct req_list *tmp;
 
-    Init_ext();		/* should be called here for some reason :-( */
     save[0] = ruby_eval_tree;
     save[1] = ruby_eval_tree_begin;
     save[2] = NEW_NEWLINE(0);
     ruby_eval_tree = ruby_eval_tree_begin = 0;
+    ruby_current_node = 0;
+    Init_ext();		/* should be called here for some reason :-( */
+    ruby_current_node = save[2];
+    ruby_set_current_source();
     req_list_last = 0;
     while (list) {
 	ruby_current_node = 0;