From a48197605690ffae0aad4856b6278f7032810bef Mon Sep 17 00:00:00 2001 From: ksss Date: Sun, 16 Mar 2014 21:06:08 +0900 Subject: fix bool number to macro --- src/object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/object.c b/src/object.c index 5090e38cf..6d39254dd 100644 --- a/src/object.c +++ b/src/object.c @@ -338,7 +338,7 @@ mrb_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const char mrb_value v; if (mrb_type(val) == type) return val; - v = convert_type(mrb, val, tname, method, 1/*Qtrue*/); + v = convert_type(mrb, val, tname, method, TRUE); if (mrb_type(v) != type) { mrb_raisef(mrb, E_TYPE_ERROR, "%S cannot be converted to %S by #%S", val, mrb_str_new_cstr(mrb, tname), mrb_str_new_cstr(mrb, method)); @@ -352,7 +352,7 @@ mrb_check_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const mrb_value v; if (mrb_type(val) == type && type != MRB_TT_DATA) return val; - v = convert_type(mrb, val, tname, method, 0/*Qfalse*/); + v = convert_type(mrb, val, tname, method, FALSE); if (mrb_nil_p(v) || mrb_type(v) != type) return mrb_nil_value(); return v; } -- cgit v1.2.3 From e9f3dca0f44003e0fe787101d47cd816393e7767 Mon Sep 17 00:00:00 2001 From: ksss Date: Sun, 16 Mar 2014 22:52:25 +0900 Subject: fix bug when `0 + other object` --- src/numeric.c | 2 +- test/t/integer.rb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/numeric.c b/src/numeric.c index 38a05ae92..0927abee2 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -1131,10 +1131,10 @@ mrb_fixnum_plus(mrb_state *mrb, mrb_value x, mrb_value y) mrb_int a; a = mrb_fixnum(x); - if (a == 0) return y; if (mrb_fixnum_p(y)) { mrb_int b, c; + if (a == 0) return y; b = mrb_fixnum(y); c = a + b; if (((a < 0) ^ (b < 0)) == 0 && (a < 0) != (c < 0)) { diff --git a/test/t/integer.rb b/test/t/integer.rb index 2bffce5a9..f7a9eb8dd 100644 --- a/test/t/integer.rb +++ b/test/t/integer.rb @@ -15,6 +15,9 @@ assert('Integer#+', '15.2.8.3.1') do assert_equal 2, a assert_equal 2.0, b + + assert_raise(TypeError){ 0+nil } + assert_raise(TypeError){ 1+nil } end assert('Integer#-', '15.2.8.3.2') do -- cgit v1.2.3 From 9dcce29749db652ca22a3ffb28a56c1c0f04572d Mon Sep 17 00:00:00 2001 From: ksss Date: Sun, 16 Mar 2014 23:08:31 +0900 Subject: fix bug when `0 * other object` --- src/numeric.c | 2 +- test/t/integer.rb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/numeric.c b/src/numeric.c index 38a05ae92..af293b1fb 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -690,10 +690,10 @@ mrb_fixnum_mul(mrb_state *mrb, mrb_value x, mrb_value y) mrb_int a; a = mrb_fixnum(x); - if (a == 0) return x; if (mrb_fixnum_p(y)) { mrb_int b, c; + if (a == 0) return x; b = mrb_fixnum(y); if (FIT_SQRT_INT(a) && FIT_SQRT_INT(b)) return mrb_fixnum_value(a*b); diff --git a/test/t/integer.rb b/test/t/integer.rb index 2bffce5a9..486224c85 100644 --- a/test/t/integer.rb +++ b/test/t/integer.rb @@ -31,6 +31,9 @@ assert('Integer#*', '15.2.8.3.3') do assert_equal 1, a assert_equal 1.0, b + + assert_raise(TypeError){ 0*nil } + assert_raise(TypeError){ 1*nil } end assert('Integer#/', '15.2.8.3.4') do -- cgit v1.2.3 From 0fab9d557e62a364b0d2d7563c502e07ed53c227 Mon Sep 17 00:00:00 2001 From: ksss Date: Sun, 16 Mar 2014 23:39:58 +0900 Subject: float + nil should be raise TypeError --- src/numeric.c | 11 +++++------ test/t/float.rb | 3 +++ 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/numeric.c b/src/numeric.c index 38a05ae92..e2af14b97 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -1306,15 +1306,14 @@ num_cmp(mrb_state *mrb, mrb_value self) * and other. */ static mrb_value -flo_plus(mrb_state *mrb, mrb_value self) +flo_plus(mrb_state *mrb, mrb_value x) { - mrb_float x, y; - - x = mrb_float(self); - mrb_get_args(mrb, "f", &y); + mrb_value y; - return mrb_float_value(mrb, x + y); + mrb_get_args(mrb, "o", &y); + return mrb_float_value(mrb, mrb_float(x) + mrb_to_flo(mrb, y)); } + /* ------------------------------------------------------------------------*/ void mrb_init_numeric(mrb_state *mrb) diff --git a/test/t/float.rb b/test/t/float.rb index b50b1e175..c817e01da 100644 --- a/test/t/float.rb +++ b/test/t/float.rb @@ -15,6 +15,9 @@ assert('Float#+', '15.2.9.3.1') do assert_float(3.123456789, a) assert_float(4.123456789, b) + + assert_raise(TypeError){ 0.0+nil } + assert_raise(TypeError){ 1.0+nil } end assert('Float#-', '15.2.9.3.2') do -- cgit v1.2.3