admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1605 from suzukaze/test-array

Browse Source 
Fix ISO no in Array#* and Array#+
This commit is contained in:
Yukihiro "Matz" Matsumoto
2013-12-07 06:34:50 -08:00
parent 4b82cadfcb 853e26e16a
commit b6cc3aca33
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/array.c
+2 -2
View File
@@ -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 */
test/t/array.rb
+5 -5
View File
@@ -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