diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | time.c | 24 |
2 files changed, 20 insertions, 9 deletions
@@ -1,3 +1,8 @@ +Sat May 3 18:10:54 2008 Tanaka Akira <akr@fsij.org> + + * time.c (time_timespec): raise TypeError for nil and other objects + which has no divmod method. + Fri May 2 23:59:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (internal_read_func, internal_write_func): split from @@ -217,18 +217,24 @@ time_timespec(VALUE num, int interval) break; default: - ary = rb_check_array_type(rb_funcall(num, id_divmod, 1, INT2FIX(1))); - if (NIL_P(ary)) { + if (rb_respond_to(num, id_divmod)) { + ary = rb_check_array_type(rb_funcall(num, id_divmod, 1, INT2FIX(1))); + if (NIL_P(ary)) { + goto typeerror; + } + i = rb_ary_entry(ary, 0); + f = rb_ary_entry(ary, 1); + t.tv_sec = NUM2LONG(i); + if (interval && t.tv_sec < 0) + rb_raise(rb_eArgError, "%s must be positive", tstr); + f = rb_funcall(f, id_mul, 1, INT2FIX(1000000000)); + t.tv_nsec = NUM2LONG(f); + } + else { +typeerror: rb_raise(rb_eTypeError, "can't convert %s into %s", rb_obj_classname(num), tstr); } - i = rb_ary_entry(ary, 0); - f = rb_ary_entry(ary, 1); - t.tv_sec = NUM2LONG(i); - if (interval && t.tv_sec < 0) - rb_raise(rb_eArgError, "%s must be positive", tstr); - f = rb_funcall(f, id_mul, 1, INT2FIX(1000000000)); - t.tv_nsec = NUM2LONG(f); break; } return t; |