diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-12-07 06:34:50 -0800 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-12-07 06:34:50 -0800 |
| commit | b6cc3aca333b8692909c829be7d69bbc556118b4 (patch) | |
| tree | de6b665e6f82e26b3053e674676466a3a152fa3d | |
| parent | 4b82cadfcb4316ef7e3381b275c53c1de21859a9 (diff) | |
| parent | 853e26e16a0f95553cdf4ac65ae4a181a03edb0e (diff) | |
| download | mruby-b6cc3aca333b8692909c829be7d69bbc556118b4.tar.gz mruby-b6cc3aca333b8692909c829be7d69bbc556118b4.zip | |
Merge pull request #1605 from suzukaze/test-array
Fix ISO no in Array#* and Array#+
| -rw-r--r-- | src/array.c | 4 | ||||
| -rw-r--r-- | test/t/array.rb | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/array.c b/src/array.c index 41674bc54..0fb257d7e 100644 --- a/src/array.c +++ b/src/array.c @@ -1124,8 +1124,8 @@ mrb_init_array(mrb_state *mrb) mrb_define_class_method(mrb, a, "[]", mrb_ary_s_create, MRB_ARGS_ANY()); /* 15.2.12.4.1 */ - mrb_define_method(mrb, a, "*", mrb_ary_times, MRB_ARGS_REQ(1)); /* 15.2.12.5.1 */ - mrb_define_method(mrb, a, "+", mrb_ary_plus, MRB_ARGS_REQ(1)); /* 15.2.12.5.2 */ + mrb_define_method(mrb, a, "+", mrb_ary_plus, MRB_ARGS_REQ(1)); /* 15.2.12.5.1 */ + mrb_define_method(mrb, a, "*", mrb_ary_times, MRB_ARGS_REQ(1)); /* 15.2.12.5.2 */ mrb_define_method(mrb, a, "<<", mrb_ary_push_m, MRB_ARGS_REQ(1)); /* 15.2.12.5.3 */ mrb_define_method(mrb, a, "[]", mrb_ary_aget, MRB_ARGS_ANY()); /* 15.2.12.5.4 */ mrb_define_method(mrb, a, "[]=", mrb_ary_aset, MRB_ARGS_ANY()); /* 15.2.12.5.5 */ diff --git a/test/t/array.rb b/test/t/array.rb index 1125ee98c..643a975b0 100644 --- a/test/t/array.rb +++ b/test/t/array.rb @@ -17,7 +17,11 @@ assert('Array.[]', '15.2.12.4.1') do assert_equal([1, 2, 3], Array.[](1,2,3)) end -assert('Array#*', '15.2.12.5.1') do +assert('Array#+', '15.2.12.5.1') do + assert_equal([1, 1], [1].+([1])) +end + +assert('Array#*', '15.2.12.5.2') do assert_raise(ArgumentError) do # this will cause an exception due to the wrong argument [1].*(-1) @@ -26,10 +30,6 @@ assert('Array#*', '15.2.12.5.1') do assert_equal([], [1].*(0)) end -assert('Array#+', '15.2.12.5.2') do - assert_equal([1, 1], [1].+([1])) -end - assert('Array#<<', '15.2.12.5.3') do assert_equal([1, 1], [1].<<(1)) end |