1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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/branches/ruby_1_8@8515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2005-05-24 14:52:05 +00:00
parent df18044d22
commit c33063f42d
3 changed files with 17 additions and 1 deletions

View file

@ -1,3 +1,13 @@
Tue May 24 23:42:16 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* 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 <matz@ruby-lang.org>
* ruby.c (require_libraries): caused SEGV when continuation jumped
in to the required library code.
Tue May 24 11:56:25 2005 WATANABE Hirofumi <eban@ruby-lang.org>
* lib/getopts.rb: should warn only if verbose mode.

View file

@ -2196,6 +2196,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);
}

5
ruby.c
View file

@ -350,8 +350,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);