summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--ruby.c5
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ab924b454..5522aac7ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 11 19:10:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (require_libraries): restore source file/line after
+ statically linked extensions initialized.
+
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>
Fri Apr 9 17:05:21 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
@@ -28,7 +33,7 @@ Fri Apr 9 17:05:21 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* dir.c (find_dirsep): escaped slash '\/' loses its meaning as
directory separator in Dir.glob.
- [ruby-dev:23291]
+ [ruby-dev:23291]
Thu Apr 8 20:25:19 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
diff --git a/ruby.c b/ruby.c
index 3e46c4a911..e733bf1b6a 100644
--- a/ruby.c
+++ b/ruby.c
@@ -346,11 +346,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_BEGIN(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;