From 01dddaf38525b631c61886758628afe8f04b6356 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sun, 13 Nov 2016 16:11:24 +0900 Subject: rename mruby-module-ext to mruby-class-ext; ref #2470 --- mrbgems/default.gembox | 4 ++-- mrbgems/mruby-class-ext/mrbgem.rake | 5 +++++ mrbgems/mruby-class-ext/src/class.c | 23 +++++++++++++++++++++++ mrbgems/mruby-class-ext/test/module.rb | 10 ++++++++++ mrbgems/mruby-module-ext/mrbgem.rake | 5 ----- mrbgems/mruby-module-ext/src/module.c | 23 ----------------------- mrbgems/mruby-module-ext/test/module.rb | 10 ---------- 7 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 mrbgems/mruby-class-ext/mrbgem.rake create mode 100644 mrbgems/mruby-class-ext/src/class.c create mode 100644 mrbgems/mruby-class-ext/test/module.rb delete mode 100644 mrbgems/mruby-module-ext/mrbgem.rake delete mode 100644 mrbgems/mruby-module-ext/src/module.c delete mode 100644 mrbgems/mruby-module-ext/test/module.rb diff --git a/mrbgems/default.gembox b/mrbgems/default.gembox index 9abbd8512..dab7230aa 100644 --- a/mrbgems/default.gembox +++ b/mrbgems/default.gembox @@ -71,8 +71,8 @@ MRuby::GemBox.new do |conf| # Use Kernel module extension conf.gem :core => "mruby-kernel-ext" - # Use extensional Module class - conf.gem :core => "mruby-module-ext" + # Use class/module extension + conf.gem :core => "mruby-class-ext" # Use mruby-compiler to build other mrbgems conf.gem :core => "mruby-compiler" diff --git a/mrbgems/mruby-class-ext/mrbgem.rake b/mrbgems/mruby-class-ext/mrbgem.rake new file mode 100644 index 000000000..a384b1eef --- /dev/null +++ b/mrbgems/mruby-class-ext/mrbgem.rake @@ -0,0 +1,5 @@ +MRuby::Gem::Specification.new('mruby-class-ext') do |spec| + spec.license = 'MIT' + spec.author = 'mruby developers' + spec.summary = 'class/module extension' +end diff --git a/mrbgems/mruby-class-ext/src/class.c b/mrbgems/mruby-class-ext/src/class.c new file mode 100644 index 000000000..8ca7d66c2 --- /dev/null +++ b/mrbgems/mruby-class-ext/src/class.c @@ -0,0 +1,23 @@ +#include "mruby.h" +#include "mruby/class.h" +#include "mruby/string.h" + +static mrb_value +mrb_mod_name(mrb_state *mrb, mrb_value self) +{ + mrb_value name = mrb_class_path(mrb, mrb_class_ptr(self)); + return mrb_nil_p(name)? name : mrb_str_dup(mrb, name); +} + +void +mrb_mruby_class_ext_gem_init(mrb_state *mrb) +{ + struct RClass *mod = mrb->module_class; + + mrb_define_method(mrb, mod, "name", mrb_mod_name, MRB_ARGS_NONE()); +} + +void +mrb_mruby_class_ext_gem_final(mrb_state *mrb) +{ +} diff --git a/mrbgems/mruby-class-ext/test/module.rb b/mrbgems/mruby-class-ext/test/module.rb new file mode 100644 index 000000000..f721ad0c6 --- /dev/null +++ b/mrbgems/mruby-class-ext/test/module.rb @@ -0,0 +1,10 @@ +assert 'Module#name' do + module A + class B + end + end + + assert_nil A::B.singleton_class.name + assert_equal 'Fixnum', Fixnum.name + assert_equal 'A::B', A::B.name +end diff --git a/mrbgems/mruby-module-ext/mrbgem.rake b/mrbgems/mruby-module-ext/mrbgem.rake deleted file mode 100644 index d1f3952ba..000000000 --- a/mrbgems/mruby-module-ext/mrbgem.rake +++ /dev/null @@ -1,5 +0,0 @@ -MRuby::Gem::Specification.new('mruby-module-ext') do |spec| - spec.license = 'MIT' - spec.author = 'mruby developers' - spec.summary = 'extensional Module class' -end diff --git a/mrbgems/mruby-module-ext/src/module.c b/mrbgems/mruby-module-ext/src/module.c deleted file mode 100644 index 74bece800..000000000 --- a/mrbgems/mruby-module-ext/src/module.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "mruby.h" -#include "mruby/class.h" -#include "mruby/string.h" - -static mrb_value -mrb_mod_name(mrb_state *mrb, mrb_value self) -{ - mrb_value name = mrb_class_path(mrb, mrb_class_ptr(self)); - return mrb_nil_p(name)? name : mrb_str_dup(mrb, name); -} - -void -mrb_mruby_module_ext_gem_init(mrb_state *mrb) -{ - struct RClass *mod = mrb->module_class; - - mrb_define_method(mrb, mod, "name", mrb_mod_name, MRB_ARGS_NONE()); -} - -void -mrb_mruby_module_ext_gem_final(mrb_state *mrb) -{ -} diff --git a/mrbgems/mruby-module-ext/test/module.rb b/mrbgems/mruby-module-ext/test/module.rb deleted file mode 100644 index f721ad0c6..000000000 --- a/mrbgems/mruby-module-ext/test/module.rb +++ /dev/null @@ -1,10 +0,0 @@ -assert 'Module#name' do - module A - class B - end - end - - assert_nil A::B.singleton_class.name - assert_equal 'Fixnum', Fixnum.name - assert_equal 'A::B', A::B.name -end -- cgit v1.2.3