rucy 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 67f71a7e93376401c6cc03e60b6c52edebb27ec7
+  data.tar.gz: ac0cd48435e3134dc6ab318a442caae40fe7c16c
+SHA512:
+  metadata.gz: 99a2a7c5f8c14eb83bd69a6b9876769fbab447571869171a8453bc13715c4bb12e11d2ceaf5f43129d6c555801fef06a9bfef52a3b0db881325de002207abf75
+  data.tar.gz: 6e03ed8138bf76df496a2b734ee57f36a4663cb73345220c82f0ae6937c7b9cb906f3fc66a895a743b818ab02146fef27be2ac6b631631b7722938069fcf4cf7

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

@@ -1,19 +1,17 @@
 #include "class.h"
 
 
-#include <rucy.h>
+#include "rucy.h"
 
 
 using namespace Rucy;
 
 
-static Class cBase, cSub, cRubyObj;
-
-
-RUCY_WRAPPER_VALUE_FROM_TO(Base,    cBase)
-RUCY_WRAPPER_VALUE_FROM_TO(Sub,     cSub)
-RUCY_WRAPPER_VALUE_FROM_TO(RubyObj, cRubyObj)
+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)
 
 template <typename T> Class get_class ();
 
@@ -26,26 +24,32 @@ template <typename T>
 class RubyBase : public ClassWrapper<T>
 {
 
-	typedef ClassWrapper<T> Super;
+	public:
 
-	RUCY_OVERRIDE_ID_START(name_overridable_faster)
-	RUCY_OVERRIDE_ID_LAST
+		RUCY_OVERRIDE_BEGIN(ClassWrapper<T>)
 
-	public:
+		RUCY_OVERRIDE_ID(name_overridable_faster)
+
+		RUCY_OVERRIDE_END
 
 		virtual const char* name_overridable () const
 		{
-			RUCY_OVERRIDABLE_METHOD(name_overridable, get_class<T>(), .c_str());
+			RUCY_SYM(name_overridable);
+			return this->value.call(name_overridable).c_str();
 		}
 
 		virtual const char* name_overridable_faster () const
 		{
-			RUCY_OVERRIDABLE_METHOD_FAST(name_overridable_faster, get_class<T>(), .c_str());
+			RUCY_SYM(name_overridable_faster);
+			if (RUCY_IS_OVERRIDDEN(name_overridable_faster, get_class<T>()))
+				return this->value.call(name_overridable_faster).c_str();
+			else
+				return Super::name_overridable_faster();
 		}
 
 		bool is_name_overridable_faster_overridden () const
 		{
-			SYM(name_overridable_faster);
+			RUCY_SYM(name_overridable_faster);
 			return RUCY_IS_OVERRIDDEN(name_overridable_faster, get_class<T>());
 		}
 
@@ -54,9 +58,9 @@ class RubyBase : public ClassWrapper<T>
 
 #define THIS(type)           to<type*>(self)
 
-#define CHECK(type)          RUCY_CHECK_OBJ(self, type, c##type)
+#define CHECK(type)          RUCY_CHECK_OBJ(type, c##type, self)
 
-#define CALL(type, obj, fun) RUCY_WRAPPER_CALL(ClassWrapper<type>, obj, fun)
+#define CALL(type, obj, fun) RUCY_WRAPPER_CALL(type, obj, fun)
 
 
 /*
@@ -114,32 +118,14 @@ template <typename T>
 static
 VALUE is_name_overridable_faster_overridden(VALUE self)
 {
-	RUCY_CHECK_OBJ(self, T, get_class<T>());
+	RUCY_CHECK_OBJ(T, get_class<T>(), self);
 	RubyBase<T>* obj = dynamic_cast<RubyBase<T>*>(THIS(T));
-	if (!obj) invalid_object_error("dynamic_cast() failed.");
+	if (!obj) invalid_object_error(__FILE__, __LINE__, "dynamic_cast() failed.");
 	return value(obj->is_name_overridable_faster_overridden());
 }
 
-template <typename T>
-static
-VALUE clear_override_flags(VALUE self)
-{
-	RUCY_CHECK_OBJ(self, T, get_class<T>());
-	ClassWrapper<T>* obj = dynamic_cast<ClassWrapper<T>*>(THIS(T));
-	if (obj) obj->clear_override_flags();
-}
-
-template <bool singleton>
-static
-VALUE method_added_or_removed(VALUE self, VALUE method_name)
-{
-	SYMBOL(klass, "class");
-	SYM(name);
-	eval(
-		Xot::stringf(
-			"ObjectSpace.each_object(%s) {|o| o.clear_override_flags}",
-			(singleton ? self(klass) : self)(name).c_str()).c_str());
-}
+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
 VALUE base_new_raw(VALUE self)
@@ -182,24 +168,33 @@ VALUE sub_new_raw(VALUE self)
 	alloc function.
 */
 static
-VALUE rubyobj_alloc(VALUE klass)
+VALUE simpleobj_alloc(VALUE klass)
+{
+	return value(new ClassWrapper<SimpleObj>, klass);
+}
+
+static
+VALUE simpleobj_initialize(VALUE self, VALUE name)
 {
-	return value(new ClassWrapper<RubyObj>, klass);
+	CHECK(SimpleObj);
+	THIS(SimpleObj)->init(name.c_str());
 }
 
-static Xot::Ref<RubyObj> rubyobj_ref;
+static std::vector<Xot::Ref<SimpleObj> > simpleobj_refs;
 
 static
-VALUE rubyobj_set_ref(VALUE self, VALUE obj)
+VALUE simpleobj_set_refs(VALUE self, VALUE objs)
 {
-	rubyobj_ref = to<RubyObj*>(obj);
-	return obj;
+	int size = objs.size();
+	for (int i = 0; i < size; ++i)
+		simpleobj_refs.push_back(to<SimpleObj*>(objs[i]));
+	return objs;
 }
 
 static
-VALUE rubyobj_clear_ref(VALUE self)
+VALUE simpleobj_clear_refs(VALUE self)
 {
-	rubyobj_ref.reset();
+	simpleobj_refs.clear();
 }
 
 
@@ -220,12 +215,8 @@ Init_class ()
 	cBase.define_method(
 		"is_name_overridable_faster_overridden",
 		 is_name_overridable_faster_overridden<Base>);
-	cBase.define_method("clear_override_flags",         clear_override_flags<Base>);
-	cBase.define_method("singleton_method_added",       method_added_or_removed<true>);
-	cBase.define_method("singleton_method_removed",     method_added_or_removed<true>);
-	cBase.define_singleton_method("method_added",       method_added_or_removed<false>);
-	cBase.define_singleton_method("method_removed",     method_added_or_removed<false>);
 	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);
@@ -234,11 +225,12 @@ Init_class ()
 	cSub.define_method(
 		"is_name_overridable_faster_overridden",
 		 is_name_overridable_faster_overridden<Sub>);
-	cSub.define_method("clear_override_flags",    clear_override_flags<Sub>);
 	rb_define_singleton_method(cSub, "new_raw", RUBY_METHOD_FUNC(sub_new_raw), 0);
+	
 
-	cRubyObj = rb_define_class_under(mTester, "RubyObj", rb_cObject);
-	rb_define_alloc_func(cRubyObj, rubyobj_alloc);
-	rb_define_function(cRubyObj, "set_ref", RUBY_METHOD_FUNC(rubyobj_set_ref), 1);
-	rb_define_function(cRubyObj, "clear_ref", RUBY_METHOD_FUNC(rubyobj_clear_ref), 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);
 }

data/.doc/ext/rucy/exception.cpp

@@ -1,4 +1,4 @@
-#include <rucy.h>
+#include "rucy.h"
 
 
 using namespace Rucy;

data/.doc/ext/rucy/function.cpp

@@ -1,4 +1,4 @@
-#include <rucy.h>
+#include "rucy.h"
 
 
 using namespace Rucy;
@@ -18,7 +18,7 @@ VALUE do_nothing(VALUE self)
 static
 VALUE return_nil(VALUE self)
 {
-	return Qnil;
+	return nil();
 }
 
 /*
@@ -48,6 +48,17 @@ VALUE return_string(VALUE self)
 	return value("");
 }
 
+/*
+	check_arg_count
+*/
+static
+VALUE arg_count_must_1(VALUE self)
+{
+	check_arg_count(__FILE__, __LINE__, "arg_count_must_1", argc, 1);
+	RUCY_SYM(ok);
+	return ok.value();
+}
+
 
 void
 Init_function ()
