From d3a0ec7636402bfe2f9c9d97d2a910fbca8db51a Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 24 May 2005 15:24:23 +0000 Subject: * numeric.c (fix_pow): support Fixnum ** Float case directly without coercing. [ruby-talk:142697] [ruby-talk:143054] * ruby.c (require_libraries): caused SEGV when continuation jumped in to the required library code. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 11 +++++++++++ lib/debug.rb | 9 +++++++++ numeric.c | 3 +++ ruby.c | 5 ++++- 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4862f6d83f..eb44f81d66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue May 24 23:42:16 2005 Yukihiro Matsumoto + + * numeric.c (fix_pow): support Fixnum ** Float case directly + without coercing. [ruby-talk:142697] [ruby-talk:143054] + +Tue May 24 16:57:24 2005 Yukihiro Matsumoto + + * ruby.c (require_libraries): caused SEGV when continuation jumped + in to the required library code. + Tue May 24 17:45:59 2005 Shugo Maeda * test/readline/test_readline.rb: do not test libedit. @@ -27,6 +37,7 @@ Mon May 23 15:07:34 2005 NAKAMURA Usaku * win32/Makefile.sub ($(PROGRAM)): add dependency on $(LIBRUBY_SO). [experimental] +>>>>>>> 1.4263 Mon May 23 12:21:37 2005 Yukihiro Matsumoto * re.c (make_regexp): should not return junk address during diff --git a/lib/debug.rb b/lib/debug.rb index cd2025fc13..356a72a11b 100644 --- a/lib/debug.rb +++ b/lib/debug.rb @@ -255,6 +255,12 @@ class Context def debug_command(file, line, id, binding) MUTEX.lock + unless $debugger_restart + callcc{|c| $debugger_restart = c} + at_exit { + $debugger_restart.call + } + end set_last_thread(Thread.current) frame_pos = 0 binding_file = file @@ -524,6 +530,9 @@ class Context when /^\s*p\s+/ stdout.printf "%s\n", debug_eval($', binding).inspect + when /^\s*r(?:estart)?$/ + $debugger_restart.call + when /^\s*h(?:elp)?$/ debug_print_help() diff --git a/numeric.c b/numeric.c index e3f29ea46e..86c180ccd3 100644 --- a/numeric.c +++ b/numeric.c @@ -2197,6 +2197,9 @@ fix_pow(x, y) return rb_big_pow(rb_int2big(a), y); } return rb_float_new(pow((double)a, (double)b)); + } else if (TYPE(y) == T_FLOAT) { + long a = FIX2LONG(x); + return rb_float_new(pow((double)a, RFLOAT(y)->value)); } return rb_num_coerce_bin(x, y); } diff --git a/ruby.c b/ruby.c index 736f585f27..f3888c8ae8 100644 --- a/ruby.c +++ b/ruby.c @@ -385,8 +385,11 @@ require_libraries() ruby_set_current_source(); req_list_last = 0; while (list) { + int state; + ruby_current_node = 0; - rb_require(list->name); + rb_protect((VALUE (*)(VALUE))rb_require, (VALUE)list->name, &state); + if (state) rb_jump_tag(state); tmp = list->next; free(list->name); free(list); -- cgit v1.2.3