rucy 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67f71a7e93376401c6cc03e60b6c52edebb27ec7
-  data.tar.gz: ac0cd48435e3134dc6ab318a442caae40fe7c16c
+  metadata.gz: d6389e875eb101e6a833bf7fd8e5f3ef7579f381
+  data.tar.gz: 7ff8ff8ee865b36934f2ebdcb67641ed4bf5bdfc
 SHA512:
-  metadata.gz: 99a2a7c5f8c14eb83bd69a6b9876769fbab447571869171a8453bc13715c4bb12e11d2ceaf5f43129d6c555801fef06a9bfef52a3b0db881325de002207abf75
-  data.tar.gz: 6e03ed8138bf76df496a2b734ee57f36a4663cb73345220c82f0ae6937c7b9cb906f3fc66a895a743b818ab02146fef27be2ac6b631631b7722938069fcf4cf7
+  metadata.gz: 292fb66119c7e65044608dfd84474a561768f41561d7d29ea4eaa4d08fb542039b207f26f19a271462422fb3a6956d293cfedc690b2b7f1e43f92d7316a72c11
+  data.tar.gz: 891da47387483201e047d68ffb53dcdf73e2f06658744c82f70154e66ed1a2eefdeee90f659545723c767a0e668cf6587e15e6a7d5a6e9540558d5e7c200b6be

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

@@ -9,15 +9,21 @@ using namespace Rucy;
 
 static Class cBase, cSub, cSimpleObj;
 
-RUCY_WRAPPER_VALUE_FROM_TO(Base,      cBase)
-RUCY_WRAPPER_VALUE_FROM_TO(Sub,       cSub)
-RUCY_WRAPPER_VALUE_FROM_TO(SimpleObj, cSimpleObj)
+namespace Rucy
+{
+
+	template <> inline Class get_ruby_class<Base>      () {return cBase;}
+
+	template <> inline Class get_ruby_class<Sub>       () {return cSub;}
+
+	template <> inline Class get_ruby_class<SimpleObj> () {return cSimpleObj;}
 
-template <typename T> Class get_class ();
+}// Rucy
 
-template <> Class get_class<Base> () {return cBase;}
 
-template <> Class get_class<Sub> () {return cSub;}
+RUCY_WRAPPER_VALUE_FROM_TO(Base)
+RUCY_WRAPPER_VALUE_FROM_TO(Sub)
+RUCY_WRAPPER_VALUE_FROM_TO(SimpleObj)
 
 
 template <typename T>
@@ -41,7 +47,7 @@ class RubyBase : public ClassWrapper<T>
 		virtual const char* name_overridable_faster () const
 		{
 			RUCY_SYM(name_overridable_faster);
-			if (RUCY_IS_OVERRIDDEN(name_overridable_faster, get_class<T>()))
+			if (RUCY_IS_OVERRIDDEN(name_overridable_faster))
 				return this->value.call(name_overridable_faster).c_str();
 			else
 				return Super::name_overridable_faster();
@@ -50,7 +56,7 @@ class RubyBase : public ClassWrapper<T>
 		bool is_name_overridable_faster_overridden () const
 		{
 			RUCY_SYM(name_overridable_faster);
-			return RUCY_IS_OVERRIDDEN(name_overridable_faster, get_class<T>());
+			return RUCY_IS_OVERRIDDEN(name_overridable_faster);
 		}
 
 };// RubyBase
@@ -58,7 +64,7 @@ class RubyBase : public ClassWrapper<T>
 
 #define THIS(type)           to<type*>(self)
 
-#define CHECK(type)          RUCY_CHECK_OBJ(type, c##type, self)
+#define CHECK(type)          RUCY_CHECK_OBJ(type, self)
 
 #define CALL(type, obj, fun) RUCY_WRAPPER_CALL(type, obj, fun)
 
@@ -118,14 +124,14 @@ template <typename T>
 static
 VALUE is_name_overridable_faster_overridden(VALUE self)
 {
-	RUCY_CHECK_OBJ(T, get_class<T>(), 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, cBase);
-static RUCY_DEF_clear_override_flags(Sub_clear_override_flags,  Sub,  cSub);
+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)

