rucy 0.1.11 → 0.1.16

data/ext/rucy/extconf.rb

@@ -2,7 +2,7 @@
 
 
 %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 'mkmf'
@@ -13,10 +13,9 @@ require 'rucy/module'
 
 Xot::ExtConf.new Xot, Rucy do
   setup do
-    headers    << 'boost/noncopyable.hpp' << 'ruby.h'
+    headers    << 'ruby.h'
     local_libs << 'rucy'
   end
 
-  dir_config 'boost'
   create_makefile 'rucy/tester'
 end

data/ext/rucy/tester.cpp

@@ -56,8 +56,8 @@ Init_tester ()
 	Module mRucy   =       define_module("Rucy");
 	Module mTester = mRucy.define_module("Tester");
 
-	mTester.define_function("all_logs", all_logs);
-	mTester.define_function("clear_logs", clear_logs);
+	mTester.define_module_function("all_logs", all_logs);
+	mTester.define_module_function("clear_logs", clear_logs);
 
 	Init_value();
 	Init_exception();

data/include/rucy.h

@@ -6,12 +6,15 @@
 
 #include <rucy/ruby.h>
 #include <rucy/rucy.h>
-#include <rucy/value.h>
 #include <rucy/exception.h>
+#include <rucy/debug.h>
+
+#include <rucy/value.h>
 #include <rucy/function.h>
 #include <rucy/module.h>
 #include <rucy/class.h>
 #include <rucy/symbol.h>
+
 #include <rucy/extension.h>
 
 

data/include/rucy/debug.h

@@ -0,0 +1,22 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RUCY_DEBUG_H__
+#define __RUCY_DEBUG_H__
+
+
+#include <xot/debug.h>
+
+
+namespace Rucy
+{
+
+
+	using Xot::dout;
+
+	using Xot::doutln;
+
+
+}// Rucy
+
+
+#endif//EOH

data/include/rucy/exception.h

@@ -47,31 +47,51 @@ namespace Rucy
 	};// RubyJumpTag
 
 
+	[[noreturn]]
 	void raise (const char* format = NULL, ...);
 
+	[[noreturn]]
 	void raise (RubyValue exception, const char* format = NULL, ...);
 
 
-	void rucy_error            (const char* file, int line, const char* format = NULL, ...);
+	[[noreturn]]
+	void rucy_error (
+		const char* file, int line, const char* format = NULL, ...);
 
-	void type_error            (const char* file, int line, const char* format = NULL, ...);
+	[[noreturn]]
+	void type_error (
+		const char* file, int line, const char* format = NULL, ...);
 
-	void argument_error        (const char* file, int line, const char* format = NULL, ...);
+	[[noreturn]]
+	void argument_error (
+		const char* file, int line, const char* format = NULL, ...);
 
-	void arg_count_error       (const char* file, int line,
+	[[noreturn]]
+	void arg_count_error (
+		const char* file, int line,
 		const char* method, int nargs, int nargs_expected,
 		int n1 = -1, int n2 = -1, int n3 = -1, int n4 = -1, int n5 = -1,
 		int n6 = -1, int n7 = -1, int n8 = -1, int n9 = -1, int n10 = -1);
 
-	void invalid_state_error   (const char* file, int line, const char* format = NULL, ...);
+	[[noreturn]]
+	void invalid_state_error (
+		const char* file, int line, const char* format = NULL, ...);
 
-	void invalid_object_error  (const char* file, int line, const char* format = NULL, ...);
+	[[noreturn]]
+	void invalid_object_error (
+		const char* file, int line, const char* format = NULL, ...);
 
-	void index_error           (const char* file, int line, const char* format = NULL, ...);
+	[[noreturn]]
+	void index_error (
+		const char* file, int line, const char* format = NULL, ...);
 
-	void not_implemented_error (const char* file, int line, const char* format = NULL, ...);
+	[[noreturn]]
+	void not_implemented_error (
+		const char* file, int line, const char* format = NULL, ...);
 
-	void system_error          (const char* file, int line, const char* format = NULL, ...);
+	[[noreturn]]
+	void system_error (
+		const char* file, int line, const char* format = NULL, ...);
 
 
 }// Rucy

data/include/rucy/extension.h.erb

@@ -4,8 +4,6 @@
 #define __RUCY_EXTENSION_H__
 
 
-#include <typeinfo>
-#include <boost/dynamic_bitset.hpp>
 #include <xot/ref.h>
 #include <xot/string.h>
 #include <rucy/rucy.h>
