diff options
| -rw-r--r-- | src/class.c | 21 | ||||
| -rw-r--r-- | test/t/module.rb | 30 |
2 files changed, 33 insertions, 18 deletions
diff --git a/src/class.c b/src/class.c index 338b01e3d..2784327f3 100644 --- a/src/class.c +++ b/src/class.c @@ -721,6 +721,26 @@ mrb_mod_include(mrb_state *mrb, mrb_value klass) } static mrb_value +mrb_mod_ancestors(mrb_state *mrb, mrb_value self) +{ + mrb_value result; + struct RClass *c = mrb_class_ptr(self); + + result = mrb_ary_new(mrb); + while (c) { + if (c->tt == MRB_TT_ICLASS) { + mrb_ary_push(mrb, result, mrb_obj_value(c->c)); + } + else { + mrb_ary_push(mrb, result, mrb_obj_value(c)); + } + c = c->super; + } + + return result; +} + +static mrb_value mrb_mod_extend_object(mrb_state *mrb, mrb_value mod) { mrb_value obj; @@ -1413,6 +1433,7 @@ mrb_init_class(mrb_state *mrb) mrb_define_method(mrb, mod, "to_s", mrb_mod_to_s, ARGS_NONE()); mrb_define_method(mrb, mod, "alias_method", mrb_mod_alias, ARGS_ANY()); /* 15.2.2.4.8 */ + mrb_define_method(mrb, mod, "ancestors", mrb_mod_ancestors, ARGS_NONE()); /* 15.2.2.4.9 */ mrb_define_method(mrb, mod, "undef_method", mrb_mod_undef, ARGS_ANY()); /* 15.2.2.4.41 */ mrb_define_method(mrb, mod, "const_defined?", mrb_mod_const_defined, ARGS_REQ(1)); /* 15.2.2.4.20 */ mrb_define_method(mrb, mod, "const_get", mrb_mod_const_get, ARGS_REQ(1)); /* 15.2.2.4.21 */ diff --git a/test/t/module.rb b/test/t/module.rb index 63c2e7dc8..5b847e8b7 100644 --- a/test/t/module.rb +++ b/test/t/module.rb @@ -13,6 +13,11 @@ end # TODO not implemented ATM assert('Module.nesting', '15.2.2.3.2') do +assert('Module#ancestors', '15.2.2.4.9') do + r = String.ancestors + r.class == Array and r.include?(String) and r.include?(Object) +end + assert('Module#append_features', '15.2.2.4.10') do module Test4AppendFeatures def self.append_features(mod) @@ -47,21 +52,12 @@ assert('Module.const_missing', '15.2.2.4.22') do e1 = nil module Test4ConstMissing - def const_missing(sym) - # ATM this redirect doesn't work - puts "PLEASE GO TO TEST CASE Module.const_missing!" - puts "IT IS WORKING NOW!! PLEASE FINALIZE." - puts "Thanks :)" + def self.const_missing(sym) + 42 # the answer to everything end end - begin - Test4ConstMissing.const_get(:ConstDoesntExist) - rescue => e2 - e1 = e2 - end - - e1.class == NameError + Test4ConstMissing.const_get(:ConstDoesntExist) == 42 end assert('Module#const_get', '15.2.2.4.23') do @@ -87,7 +83,7 @@ end assert('Module#included', '15.2.2.4.29') do module Test4Included Const4Included = 42 - def Test4Included.included mod + def self.included mod Test4Included.const_set(:Const4Included2, mod) end end @@ -100,14 +96,12 @@ assert('Module#included', '15.2.2.4.29') do end assert('Module#included_modules', '15.2.2.4.30') do - r1 = true module Test4includedModules - Const4Included = 42 end module Test4includedModules2 - r1 = included Test4includedModules + include Test4includedModules end - Test4includedModules2.included_modules.class == Array + r = Test4includedModules2.included_modules + r.class == Array and r.include?(Test4includedModules) end - |