diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | time.c | 7 |
2 files changed, 12 insertions, 2 deletions
@@ -3,6 +3,13 @@ Fri Dec 4 15:50:18 2009 Shugo Maeda <shugo@ruby-lang.org> * vm_eval.c (yield_under): does not yield self, and passes blockptr instead of &block to vm_cref_push(). [ruby-dev:39833] +Fri Dec 4 15:15:43 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * time.c (num_exact): should not accept strings as operands, even + though they respond to #to_r. ideally, strict rational + conversion should be done by a method like #to_rational, not #to_r. + [ruby-core:23729] + Fri Dec 4 13:10:23 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org> * ext/stringio/stringio.c (ungetc): RDoc updated. trunk allows @@ -214,19 +214,22 @@ num_exact(VALUE v) v = rb_convert_type(v, T_RATIONAL, "Rational", "to_r"); break; + case T_STRING: case T_NIL: goto typeerror; default: { VALUE tmp; - if (!NIL_P(tmp = rb_check_convert_type(v, T_RATIONAL, "Rational", "to_r"))) + if (!NIL_P(tmp = rb_check_convert_type(v, T_RATIONAL, "Rational", "to_r"))) { + if (rb_respond_to(v, rb_intern("to_str"))) goto typeerror; v = tmp; + } else if (!NIL_P(tmp = rb_check_to_integer(v, "to_int"))) v = tmp; else { typeerror: rb_raise(rb_eTypeError, "can't convert %s into an exact number", - rb_obj_classname(v)); + NIL_P(v) ? "nil" : rb_obj_classname(v)); } break; } |