@@ -23,11 +21,26 @@
 #define RUCY_DECLARE_VALUE_TO(native_class) \
 	namespace Rucy \
 	{ \
-		template <> native_class* value_to<native_class*> (Value value, bool); \
-		template <> native_class& value_to<native_class&> (Value value, bool convert); \
-		template <> native_class  value_to<native_class>  (Value value, bool convert); \
+		template <>       native_class* value_to<      native_class*> (Value value, bool); \
+		template <> const native_class* value_to<const native_class*> (Value value, bool); \
+		template <>       native_class& value_to<      native_class&> (Value value, bool convert); \
+		template <> const native_class& value_to<const native_class&> (Value value, bool convert); \
 	}
 
+#define RUCY_DECLARE_ARRAY_TO(native_class) \
+	namespace Rucy \
+	{ \
+		template <> native_class value_to<native_class> (Value value, bool convert); \
+		template <> native_class value_to<native_class> (int argc, const Value* argv, bool convert); \
+	}
+
+#define RUCY_DECLARE_CONVERT_TO(native_type) \
+	RUCY_DECLARE_ARRAY_TO(native_type)
+
+#define RUCY_DECLARE_VALUE_OR_ARRAY_TO(native_class) \
+	RUCY_DECLARE_VALUE_TO(native_class) \
+	RUCY_DECLARE_ARRAY_TO(native_class)
+
 #define RUCY_DECLARE_WRAPPER_VALUE_FROM(native_class) \
 	namespace Rucy \
 	{ \
@@ -38,7 +51,8 @@
 #define RUCY_DECLARE_WRAPPER_VALUE_TO(native_class) \
 	namespace Rucy \
 	{ \
-		template <> native_class* value_to<native_class*> (Value value, bool convert); \
+		template <>       native_class* value_to<      native_class*> (Value value, bool convert); \
+		template <> const native_class* value_to<const native_class*> (Value value, bool convert); \
 	}
 
 #define RUCY_DEFINE_VALUE_FROM(native_class) \
@@ -64,6 +78,11 @@
 		{ \
 			return get_type_ptr<native_class>(value, get_ruby_class<native_class>()); \
 		} \
+		template <> const native_class* \
+		value_to<const native_class*> (Value value, bool convert) \
+		{ \
+			return (const native_class*) value_to<native_class*>(value, convert); \
+		} \
 		template <> native_class& \
 		value_to<native_class&> (Value value, bool convert) \
 		{ \
@@ -72,8 +91,33 @@
 				rucy_error(__FILE__, __LINE__, "failed to convert from/to %s.", #native_class); \
 			return *obj; \
 		} \
+		template <> const native_class& \
+		value_to<const native_class&> (Value value, bool convert) \
+		{ \
+			return (const native_class&) value_to<native_class&>(value, convert); \
+		} \
+	}
+
+#define RUCY_DEFINE_ARRAY_TO(native_class) \
+	namespace Rucy \
+	{ \
+		template <> native_class \
+		value_to<native_class> (Value value, bool convert) \
+		{ \
+			if (value.is_array()) \
+				return value_to<native_class>(value.size(), value.as_array(), convert); \
+			else \
+				return value_to<native_class>(1, &value, convert); \
+		} \
 	}
 
+#define RUCY_DEFINE_CONVERT_TO(native_type) \
+	RUCY_DEFINE_ARRAY_TO(native_type)
+
+#define RUCY_DEFINE_VALUE_OR_ARRAY_TO(native_class) \
+	RUCY_DEFINE_VALUE_TO(native_class) \
+	RUCY_DEFINE_ARRAY_TO(native_class)
+
 #define RUCY_DEFINE_WRAPPER_VALUE_FROM(native_class) \
 	namespace Rucy \
 	{ \
@@ -86,10 +130,10 @@
 		value (native_class* obj, Value klass) \
 		{ \
 			if (!obj) return nil(); \
-			Value* pval = (Value*) obj->rucy_value(); \
-			if (!pval) return new_ref(klass, obj); \
-			if (pval->is_nil()) *pval = new_wrapper(klass, obj); \
-			return *pval; \
+			GlobalValue* wrapped = (GlobalValue*) obj->rucy_wrapper_value(); \
+			if (!wrapped) return new_ref(klass, obj); \
+			if (wrapped->is_nil()) *wrapped = new_wrapper(klass, obj); \
+			return *wrapped; \
 		} \
 	}
 
@@ -97,10 +141,15 @@
 	namespace Rucy \
 	{ \
 		template <> native_class* \
-		value_to<native_class*> (Value value, bool convert) \
+		value_to<native_class*> (Value value, bool) \
 		{ \
 			return get_type_ptr<native_class>(value, get_ruby_class<native_class>()); \
 		} \
+		template <> const native_class* \
+		value_to<const native_class*> (Value value, bool convert) \
+		{ \
+			return (const native_class*) value_to<native_class*>(value, convert); \
+		} \
 	}
 
 #define RUCY_DECLARE_VALUE_FROM_TO(native_class) \
@@ -115,6 +164,18 @@
 	RUCY_DECLARE_VALUE_FROM_TO(native_class) \
 	RUCY_DEFINE_VALUE_FROM_TO(native_class)
 
+#define RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(native_class) \
+	RUCY_DECLARE_VALUE_FROM(native_class) \
+	RUCY_DECLARE_VALUE_OR_ARRAY_TO(native_class)
+
+#define RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(native_class) \
+	RUCY_DEFINE_VALUE_FROM(native_class) \
+	RUCY_DEFINE_VALUE_OR_ARRAY_TO(native_class)
+
+#define RUCY_VALUE_OR_ARRAY_FROM_TO(native_class) \
+	RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(native_class) \
+	RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(native_class)
+
 #define RUCY_DECLARE_WRAPPER_VALUE_FROM_TO(native_class) \
 	RUCY_DECLARE_WRAPPER_VALUE_FROM(native_class) \
 	RUCY_DECLARE_WRAPPER_VALUE_TO(native_class)
@@ -128,25 +189,8 @@
 	RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(native_class)
 
 
-#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 };
-
-#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)
-
-
 #define RUCY_TRY \
-	RubyValue RUCY__rubyexception__ = nil(); \
+	Rucy::RubyValue RUCY__rubyexception__ = Rucy::nil(); \
 	int RUCY__rubyjumptag__ = 0; \
 	 \
 	goto RUCY__ruby_try_start__; \
@@ -207,35 +251,25 @@
 
 
 #define RUCY_DEF_ALLOC(name, klass) \
-	RubyValue name (Value klass) \
+	Rucy::RubyValue name (Rucy::Value klass) \
 	{ \
 		RUCY_TRY
 
 #define RUCY_DEFN(name) \
-	RubyValue name (int argc, const Value* argv, Value self) \
+	Rucy::RubyValue name (int argc, const Rucy::Value* argv, Rucy::Value self) \
 	{ \
 		RUCY_TRY
 
 %	NTIMES.each do |n|
 #define RUCY_DEF<%= n %>(name<%= params(n) {|i| ", v#{i}"} %>) \
-	RubyValue name (Value self<%= params(n) {|i| ", Value v#{i}"} %>) \
+	Rucy::RubyValue name (Rucy::Value self<%= params(n) {|i| ", Rucy::Value v#{i}"} %>) \
 	{ \
 		RUCY_TRY
 %	end
 
-#define RUCY_DEF_clear_override_flags(name, native_class) \
-	RUCY_DEF0(name) \
-	{ \
-		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
-
 #define RUCY_END \
 		RUCY_CATCH \
-		return nil(); \
+		return Rucy::nil(); \
 	}
 
 
@@ -251,12 +285,13 @@
 #define RUCY_CHECK_OBJECT(native_class, obj) \
 	do \
 	{ \
-		native_class* p = Rucy::get_type_ptr<native_class>(obj, get_ruby_class<native_class>()); \
+		native_class* p = \
+			Rucy::get_type_ptr<native_class>(obj, Rucy::get_ruby_class<native_class>()); \
 		if (!p || !*p) Rucy::invalid_object_error(__FILE__, __LINE__); \
 	} \
 	while(0)
 
-#define RUCY_WRAPPER_CALL(native_class, obj, fun) \
+#define RUCY_CALL_SUPER(obj, fun) \
 	((obj)->rucy_disable_override() ? (obj)->fun : (obj)->fun)
 
 
@@ -276,15 +311,15 @@ namespace Rucy
 	template <typename T> Class get_ruby_class ();
 
 
-	template <typename T>
-	class ClassWrapper : public T
+	template <typename RefCountableT>
+	class ClassWrapper : public RefCountableT
 	{
 
-		typedef ClassWrapper This;
+		typedef ClassWrapper  This;
 
-		public:
+		typedef RefCountableT RucyWrapped;
 
-			typedef T RucyWrapped;
+		public:
 
 			GlobalValue value;
 
@@ -293,47 +328,21 @@ namespace Rucy
 			{
 			}
 
-			virtual void retain (void* by_ruby_value = NULL) const
+			void retain (intptr_t by_ruby) const override
 			{
-				if (!by_ruby_value)
-				{
-					refc_set_aux(refc_aux() + 1);
-					if (refc_aux() == 1) value.gc(false);
-				}
-
+				if (!by_ruby) value.disable_gc();
 				RucyWrapped::retain();
 			}
 
-			virtual void release (void* by_ruby_value = NULL) const
+			void release (intptr_t by_ruby) const override
 			{
-				if (!by_ruby_value && refc_aux() > 0)
-				{
-					refc_set_aux(refc_aux() - 1);
-					if (refc_aux() == 0) value.gc(true);
-				}
-
+				if (!by_ruby) value.enable_gc();
 				RucyWrapped::release();
 			}
 
-			virtual void clear_override_flags ()
-			{
-				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)
+				if (value.is_nil())
 					return false;
 
 				if (!overridable)
@@ -342,111 +351,27 @@ namespace Rucy
 					return false;
 				}
 
-				bool checked = false, overridden = false;
-				get_override_flag(&checked, &overridden, id);
-				if (checked) return overridden;
-
-				overridden = check_overridden(name);
-				if (!set_override_flag(id, true, overridden))
-					return false;
-
-				return overridden;
+				return true;
 			}
 
-			virtual void* rucy_value () const
+			void* rucy_wrapper_value () const override
 			{
 				return (void*) &value;
 			}
 
-			virtual bool rucy_disable_override () const
+			bool rucy_disable_override () const override
 			{
 				overridable = false;
 				return true;
 			}
 
-		protected:
-
-			enum
-			{
-
-				OVERRIDE_ID_UNKNOWN = 0,
-
-				OVERRIDE_ID_LAST,
-
-				OVERRIDE_ID_MAX = 256
-
-			};
-
-			virtual ushort refc_aux () const
-			{
-				return RucyWrapped::refc_aux();
-			}
-
-			virtual void refc_set_aux (ushort aux) const
-			{
-				RucyWrapped::refc_set_aux(aux);
-			}
-
 		private:
 
-			mutable boost::dynamic_bitset<> override_flags;
-
 			mutable bool overridable;
 
-			bool check_overridden (const Symbol& name) const
-			{
-				RUCY_SYM(method);
-				RUCY_SYM(owner);
-				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
-			{
-				assert(checked || overridden);
-
-				int checked_pos    = id2index(id);
-				int overridden_pos = checked_pos + 1;
-				bool valid = 0 <= checked_pos && overridden_pos < (int) override_flags.size();
-				if (checked)    *checked    = valid ? override_flags[checked_pos]    : false;
-				if (overridden) *overridden = valid ? override_flags[overridden_pos] : false;
-			}
-
-			bool set_override_flag (uint id, bool checked, bool overridden) const
-			{
-				assert(id < OVERRIDE_ID_MAX);
-
-				int checked_pos = id2index(id);
-				if (checked_pos < 0) return true;
-
-				int overridden_pos = checked_pos + 1;
-				if (overridden_pos >= (int) override_flags.size())
-					override_flags.resize(overridden_pos + 1);
-
-				override_flags[checked_pos]    = checked;
-				override_flags[overridden_pos] = overridden;
-				return true;
-			}
-
-			int id2index (uint id) const
-			{
-				return (id - 1) * 2;
-			}
-
 	};// ClassWrapper
 
 
-	template <typename T> inline void mark_type (void* p)
-	{
-		if (p) ((T*) p)->mark();
-	}
-
 	template <typename T> inline void delete_type (void* p)
 	{
 		delete (T*) p;
@@ -454,12 +379,12 @@ namespace Rucy
 
 	template <typename T> inline void release_ref (void* p)
 	{
-		if (p) ((T*) p)->release((void*) true);// 'true' means by-ruby-value.
+		if (p) ((T*) p)->release();
 	}
 
 	template <typename T> inline void release_wrapper (void* p)
 	{
-		if (p) ((T*) p)->Xot::template RefCountable<>::release();
+		if (p) ((T*) p)->release(true);
 	}
 
 
@@ -485,7 +410,7 @@ namespace Rucy
 		RUBY_DATA_FUNC mark = NULL,
 		RUBY_DATA_FUNC free = release_ref<T>)
 	{
-		if (ptr) ptr->retain((void*) true);// 'true' means by-ruby-value
+		if (ptr) ptr->retain();
 		return new_type(klass, ptr, mark, free);
 	}
 
@@ -502,7 +427,7 @@ namespace Rucy
 		RUBY_DATA_FUNC mark = NULL,
 		RUBY_DATA_FUNC free = release_wrapper<T>)
 	{
-		if (ptr) ptr->Xot::template RefCountable<>::retain();
+		if (ptr) ptr->retain(true);
 		return new_type(klass, ptr, mark, free);
 	}