@@ -60,4 +71,5 @@ Init_function ()
 	rb_define_method(mTester, "return_int", RUBY_METHOD_FUNC(return_int), 0);
 	rb_define_method(mTester, "return_float", RUBY_METHOD_FUNC(return_float), 0);
 	rb_define_method(mTester, "return_string", RUBY_METHOD_FUNC(return_string), 0);
+	rb_define_method(mTester, "arg_count_must_1", RUBY_METHOD_FUNC(arg_count_must_1), -1);
 }

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

@@ -1,4 +1,4 @@
-#include <rucy.h>
+#include "rucy.h"
 
 
 using namespace Rucy;
@@ -16,25 +16,7 @@ struct Struct
 
 static Class cStruct;
 
-
-namespace Rucy
-{
-
-
-	static Value
-	value (const Struct& obj)
-	{
-		return new_type(cStruct, new Struct(obj));
-	}
-
-	template <> inline Struct*
-	value_to<Struct*> (Value val, bool)
-	{
-		return get_type_ptr<Struct>(val, cStruct);
-	}
-
-
-}// Rucy
+RUCY_VALUE_FROM_TO(Struct, cStruct)
 
 
 /*

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

@@ -2,13 +2,13 @@
 
 
 #include <vector>
-#include <rucy.h>
+#include "rucy.h"
 
 
 using namespace Rucy;
 
 
-static std::vector<String> logs;
+static std::vector<Xot::String> logs;
 
 
 void
@@ -18,21 +18,6 @@ log (const char* str)
 }
 
 
-/*
-	return last log.
-*/
-VALUE last_log(VALUE self)
-{
-	if (argc > 1)
-		arg_count_error("#last_log", argc, 0, 1);
-
-	size_t index = (argc >= 1) ? to<size_t>(argv[0]) : logs.size() - 1;
-	if (index >= logs.size())
-		index_error();
-
-	return value(logs[index].c_str());
-}
-
 /*
 	return all logs.
 */
@@ -62,12 +47,13 @@ void Init_class ();
 extern "C" void
 Init_tester ()
 {
-	if (!init()) return;
+	RUCY_TRY
+
+	init();
 
 	Module mRucy = rb_define_module("Rucy");
 	Module mTester = rb_define_module_under(mRucy, "Tester");
 
-	rb_define_function(mTester, "last_log", RUBY_METHOD_FUNC(last_log), -1);
 	rb_define_function(mTester, "all_logs", RUBY_METHOD_FUNC(all_logs), 0);
 	rb_define_function(mTester, "clear_logs", RUBY_METHOD_FUNC(clear_logs), 0);
 
@@ -76,4 +62,6 @@ Init_tester ()
 	Init_function();
 	Init_struct ();
 	Init_class ();
+
+	RUCY_CATCH
 }

data/.doc/ext/rucy/value.cpp

@@ -1,4 +1,4 @@
-#include <rucy.h>
+#include "rucy.h"
 
 
 using namespace Rucy;
@@ -28,6 +28,27 @@ VALUE nil_value(VALUE self)
 	return nil();
 }
 
+static
+VALUE array_value(VALUE self)
+{
+	const Value* a = argv;
+	switch (argc)
+	{
+		case 1:  return array(a[0]);
+		case 2:  return array(a[0], a[1]);
+		case 3:  return array(a[0], a[1], a[2]);
+		case 4:  return array(a[0], a[1], a[2], a[3]);
+		case 5:  return array(a[0], a[1], a[2], a[3], a[4]);
+		case 6:  return array(a[0], a[1], a[2], a[3], a[4], a[5]);
+		case 7:  return array(a[0], a[1], a[2], a[3], a[4], a[5], a[6]);
+		case 8:  return array(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7]);
+		case 9:  return array(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8]);
+		case 10: return array(a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9]);
+		case 0:
+		default: argument_error(__FILE__, __LINE__);
+	}
+}
+
 
 void
 Init_value ()
@@ -39,4 +60,5 @@ Init_value ()
 	rb_define_method(mTester, "false_to_value", RUBY_METHOD_FUNC(false_to_value), -1);
 	rb_define_method(mTester, "null_to_value", RUBY_METHOD_FUNC(NULL_to_value), -1);
 	rb_define_method(mTester, "nil_value", RUBY_METHOD_FUNC(nil_value), -1);
+	rb_define_method(mTester, "array_value", RUBY_METHOD_FUNC(array_value), -1);
 }

data/Rakefile

@@ -1,8 +1,9 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
-require 'xot/load_path'
-Xot::LoadPath.unshift File.expand_path('../lib', __FILE__)
+%w[../xot .]
+  .map  {|s| File.expand_path "../#{s}/lib", __FILE__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'xot/rake'
 require 'xot/module'
@@ -11,9 +12,10 @@ require 'rucy/module'
 include Xot::Rake
 
 
-MODULE     = Rucy
+MODULES    = [Xot, Rucy].map {|m| m.const_get :Module}
+MODULE     = MODULES.last
 DLNAME     = 'tester'
-INCDIRS    = [Rucy, Xot].map {|m| m.include_dirs}.flatten
+INCDIRS    = ruby_incdirs
 RUCY2RDOC  = 'bin/rucy2rdoc'
 NPARAM_MAX = 8
 NTIMES     = (0..NPARAM_MAX)
@@ -24,4 +26,4 @@ task :default => :build
 task :build => :lib
 
 
-[Xot, Rucy].each {|m| m.load_tasks}
+MODULES.each {|m| m.load_tasks :lib, :ext, :test, :doc, :gem}

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/bin/rucy2rdoc

@@ -26,11 +26,11 @@ class Parser
 
     def parse_functions (lines)
       re = %r{
-        (?:RUBY_)?DEF(\d+|N|_ALLOC)\( (\w+) \s* ((?:\, \s* \w+)*) \s* \) \s*
+        (?:RUCY_)?DEF(\d+|N|_ALLOC)\( (\w+) \s* ((?:\, \s* \w+)*) \s* \) \s*
         (\{ \s*
           .*?
         \}) \s*
-        (?:RUBY_)?END
+        (?:RUCY_)?END
       }mx
       process_lines lines, re do |all, type, name, params, body|
         type = '-1' if type == 'N'
@@ -42,7 +42,7 @@ class Parser
           params = 'VALUE self' + params
         end
         @funs[name] = {
-          :type => type,
+          :type   => type,
           :params => params,
           :body   => body
         }
@@ -72,7 +72,7 @@ class Parser
       }mx
       process_lines lines, re do |all, var, recv, define, name, super_|
         define += '_under' if recv
-        recv += ", " if recv
+        recv += ', ' if recv
         super_ = 'rb_cObject' if !super_ && define =~ /class/
         super_ = ', ' + super_ if super_
         "#{var} = rb_#{define}(#{recv}#{name}#{super_});"
@@ -85,7 +85,10 @@ class Parser
           \( \s* (?: (\"\w+(?:\=|\?\!)?\") \s* \, \s* )? (\w+) \s* \) \s* ;
       }mx
       process_lines lines, re do |all, obj, define, symbol, name|
-        type = @funs[name][:type]
+        fun = @funs[name]
+        next unless fun
+
+        type = fun[:type]
         if type == '_ALLOC'
           "rb_#{define}(#{obj}, #{name});"
         else