rucy 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6389e875eb101e6a833bf7fd8e5f3ef7579f381
-  data.tar.gz: 7ff8ff8ee865b36934f2ebdcb67641ed4bf5bdfc
+  metadata.gz: 646a114233903a170a9c11e5f4af5f5b8f9c1d1d
+  data.tar.gz: 533042ab4b6c59c239e5f7a2497c76370c76fdd0
 SHA512:
-  metadata.gz: 292fb66119c7e65044608dfd84474a561768f41561d7d29ea4eaa4d08fb542039b207f26f19a271462422fb3a6956d293cfedc690b2b7f1e43f92d7316a72c11
-  data.tar.gz: 891da47387483201e047d68ffb53dcdf73e2f06658744c82f70154e66ed1a2eefdeee90f659545723c767a0e668cf6587e15e6a7d5a6e9540558d5e7c200b6be
+  metadata.gz: 1f739aa545afbde9cb4bc5bcc67158f381d098e4de0dbb61dfd9e0d2598363e8965de6617046c6687150c79f8b87eacdb5b76051f5993f3af28e612dcbf72ce2
+  data.tar.gz: eaf1449f0f84d087b9cc722737ac2534b9e2083c3b0711132be58f55d895079e6dd9a6f5bb703f5c216b55c774619f82873ab837e698473afecf6cb9bf520555

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

@@ -41,7 +41,10 @@ class RubyBase : public ClassWrapper<T>
 		virtual const char* name_overridable () const
 		{
 			RUCY_SYM(name_overridable);
-			return this->value.call(name_overridable).c_str();
+			if (RUCY_IS_OVERRIDABLE())
+				return this->value.call(name_overridable).c_str();
+			else
+				return Super::name_overridable();
 		}
 
 		virtual const char* name_overridable_faster () const

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/ext/rucy/class.cpp

@@ -41,7 +41,10 @@ class RubyBase : public ClassWrapper<T>
 		virtual const char* name_overridable () const
 		{
 			RUCY_SYM(name_overridable);
-			return this->value.call(name_overridable).c_str();
+			if (RUCY_IS_OVERRIDABLE())
+				return this->value.call(name_overridable).c_str();
+			else
+				return Super::name_overridable();
 		}
 
 		virtual const char* name_overridable_faster () const

data/include/rucy/extension.h.erb

@@ -86,10 +86,10 @@
 		value (native_class* obj, Value klass) \
 		{ \
 			if (!obj) return nil(); \
-			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; \
+			Value* pval = (Value*) obj->rucy_value(); \
+			if (!pval) return new_ref(klass, obj); \
+			if (pval->is_nil()) *pval = new_wrapper(klass, obj); \
+			return *pval; \
 		} \
 	}
 
@@ -128,10 +128,9 @@
 	RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(native_class)
 
 
-#define RUCY_OVERRIDE_BEGIN(wrapper_class) \
-	typedef wrapper_class RucyWrapper; \
-	typedef RucyWrapper Super; \
-	enum { OVERRIDE_ID_FIRST = RucyWrapper::OVERRIDE_ID_LAST - 1,
+#define RUCY_OVERRIDE_BEGIN(super_class) \
+	typedef super_class Super; \
+	enum { OVERRIDE_ID_FIRST = super_class::OVERRIDE_ID_LAST - 1,
 
 #define RUCY_OVERRIDE_END \
 	OVERRIDE_ID_LAST };
@@ -139,6 +138,9 @@
 #define RUCY_OVERRIDE_ID(name) \
 	OID_##name,
 
+#define RUCY_IS_OVERRIDABLE() \
+	this->is_overridable()
+
 #define RUCY_IS_OVERRIDDEN(name) \
 	this->is_overridden(name, OID_##name)
 
@@ -255,7 +257,7 @@
 	while(0)
 
 #define RUCY_WRAPPER_CALL(native_class, obj, fun) \
-	((obj)->rucy_wrapped() ? (obj)->native_class::fun : (obj)->fun)
+	((obj)->rucy_disable_override() ? (obj)->fun : (obj)->fun)
 
 
 namespace Rucy
@@ -287,7 +289,7 @@ namespace Rucy
 			GlobalValue value;
 
 			ClassWrapper ()
-			:	value(nil(), true)
+			:	value(nil(), true), overridable(true)
 			{
 			}
 
@@ -318,11 +320,28 @@ namespace Rucy
 				override_flags.reset();
 			}
 
+			virtual bool is_overridable () const
+			{
+				if (!overridable)
+				{
+					overridable = true;
+					return false;
+				}
+
+				return true;
+			}
+
 			virtual bool is_overridden (const Symbol& name, uint id) const
 			{
 				if (id <= OVERRIDE_ID_UNKNOWN)
 					return false;
 
+				if (!overridable)
+				{
+					overridable = true;
+					return false;
+				}
+
 				bool checked = false, overridden = false;
 				get_override_flag(&checked, &overridden, id);
 				if (checked) return overridden;
@@ -334,8 +353,14 @@ namespace Rucy
 				return overridden;
 			}
 
-			virtual bool rucy_wrapped () const
+			virtual void* rucy_value () const
 			{
+				return (void*) &value;
+			}
+
+			virtual bool rucy_disable_override () const
+			{
+				overridable = false;
 				return true;
 			}
 
@@ -366,11 +391,20 @@ namespace Rucy
 
 			mutable boost::dynamic_bitset<> override_flags;
 
+			mutable bool overridable;
+
 			bool check_overridden (const Symbol& name) const
 			{
 				RUCY_SYM(method);
 				RUCY_SYM(owner);
-				return value.call(method, name.value()).call(owner) != get_ruby_class<RucyWrapped>();
+				RUCY_SYM(instance_methods);
+				RUCY_SYM_Q(include);
+				RUCY_SYM(clear_override_flags);
+				return !value
+					.call(method, name.value())
+					.call(owner)
+					.call(instance_methods, false)
+					.call(include, clear_override_flags.value());
 			}
 
 			void get_override_flag (bool* checked, bool* overridden, uint id) const

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucy
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - snori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake