1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Numeral#step should raise TypeError if a non-numeric parameter is given.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42785 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2013-09-02 22:39:22 +00:00
parent 3065dd71e8
commit 4993cf9e24
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Sep 3 07:31:29 2013 Akinori MUSHA <knu@iDaemons.org>
* numeric.c (NUM_STEP_SCAN_ARGS): Numeral#step should raise
TypeError if a non-numeric parameter is given.
Tue Sep 3 07:28:49 2013 Tanaka Akira <akr@fsij.org> Tue Sep 3 07:28:49 2013 Tanaka Akira <akr@fsij.org>
* internal.h (bit_length): Add casts to fix complation error with * internal.h (bit_length): Add casts to fix complation error with

18
numeric.c
View File

@ -1858,9 +1858,23 @@ ruby_num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl)
rb_raise(rb_eArgError, "step can't be 0"); \ rb_raise(rb_eArgError, "step can't be 0"); \
} \ } \
} \ } \
if (NIL_P(step)) step = INT2FIX(1); \ if (NIL_P(step)) { \
step = INT2FIX(1); \
} \
else { \
if (!rb_obj_is_kind_of(step, rb_cNumeric)) { \
rb_raise(rb_eTypeError, "step must be numeric"); \
} \
} \
desc = negative_int_p(step); \ desc = negative_int_p(step); \
if (NIL_P(to)) to = desc ? DBL2NUM(-INFINITY) : DBL2NUM(INFINITY); \ if (NIL_P(to)) { \
to = desc ? DBL2NUM(-INFINITY) : DBL2NUM(INFINITY); \
} \
else { \
if (!rb_obj_is_kind_of(to, rb_cNumeric)) { \
rb_raise(rb_eTypeError, "limit must be numeric"); \
} \
} \
if (TYPE(to) == T_FLOAT) { \ if (TYPE(to) == T_FLOAT) { \
double f = RFLOAT_VALUE(to); \ double f = RFLOAT_VALUE(to); \
inf = isinf(f) && (signbit(f) ? desc : !desc); \ inf = isinf(f) && (signbit(f) ? desc : !desc); \