data/.doc/ext/rucy/struct.cpp

@@ -16,7 +16,14 @@ struct Struct
 
 static Class cStruct;
 
-RUCY_VALUE_FROM_TO(Struct, cStruct)
+namespace Rucy
+{
+
+	template <> inline Class get_ruby_class<Struct> () {return cStruct;}
+
+}// Rucy
+
+RUCY_VALUE_FROM_TO(Struct)
 
 
 /*

data/README.md

@@ -1,10 +1,10 @@
 
-= Rucy - A Ruby C++ Extension Helper Library
+# Rucy - A Ruby C++ Extension Helper Library
 
  by snori@xord.org
 
 
-= What is this library?
+## What is this library?
 
 This library helps you to develop Ruby C extension library with few useful
 classes.
@@ -13,19 +13,19 @@ classes.
 * Exception safe (Rucy/C++).
 
 
-= How to use
+## How to use
 
 $ gem install rucy
 
 write C++ source like ext/rucy/tester.cpp.
 
 
-= Examples
+## Examples
 
 see ext/rucy/tester.cpp.
 
 
-= Contact information.
+## Contact information.
 
 Web:  http://blog.xord.org/
 Mail: snori@xord.org

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/ext/rucy/class.cpp

@@ -9,15 +9,21 @@ using namespace Rucy;
 
 static Class cBase, cSub, cSimpleObj;
 
-RUCY_WRAPPER_VALUE_FROM_TO(Base,      cBase)
-RUCY_WRAPPER_VALUE_FROM_TO(Sub,       cSub)
-RUCY_WRAPPER_VALUE_FROM_TO(SimpleObj, cSimpleObj)
+namespace Rucy
+{
+
+	template <> inline Class get_ruby_class<Base>      () {return cBase;}
+
+	template <> inline Class get_ruby_class<Sub>       () {return cSub;}
+
+	template <> inline Class get_ruby_class<SimpleObj> () {return cSimpleObj;}
 
-template <typename T> Class get_class ();
+}// Rucy
 
-template <> Class get_class<Base> () {return cBase;}
 
-template <> Class get_class<Sub> () {return cSub;}
+RUCY_WRAPPER_VALUE_FROM_TO(Base)
+RUCY_WRAPPER_VALUE_FROM_TO(Sub)
+RUCY_WRAPPER_VALUE_FROM_TO(SimpleObj)
 
 
 template <typename T>
@@ -41,7 +47,7 @@ class RubyBase : public ClassWrapper<T>
 		virtual const char* name_overridable_faster () const
 		{
 			RUCY_SYM(name_overridable_faster);
-			if (RUCY_IS_OVERRIDDEN(name_overridable_faster, get_class<T>()))
+			if (RUCY_IS_OVERRIDDEN(name_overridable_faster))
 				return this->value.call(name_overridable_faster).c_str();
 			else
 				return Super::name_overridable_faster();
@@ -50,7 +56,7 @@ class RubyBase : public ClassWrapper<T>
 		bool is_name_overridable_faster_overridden () const
 		{
 			RUCY_SYM(name_overridable_faster);
-			return RUCY_IS_OVERRIDDEN(name_overridable_faster, get_class<T>());
+			return RUCY_IS_OVERRIDDEN(name_overridable_faster);
 		}
 
 };// RubyBase
@@ -58,7 +64,7 @@ class RubyBase : public ClassWrapper<T>
 
 #define THIS(type)           to<type*>(self)
 
-#define CHECK(type)          RUCY_CHECK_OBJ(type, c##type, self)
+#define CHECK(type)          RUCY_CHECK_OBJ(type, self)
 
 #define CALL(type, obj, fun) RUCY_WRAPPER_CALL(type, obj, fun)
 
@@ -125,15 +131,15 @@ template <typename T>
 static
 RUCY_DEF0(is_name_overridable_faster_overridden)
 {
-	RUCY_CHECK_OBJ(T, get_class<T>(), 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());
 }
 RUCY_END
 
-static RUCY_DEF_clear_override_flags(Base_clear_override_flags, Base, cBase);
-static RUCY_DEF_clear_override_flags(Sub_clear_override_flags,  Sub,  cSub);
+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)

data/ext/rucy/struct.cpp

@@ -16,7 +16,14 @@ struct Struct
 
 static Class cStruct;
 
-RUCY_VALUE_FROM_TO(Struct, cStruct)
+namespace Rucy
+{
+
+	template <> inline Class get_ruby_class<Struct> () {return cStruct;}
+
+}// Rucy
+
+RUCY_VALUE_FROM_TO(Struct)
 
 
 /*

data/include/rucy/extension.h.erb

@@ -28,26 +28,26 @@
 		template <> native_class  value_to<native_class>  (Value value, bool convert); \
 	}
 
-#define RUCY_DECLARE_WRAPPER_VALUE_FROM(wrapped_class) \
+#define RUCY_DECLARE_WRAPPER_VALUE_FROM(native_class) \
 	namespace Rucy \
 	{ \
-		Value value (wrapped_class* obj); \
-		Value value (wrapped_class* obj, Value klass); \
+		Value value (native_class* obj); \
+		Value value (native_class* obj, Value klass); \
 	}
 
-#define RUCY_DECLARE_WRAPPER_VALUE_TO(wrapped_class) \
+#define RUCY_DECLARE_WRAPPER_VALUE_TO(native_class) \
 	namespace Rucy \
 	{ \
-		template <> wrapped_class* value_to<wrapped_class*> (Value value, bool convert); \
+		template <> native_class* value_to<native_class*> (Value value, bool convert); \
 	}
 
-#define RUCY_DEFINE_VALUE_FROM(native_class, ruby_class) \
+#define RUCY_DEFINE_VALUE_FROM(native_class) \
 	namespace Rucy \
 	{ \
 		Value \
 		value (const native_class& obj) \
 		{ \
-			return new_type(ruby_class, new native_class(obj)); \
+			return new_type(get_ruby_class<native_class>(), new native_class(obj)); \
 		} \
 		Value \
 		value (const native_class* obj) \
@@ -56,13 +56,13 @@
 		} \
 	}
 
-#define RUCY_DEFINE_VALUE_TO(native_class, ruby_class) \
+#define RUCY_DEFINE_VALUE_TO(native_class) \
 	namespace Rucy \
 	{ \
 		template <> native_class* \
 		value_to<native_class*> (Value value, bool) \
 		{ \
-			return get_type_ptr<native_class>(value, ruby_class); \
+			return get_type_ptr<native_class>(value, get_ruby_class<native_class>()); \
 		} \
 		template <> native_class& \
 		value_to<native_class&> (Value value, bool convert) \
@@ -74,32 +74,32 @@
 		} \
 	}
 
-#define RUCY_DEFINE_WRAPPER_VALUE_FROM(wrapped_class, ruby_class) \
+#define RUCY_DEFINE_WRAPPER_VALUE_FROM(native_class) \
 	namespace Rucy \
 	{ \
 		Value \
-		value (wrapped_class* obj) \
+		value (native_class* obj) \
 		{ \
-			return value(obj, ruby_class); \
+			return value(obj, get_ruby_class<native_class>()); \
 		} \
 		Value \
-		value (wrapped_class* obj, Value klass) \
+		value (native_class* obj, Value klass) \
 		{ \
 			if (!obj) return nil(); \
-			ClassWrapper<wrapped_class>* p = dynamic_cast<ClassWrapper<wrapped_class>*>(obj); \
+			ClassWrapper<native_class>* p = dynamic_cast<ClassWrapper<native_class>*>(obj); \
 			if (!p) return new_ref(klass, obj); \
 			if (p->value.is_nil()) p->value = new_wrapper(klass, obj); \
 			return p->value; \
 		} \
 	}
 
-#define RUCY_DEFINE_WRAPPER_VALUE_TO(wrapped_class, ruby_class) \
+#define RUCY_DEFINE_WRAPPER_VALUE_TO(native_class) \
 	namespace Rucy \
 	{ \
-		template <> wrapped_class* \
-		value_to<wrapped_class*> (Value value, bool convert) \
+		template <> native_class* \
+		value_to<native_class*> (Value value, bool convert) \
 		{ \
-			return get_type_ptr<wrapped_class>(value, ruby_class); \
+			return get_type_ptr<native_class>(value, get_ruby_class<native_class>()); \
 		} \
 	}
 
@@ -107,29 +107,29 @@
 	RUCY_DECLARE_VALUE_FROM(native_class) \
 	RUCY_DECLARE_VALUE_TO(native_class)
 
-#define RUCY_DEFINE_VALUE_FROM_TO(native_class, ruby_class) \
-	RUCY_DEFINE_VALUE_FROM(native_class, ruby_class) \
-	RUCY_DEFINE_VALUE_TO(native_class, ruby_class)
+#define RUCY_DEFINE_VALUE_FROM_TO(native_class) \
+	RUCY_DEFINE_VALUE_FROM(native_class) \
+	RUCY_DEFINE_VALUE_TO(native_class)
 
-#define RUCY_VALUE_FROM_TO(native_class, ruby_class) \
+#define RUCY_VALUE_FROM_TO(native_class) \
 	RUCY_DECLARE_VALUE_FROM_TO(native_class) \
-	RUCY_DEFINE_VALUE_FROM_TO(native_class, ruby_class)
+	RUCY_DEFINE_VALUE_FROM_TO(native_class)
 
-#define RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(wrapped_class) \
-	RUCY_DECLARE_WRAPPER_VALUE_FROM(wrapped_class) \
-	RUCY_DECLARE_WRAPPER_VALUE_TO(wrapped_class)
+#define RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(native_class) \
+	RUCY_DECLARE_WRAPPER_VALUE_FROM(native_class) \
+	RUCY_DECLARE_WRAPPER_VALUE_TO(native_class)
 
-#define RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(wrapped_class, ruby_class) \
-	RUCY_DEFINE_WRAPPER_VALUE_FROM(wrapped_class, ruby_class) \
-	RUCY_DEFINE_WRAPPER_VALUE_TO(wrapped_class, ruby_class)
+#define RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(native_class) \
+	RUCY_DEFINE_WRAPPER_VALUE_FROM(native_class) \
+	RUCY_DEFINE_WRAPPER_VALUE_TO(native_class)
 
-#define RUCY_WRAPPER_VALUE_FROM_TO(wrapped_class, ruby_class) \
-	RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(wrapped_class) \
-	RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(wrapped_class, ruby_class)
+#define RUCY_WRAPPER_VALUE_FROM_TO(native_class) \
+	RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(native_class) \
+	RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(native_class)
 
 
 #define RUCY_OVERRIDE_BEGIN(wrapper_class) \
-	typedef wrapper_class RucyWrapper;	\
+	typedef wrapper_class RucyWrapper; \
 	typedef RucyWrapper Super; \
 	enum { OVERRIDE_ID_FIRST = RucyWrapper::OVERRIDE_ID_LAST - 1,
 
@@ -139,8 +139,8 @@
 #define RUCY_OVERRIDE_ID(name) \
 	OID_##name,
 
-#define RUCY_IS_OVERRIDDEN(name, ruby_class) \
-	this->is_overridden(ruby_class, name, OID_##name)
+#define RUCY_IS_OVERRIDDEN(name) \
+	this->is_overridden(name, OID_##name)
 
 
 #define RUCY_TRY \
@@ -221,12 +221,12 @@
 		RUCY_TRY
 %	end
 
-#define RUCY_DEF_clear_override_flags(name, wrapped_class, ruby_class) \
+#define RUCY_DEF_clear_override_flags(name, native_class) \
 	RUCY_DEF0(name) \
 	{ \
-		RUCY_CHECK_OBJ(wrapped_class, ruby_class, self); \
-		ClassWrapper<wrapped_class>* obj = \
-			dynamic_cast<ClassWrapper<wrapped_class>*>(to<wrapped_class*>(self)); \
+		RUCY_CHECK_OBJ(native_class, self); \
+		ClassWrapper<native_class>* obj = \
+			dynamic_cast<ClassWrapper<native_class>*>(to<native_class*>(self)); \
 		if (obj) obj->clear_override_flags(); \
 	} \
 	RUCY_END
@@ -237,26 +237,25 @@
 	}
 
 
-#define RUCY_CHECK_OBJ(native_class, ruby_class, obj) \
+#define RUCY_CHECK_OBJ(native_class, obj) \
 	do \
 	{ \
-		native_class* p = Rucy::get_type_ptr<native_class>(obj, ruby_class); \
+		native_class* p = \
+			Rucy::get_type_ptr<native_class>(obj, Rucy::get_ruby_class<native_class>()); \
 		if (!p) Rucy::invalid_object_error(__FILE__, __LINE__); \
 	} \
 	while(0)
 
-#define RUCY_CHECK_OBJECT(native_class, ruby_class, obj) \
+#define RUCY_CHECK_OBJECT(native_class, obj) \
 	do \
 	{ \
-		native_class* p = Rucy::get_type_ptr<native_class>(obj, ruby_class); \
+		native_class* p = Rucy::get_type_ptr<native_class>(obj, get_ruby_class<native_class>()); \
 		if (!p || !*p) Rucy::invalid_object_error(__FILE__, __LINE__); \
 	} \
 	while(0)
 
-#define RUCY_WRAPPER_CALL(wrapped_class, obj, fun) \
-	(dynamic_cast<ClassWrapper<wrapped_class>*>(obj) \
-		? reinterpret_cast<ClassWrapper<wrapped_class>*>(obj)->RucyWrapped::fun \
-		: (obj)->fun)
+#define RUCY_WRAPPER_CALL(native_class, obj, fun) \
+	((obj)->rucy_wrapped() ? (obj)->native_class::fun : (obj)->fun)
 
 
 namespace Rucy
@@ -272,6 +271,9 @@ namespace Rucy
 		int n6 = -1, int n7 = -1, int n8 = -1, int n9 = -1, int n10 = -1);
 
 
+	template <typename T> Class get_ruby_class ();
+
+
 	template <typename T>
 	class ClassWrapper : public T
 	{
@@ -316,7 +318,7 @@ namespace Rucy
 				override_flags.reset();
 			}
 
-			virtual bool is_overridden (const Value& klass, const Symbol& name, uint id) const
+			virtual bool is_overridden (const Symbol& name, uint id) const
 			{
 				if (id <= OVERRIDE_ID_UNKNOWN)
 					return false;
@@ -325,13 +327,18 @@ namespace Rucy
 				get_override_flag(&checked, &overridden, id);
 				if (checked) return overridden;
 
-				overridden = check_overridden(klass, name);
+				overridden = check_overridden(name);
 				if (!set_override_flag(id, true, overridden))
 					return false;
 
 				return overridden;
 			}
 
+			virtual bool rucy_wrapped () const
+			{
+				return true;
+			}
+
 		protected:
 
 			enum
@@ -359,11 +366,11 @@ namespace Rucy
 
 			mutable boost::dynamic_bitset<> override_flags;
 
-			bool check_overridden (const Value& klass, const Symbol& name) const
+			bool check_overridden (const Symbol& name) const
 			{
 				RUCY_SYM(method);
 				RUCY_SYM(owner);
-				return value.call(method, name.value()).call(owner) != klass;
+				return value.call(method, name.value()).call(owner) != get_ruby_class<RucyWrapped>();
 			}
 
 			void get_override_flag (bool* checked, bool* overridden, uint id) const

data/include/rucy/ruby.h

@@ -13,7 +13,9 @@ namespace Rucy
 
 
 	typedef VALUE RubyValue;
+
 	typedef int   RubyValueType;
+
 	typedef ID    RubySymbol;
 
 

data/rucy.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.authors  = %w[snori]
   s.email    = 'snori@xord.org'
-  s.homepage = "http://github.com/xord/#{name}/wiki"
+  s.homepage = "https://github.com/xord/spacy/wiki/#{name.capitalize}-Home"
 
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucy
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - snori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -113,7 +113,7 @@ files:
 - ".doc/ext/rucy/struct.cpp"
 - ".doc/ext/rucy/tester.cpp"
 - ".doc/ext/rucy/value.cpp"
-homepage: http://github.com/xord/rucy/wiki
+homepage: https://github.com/xord/spacy/wiki/Rucy-Home
 licenses: []
 metadata: {}
 post_install_message: