rucy 0.1.12 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cb21686ee1533b46c90d2bb32fd560836f2cd9b0
-  data.tar.gz: dd79a4d601a9d629c15309ab5e5ea3c841a9ce94
+SHA256:
+  metadata.gz: 590d30c635bbc6cdf9d3f4f4c2022a0d024c62c0d2f3e08a83f075ac2ef50681
+  data.tar.gz: 20f747540814744c0444d7606c488167f9cc1d1ae5f751527e21cf57f7880bef
 SHA512:
-  metadata.gz: d097e7acb4c775bc85385f1243ea55ba78d88544b4149a8445add046eeef6c078f18ff5c1ab0b999e6930fdf1d67fbe1aa0358bb932f46c576368b653e8a4367
-  data.tar.gz: 0b9e0ee288e91fab0ffbb5f088e1b19f158592d51e5442f92de9e21d6edc7981c181c215b960484f75980e30f3c650b34a8ba8e5168b106284282863045d8293
+  metadata.gz: ee3769c74d21c01131a036582c16ce6083c5eacc87bd528044f00c459a5480cae28dc129ec306dd171385a22588b07ffe62de6ccea946e0cb5a4f643ede20144
+  data.tar.gz: 9af4e962f4b62b49ed5c7d213fb28357f7ebe00279b6b7d981e2dd5991d17e289547ac28a69e247f96277973aeee13b94ab7fef462c65276ad4f59b049e3711f

data/.doc/ext/rucy/class.cpp

@@ -1,6 +1,7 @@
 #include "class.h"
 
 
+#include <vector>
 #include "rucy.h"
 
 
@@ -30,46 +31,27 @@ template <typename T>
 class RubyBase : public ClassWrapper<T>
 {
 
-	public:
-
-		RUCY_OVERRIDE_BEGIN(ClassWrapper<T>)
+	typedef ClassWrapper<T> Super;
 
-		RUCY_OVERRIDE_ID(name_overridable_faster)
-
-		RUCY_OVERRIDE_END
+	public:
 
 		virtual const char* name_overridable () const
 		{
 			RUCY_SYM(name_overridable);
-			if (RUCY_IS_OVERRIDABLE())
+			if (this->is_overridable())
 				return this->value.call(name_overridable).c_str();
 			else
 				return Super::name_overridable();
 		}
 
-		virtual const char* name_overridable_faster () const
-		{
-			RUCY_SYM(name_overridable_faster);
-			if (RUCY_IS_OVERRIDDEN(name_overridable_faster))
-				return this->value.call(name_overridable_faster).c_str();
-			else
-				return Super::name_overridable_faster();
-		}
-
-		bool is_name_overridable_faster_overridden () const
-		{
-			RUCY_SYM(name_overridable_faster);
-			return RUCY_IS_OVERRIDDEN(name_overridable_faster);
-		}
-
 };// RubyBase
 
 
-#define THIS(type)           to<type*>(self)
+#define THIS(type)     to<type*>(self)
 
-#define CHECK(type)          RUCY_CHECK_OBJ(type, self)
+#define CHECK(type)    RUCY_CHECK_OBJ(type, self)
 
-#define CALL(type, obj, fun) RUCY_WRAPPER_CALL(type, obj, fun)
+#define CALL(obj, fun) RUCY_CALL_SUPER(obj, fun)
 
 
 /*
@@ -99,7 +81,7 @@ static
 VALUE base_name_overridable(VALUE self)
 {
 	CHECK(Base);
-	return value(CALL(Base, THIS(Base), name_overridable()));
+	return value(CALL(THIS(Base), name_overridable()));
 }
 
 static
@@ -109,33 +91,6 @@ VALUE call_name_overridable(VALUE self)
 	return value(THIS(Base)->name_overridable());
 }
 
-static
-VALUE base_name_overridable_faster(VALUE self)
-{
-	CHECK(Base);
-	return value(CALL(Base, THIS(Base), name_overridable_faster()));
-}
-
-static
-VALUE call_name_overridable_faster(VALUE self)
-{
-	CHECK(Base);
-	return value(THIS(Base)->name_overridable_faster());
-}
-
-template <typename T>
-static
-VALUE is_name_overridable_faster_overridden(VALUE self)
-{
-	RUCY_CHECK_OBJ(T, self);
-	RubyBase<T>* obj = dynamic_cast<RubyBase<T>*>(THIS(T));
-	if (!obj) invalid_object_error(__FILE__, __LINE__, "dynamic_cast() failed.");
-	return value(obj->is_name_overridable_faster_overridden());
-}
-
-static RUCY_DEF_clear_override_flags(Base_clear_override_flags, Base);
-static RUCY_DEF_clear_override_flags(Sub_clear_override_flags,  Sub);
-
 static
 VALUE base_new_raw(VALUE self)
 {
@@ -156,14 +111,7 @@ static
 VALUE sub_name_overridable(VALUE self)
 {
 	CHECK(Sub);
-	return value(CALL(Sub, THIS(Sub), name_overridable()));
-}
-
-static
-VALUE sub_name_overridable_faster(VALUE self)
-{
-	CHECK(Sub);
-	return value(CALL(Sub, THIS(Sub), name_overridable_faster()));
+	return value(CALL(THIS(Sub), name_overridable()));
 }
 
 static
@@ -189,7 +137,7 @@ VALUE simpleobj_initialize(VALUE self, VALUE name)
 	THIS(SimpleObj)->init(name.c_str());
 }
 
-static std::vector<Xot::Ref<SimpleObj> > simpleobj_refs;
+static std::vector<Xot::Ref<SimpleObj>> simpleobj_refs;
 
 static
 VALUE simpleobj_set_refs(VALUE self, VALUE objs)
@@ -217,29 +165,18 @@ Init_class ()
 	rb_define_alloc_func(cBase, base_alloc);
 	rb_define_method(cBase, "name", RUBY_METHOD_FUNC(name), 0);
 	rb_define_method(cBase, "name_overridable", RUBY_METHOD_FUNC(base_name_overridable), 0);
-	rb_define_method(cBase, "name_overridable_faster", RUBY_METHOD_FUNC(base_name_overridable_faster), 0);
 	rb_define_method(cBase, "call_name", RUBY_METHOD_FUNC(call_name), 0);
 	rb_define_method(cBase, "call_name_overridable", RUBY_METHOD_FUNC(call_name_overridable), 0);
-	rb_define_method(cBase, "call_name_overridable_faster", RUBY_METHOD_FUNC(call_name_overridable_faster), 0);
-	cBase.define_method(
-		"is_name_overridable_faster_overridden",
-		 is_name_overridable_faster_overridden<Base>);
 	rb_define_singleton_method(cBase, "new_raw", RUBY_METHOD_FUNC(base_new_raw), 0);
-	
 
 	cSub = rb_define_class_under(mTester, "Sub", cBase);
 	rb_define_alloc_func(cSub, sub_alloc);
 	rb_define_method(cSub, "name_overridable", RUBY_METHOD_FUNC(sub_name_overridable), 0);
-	rb_define_method(cSub, "name_overridable_faster", RUBY_METHOD_FUNC(sub_name_overridable_faster), 0);
-	cSub.define_method(
-		"is_name_overridable_faster_overridden",
-		 is_name_overridable_faster_overridden<Sub>);
 	rb_define_singleton_method(cSub, "new_raw", RUBY_METHOD_FUNC(sub_new_raw), 0);
-	
 
 	cSimpleObj = rb_define_class_under(mTester, "SimpleObj", rb_cObject);
 	rb_define_alloc_func(cSimpleObj, simpleobj_alloc);
 	rb_define_private_method(cSimpleObj, "initialize", RUBY_METHOD_FUNC(simpleobj_initialize), 1);
-	rb_define_function(cSimpleObj, "set_refs", RUBY_METHOD_FUNC(simpleobj_set_refs), 1);
-	rb_define_function(cSimpleObj, "clear_refs", RUBY_METHOD_FUNC(simpleobj_clear_refs), 0);
+	rb_define_module_function(cSimpleObj, "set_refs", RUBY_METHOD_FUNC(simpleobj_set_refs), 1);
+	rb_define_module_function(cSimpleObj, "clear_refs", RUBY_METHOD_FUNC(simpleobj_clear_refs), 0);
 }

data/.doc/ext/rucy/tester.cpp

@@ -54,8 +54,8 @@ Init_tester ()
 	Module mRucy = rb_define_module("Rucy");
 	Module mTester = rb_define_module_under(mRucy, "Tester");
 
-	rb_define_function(mTester, "all_logs", RUBY_METHOD_FUNC(all_logs), 0);
-	rb_define_function(mTester, "clear_logs", RUBY_METHOD_FUNC(clear_logs), 0);
+	rb_define_module_function(mTester, "all_logs", RUBY_METHOD_FUNC(all_logs), 0);
+	rb_define_module_function(mTester, "clear_logs", RUBY_METHOD_FUNC(clear_logs), 0);
 
 	Init_value();
 	Init_exception();

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 xord.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,7 +1,7 @@
 
 # Rucy - A Ruby C++ Extension Helper Library.
 
- by snori@xord.org
+ by xordog@gmail.com
 
 
 ## What is this library?
@@ -28,4 +28,4 @@ see ext/rucy/tester.cpp.
 ## Contact information.
 
 Web:  http://blog.xord.org/
-Mail: snori@xord.org
+Mail: xordog@gmail.com

data/Rakefile

@@ -2,28 +2,23 @@
 
 
 %w[../xot .]
-  .map  {|s| File.expand_path "../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'xot/rake'
+require 'rucy/rake'
+
 require 'xot/module'
 require 'rucy/module'
 
-include Xot::Rake
-
 
-MODULES    = [Xot, Rucy].map {|m| m.const_get :Module}
-MODULE     = MODULES.last
-DLNAME     = 'tester'
-INCDIRS    = ruby_incdirs
-RUCY2RDOC  = 'bin/rucy2rdoc'
+MODULES    = [Xot, Rucy]
 NPARAM_MAX = 8
 NTIMES     = (0..NPARAM_MAX)
 
+build_native_library
+build_ruby_extension dlname: :tester
+test_ruby_extension
+generate_documents
+build_ruby_gem
 
-task :default => :build
-
-task :build => :lib
-
-
-MODULES.each {|m| m.load_tasks :lib, :ext, :test, :doc, :gem}
+task :default => :test

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.18

data/ext/rucy/class.cpp

@@ -1,6 +1,7 @@
 #include "class.h"
 
 
+#include <vector>
 #include "rucy.h"
 
 
@@ -30,46 +31,27 @@ template <typename T>
 class RubyBase : public ClassWrapper<T>
 {
 
-	public:
-
-		RUCY_OVERRIDE_BEGIN(ClassWrapper<T>)
-
-		RUCY_OVERRIDE_ID(name_overridable_faster)
+	typedef ClassWrapper<T> Super;
 
-		RUCY_OVERRIDE_END
+	public:
 
 		virtual const char* name_overridable () const
 		{
 			RUCY_SYM(name_overridable);
-			if (RUCY_IS_OVERRIDABLE())
+			if (this->is_overridable())
 				return this->value.call(name_overridable).c_str();
 			else
 				return Super::name_overridable();
 		}
 
-		virtual const char* name_overridable_faster () const
-		{
-			RUCY_SYM(name_overridable_faster);
-			if (RUCY_IS_OVERRIDDEN(name_overridable_faster))
-				return this->value.call(name_overridable_faster).c_str();
-			else
-				return Super::name_overridable_faster();
-		}
-
-		bool is_name_overridable_faster_overridden () const
-		{
-			RUCY_SYM(name_overridable_faster);
-			return RUCY_IS_OVERRIDDEN(name_overridable_faster);
-		}
-
 };// RubyBase
 
 
-#define THIS(type)           to<type*>(self)
+#define THIS(type)     to<type*>(self)
 
-#define CHECK(type)          RUCY_CHECK_OBJ(type, self)
+#define CHECK(type)    RUCY_CHECK_OBJ(type, self)
 
-#define CALL(type, obj, fun) RUCY_WRAPPER_CALL(type, obj, fun)
+#define CALL(obj, fun) RUCY_CALL_SUPER(obj, fun)
 
 
 /*
@@ -102,7 +84,7 @@ static
 RUCY_DEF0(base_name_overridable)
 {
 	CHECK(Base);
-	return value(CALL(Base, THIS(Base), name_overridable()));
+	return value(CALL(THIS(Base), name_overridable()));
 }
 RUCY_END
 
@@ -114,36 +96,6 @@ RUCY_DEF0(call_name_overridable)
 }
 RUCY_END
 
-static
-RUCY_DEF0(base_name_overridable_faster)
-{
-	CHECK(Base);
-	return value(CALL(Base, THIS(Base), name_overridable_faster()));
-}
-RUCY_END
-
-static
-RUCY_DEF0(call_name_overridable_faster)
-{
-	CHECK(Base);
-	return value(THIS(Base)->name_overridable_faster());
-}
-RUCY_END
-
-template <typename T>
-static
-RUCY_DEF0(is_name_overridable_faster_overridden)
-{
-	RUCY_CHECK_OBJ(T, self);
-	RubyBase<T>* obj = dynamic_cast<RubyBase<T>*>(THIS(T));
-	if (!obj) invalid_object_error(__FILE__, __LINE__, "dynamic_cast() failed.");
-	return value(obj->is_name_overridable_faster_overridden());
-}
-RUCY_END
-
-static RUCY_DEF_clear_override_flags(Base_clear_override_flags, Base);
-static RUCY_DEF_clear_override_flags(Sub_clear_override_flags,  Sub);
-
 static
 RUCY_DEF0(base_new_raw)
 {
@@ -166,15 +118,7 @@ static
 RUCY_DEF0(sub_name_overridable)
 {
 	CHECK(Sub);
-	return value(CALL(Sub, THIS(Sub), name_overridable()));
-}
-RUCY_END
-
-static
-RUCY_DEF0(sub_name_overridable_faster)
-{
-	CHECK(Sub);
-	return value(CALL(Sub, THIS(Sub), name_overridable_faster()));
+	return value(CALL(THIS(Sub), name_overridable()));
 }
 RUCY_END
 
@@ -204,7 +148,7 @@ RUCY_DEF1(simpleobj_initialize, name)
 }
 RUCY_END
 
-static std::vector<Xot::Ref<SimpleObj> > simpleobj_refs;
+static std::vector<Xot::Ref<SimpleObj>> simpleobj_refs;
 
 static
 RUCY_DEF1(simpleobj_set_refs, objs)
@@ -232,31 +176,20 @@ Init_class ()
 
 	cBase = mTester.define_class("Base");
 	cBase.define_alloc_func(base_alloc);
-	cBase.define_method(     "name",                         name);
-	cBase.define_method(     "name_overridable",        base_name_overridable);
-	cBase.define_method(     "name_overridable_faster", base_name_overridable_faster);
-	cBase.define_method("call_name",                    call_name);
-	cBase.define_method("call_name_overridable",        call_name_overridable);
-	cBase.define_method("call_name_overridable_faster", call_name_overridable_faster);
-	cBase.define_method(
-		"is_name_overridable_faster_overridden",
-		 is_name_overridable_faster_overridden<Base>);
-	cBase.define_singleton_method("new_raw",            base_new_raw);
-	cBase.define_clear_override_flags(Base_clear_override_flags);
+	cBase.define_method(     "name",                  name);
+	cBase.define_method(     "name_overridable", base_name_overridable);
+	cBase.define_method("call_name",             call_name);
+	cBase.define_method("call_name_overridable", call_name_overridable);
+	cBase.define_singleton_method("new_raw", base_new_raw);
 
 	cSub = mTester.define_class("Sub", cBase);
 	cSub.define_alloc_func(sub_alloc);
-	cSub.define_method("name_overridable",        sub_name_overridable);
-	cSub.define_method("name_overridable_faster", sub_name_overridable_faster);
-	cSub.define_method(
-		"is_name_overridable_faster_overridden",
-		 is_name_overridable_faster_overridden<Sub>);
-	cSub.define_singleton_method("new_raw",       sub_new_raw);
-	cSub.define_clear_override_flags(Sub_clear_override_flags);
+	cSub.define_method("name_overridable",  sub_name_overridable);
+	cSub.define_singleton_method("new_raw", sub_new_raw);
 
 	cSimpleObj = mTester.define_class("SimpleObj");
 	cSimpleObj.define_alloc_func(simpleobj_alloc);
 	cSimpleObj.define_private_method("initialize", simpleobj_initialize);
-	cSimpleObj.define_function("set_refs",   simpleobj_set_refs);
-	cSimpleObj.define_function("clear_refs", simpleobj_clear_refs);
+	cSimpleObj.define_module_function("set_refs",   simpleobj_set_refs);
+	cSimpleObj.define_module_function("clear_refs", simpleobj_clear_refs);
 }

data/ext/rucy/class.h

@@ -35,11 +35,6 @@ class Base : public Xot::RefCountable<>
 			return "Base::name_overridable";
 		}
 
-		virtual const char* name_overridable_faster () const
-		{
-			return "Base::name_overridable_faster";
-		}
-
 };// Base
 
 
@@ -68,11 +63,6 @@ class Sub : public Base
 			return "Sub::name_overridable";
 		}
 
-		virtual const char* name_overridable_faster () const
-		{
-			return "Sub::name_overridable_faster";
-		}
-
 };// Sub