Merge pull request #3564 from okkez/set-proper-class-to-subclass-of-array

Set proper class to subclass of Array

2 files changed, 15 insertions, 2 deletions

diff --git a/src/array.c b/src/array.c
index 6fb7f1384..94dce2ddb 100644
--- a/src/array.c
+++ b/src/array.c
@@ -242,14 +242,19 @@ mrb_ary_resize(mrb_state *mrb, mrb_value ary, mrb_int new_len)
 }
 
 static mrb_value
-mrb_ary_s_create(mrb_state *mrb, mrb_value self)
+mrb_ary_s_create(mrb_state *mrb, mrb_value klass)
 {
+  mrb_value ary;
   mrb_value *vals;
   mrb_int len;
+  struct RArray *a;
 
   mrb_get_args(mrb, "*", &vals, &len);
+  ary = mrb_ary_new_from_values(mrb, len, vals);
+  a = mrb_ary_ptr(ary);
+  a->c = mrb_class_ptr(klass);
 
-  return mrb_ary_new_from_values(mrb, len, vals);
+  return ary;
 }
 
 static void
diff --git a/test/t/array.rb b/test/t/array.rb
index cf7ed4704..4efc5166a 100644
--- a/test/t/array.rb
+++ b/test/t/array.rb
@@ -13,6 +13,14 @@ assert('Array.[]', '15.2.12.4.1') do
   assert_equal([1, 2, 3], Array.[](1,2,3))
 end
 
+class SubArray < Array
+end
+
+assert('SubArray.[]') do
+  a = SubArray[1, 2, 3]
+  assert_equal(SubArray, a.class)
+end
+
 assert('Array#+', '15.2.12.5.1') do
   assert_equal([1, 1], [1].+([1]))
 end