rucy 0.1.2 → 0.1.3

data/ext/rucy/tester.cpp

@@ -4,12 +4,88 @@
 using namespace Rucy;
 
 
+struct Tester
+{
+
+	int value;
+
+};// Tester
+
+
+static Class cTester;
+
+
+Class
+tester_class ()
+{
+	return cTester;
+}
+
+
+namespace Rucy
+{
+
+
+	static Value
+	value (const Tester& obj)
+	{
+		return new_type<Tester>(tester_class(), new Tester(obj));
+	}
+
+	template <> inline Tester*
+	value_to<Tester*> (Value obj, bool)
+	{
+		return get_type<Tester>(obj, tester_class());
+	}
+
+
+}// Rucy
+
+
+/*
+	alloc function.
+*/
+static
+RUBY_DEF_ALLOC(alloc, klass)
+{
+	return new_type<Tester>(klass);
+}
+RUBY_END
+
+/*
+	get value.
+*/
+static
+RUBY_DEF0(get_value)
+{
+	Tester* t = to<Tester*>(self);
+	if (t) return value(t->value);
+}
+RUBY_END
+
+/*
+	set value.
+*/
 static
-RUBY_DEF0(do_nothing)
+RUBY_DEF1(set_value, value)
 {
+	Tester* t = to<Tester*>(self);
+	if (t) t->value = to<int>(value);
 }
 RUBY_END
 
+/*
+	do nothing.
+*/
+static
+RUBY_DEFN(do_nothing)
+{
+}
+RUBY_END
+
+/*
+	return nil.
+*/
 static
 RUBY_DEF0(return_nil)
 {
@@ -17,27 +93,39 @@ RUBY_DEF0(return_nil)
 }
 RUBY_END
 
+/*
+	return int.
+*/
 static
 RUBY_DEF0(return_int)
 {
-	return Value(1);
+	return value(1);
 }
 RUBY_END
 
+/*
+	return flaot.
+*/
 static
 RUBY_DEF0(return_float)
 {
-	return Value(1.0f);
+	return value(1.0f);
 }
 RUBY_END
 
+/*
+	return string.
+*/
 static
 RUBY_DEF0(return_string)
 {
-	return Value("");
+	return value("");
 }
 RUBY_END
 
+/*
+	raise ruby's exception.
+*/
 static
 RUBY_DEF0(raise_ruby_exception)
 {
@@ -45,6 +133,9 @@ RUBY_DEF0(raise_ruby_exception)
 }
 RUBY_END
 
+/*
+	raise in eval.
+*/
 static
 RUBY_DEF0(raise_in_eval)
 {
@@ -52,6 +143,19 @@ RUBY_DEF0(raise_in_eval)
 }
 RUBY_END
 
+/*
+	throw nothing.
+*/
+static
+RUBY_DEF0(throw_nothing)
+{
+	throw;
+}
+RUBY_END
+
+/*
+	throw std::exception.
+*/
 static
 RUBY_DEF0(throw_std_exception)
 {
@@ -59,6 +163,9 @@ RUBY_DEF0(throw_std_exception)
 }
 RUBY_END
 
+/*
+	throw std::runtime_error.
+*/
 static
 RUBY_DEF0(throw_std_runtime_error)
 {
@@ -66,6 +173,24 @@ RUBY_DEF0(throw_std_runtime_error)
 }
 RUBY_END
 
+struct MyException : public std::runtime_error
+{
+	MyException() : runtime_error("") {}
+};
+
+/*
+	throw custom exception class.
+*/
+static
+RUBY_DEF0(throw_custom_exception)
+{
+	throw MyException();
+}
+RUBY_END
+
+/*
+	throw std::string.
+*/
 static
 RUBY_DEF0(throw_std_string)
 {
@@ -73,6 +198,9 @@ RUBY_DEF0(throw_std_string)
 }
 RUBY_END
 
+/*
+	throw char*.
+*/
 static
 RUBY_DEF0(throw_cstring)
 {
@@ -86,17 +214,25 @@ Init_tester ()
 {
 	if (!init()) return;
 
-	define_module("Rucy")
-		.define_class("Tester")
-			.define_method("do_nothing", do_nothing)
-			.define_method("return_nil", return_nil)
-			.define_method("return_int", return_int)
-			.define_method("return_float", return_float)
-			.define_method("return_string", return_string)
-			.define_method("raise_ruby_exception", raise_ruby_exception)
-			.define_method("raise_in_eval", raise_in_eval)
-			.define_method("throw_std_exception", throw_std_exception)
-			.define_method("throw_std_runtime_error", throw_std_runtime_error)
-			.define_method("throw_std_string", throw_std_string)
-			.define_method("throw_cstring", throw_cstring);
+	Module m = define_module("Rucy");
+
+	Class c = m.define_class("Tester");
+	cTester = c;
+
+	c.define_alloc_func(alloc);
+	c.define_method("value", get_value);
+	c.define_method("value=", set_value);
+	c.define_method("do_nothing", do_nothing);
+	c.define_method("return_nil", return_nil);
+	c.define_method("return_int", return_int);
+	c.define_method("return_float", return_float);
+	c.define_method("return_string", return_string);
+	c.define_method("raise_ruby_exception", raise_ruby_exception);
+	c.define_method("raise_in_eval", raise_in_eval);
+	c.define_method("throw_nothing", throw_nothing);
+	c.define_method("throw_std_exception", throw_std_exception);
+	c.define_method("throw_std_runtime_error", throw_std_runtime_error);
+	c.define_method("throw_custom_exception", throw_custom_exception);
+	c.define_method("throw_std_string", throw_std_string);
+	c.define_method("throw_cstring", throw_cstring);
 }

data/include/rucy/class.h

@@ -28,9 +28,6 @@ namespace Rucy
 	};// Class
 
 
-	Class define_class (const char* name, Value super = rb_cObject);
-
-
 }// Rucy
 
 

data/include/rucy/defs.h

@@ -5,12 +5,16 @@
 
 
 #include <ruby.h>
+#include <xot/string.h>
 
 
 namespace Rucy
 {
 
 
+	using Xot::String;
+
+
 	class Value;
 
 

data/include/rucy/defs.h.erb

@@ -1,17 +1,20 @@
 // -*- c++ -*-
-% require 'support'
 #pragma once
 #ifndef __RUCY_DEFS_H__
 #define __RUCY_DEFS_H__
 
 
 #include <ruby.h>
+#include <xot/string.h>
 
 
 namespace Rucy
 {
 
 
+	using Xot::String;
+
+
 	class Value;
 
 

data/include/rucy/exception.h

@@ -5,7 +5,7 @@
 
 
 #include <stdexcept>
-#include <rucy/value.h>
+#include <typeinfo>
 #include <rucy/class.h>
 
 
@@ -13,38 +13,6 @@ namespace Rucy
 {
 
 
-	Class native_error_class ();
-	// class Rucy::NativeError < RuntimeError
-
-	Class system_error_class ();
-	// class Rucy::SystemError < Rucy::NativeError
-
-	Class invalid_object_error_class ();
-	// class Rucy::InvalidObjectError < Rucy::NativeError
-
-
-	void error (const char* format, ...);
-
-	void raise (Value exception, const char* format = NULL, ...);
-
-
-	void type_error (const char* format = NULL, ...);
-
-	void argument_error (const char* format = NULL, ...);
-
-	void arg_count_error (
-		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 not_implemented_error (const char* format = NULL, ...);
-
-
-	void system_error (const char* format = NULL, ...);
-
-	void invalid_object_error (const char* format = NULL, ...);
-
-
 	class RubyException : public std::runtime_error
 	{
 
@@ -79,6 +47,28 @@ namespace Rucy
 	};// RubyJumptag
 
 
+	void raise (const char* format = NULL, ...);
+
+	void raise (VALUE exception, const char* format = NULL, ...);
+
+
+	void type_error (const char* format = NULL, ...);
+
+	void argument_error (const char* format = NULL, ...);
+
+	void arg_count_error (
+		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 not_implemented_error (const char* format = NULL, ...);
+
+
+	void system_error (const char* format = NULL, ...);
+
+	void invalid_object_error (const char* format = NULL, ...);
+
+
 }// Rucy
 
 
@@ -112,7 +102,13 @@ namespace Rucy
 	} \
 	catch (const std::exception& e) \
 	{ \
-		RUBY_THROW(rb_exc_new2(Rucy::native_error_class(), e.what())); \
+		Rucy::String text = e.what(), type = typeid(e).name(); \
+		if (!type.empty()) \
+		{ \
+			if (!text.empty()) text += " "; \
+			text += "[" + type + "]"; \
+		} \
+		RUBY_THROW(rb_exc_new2(Rucy::native_error_class(), text.c_str())); \
 	} \
 	catch (const std::string& s) \
 	{ \
@@ -125,7 +121,7 @@ namespace Rucy
 	catch (...) \
 	{ \
 		RUBY_THROW(rb_exc_new2( \
-			Rucy::native_error_class(), "Unknown C++ exception thrown.")); \
+			Rucy::native_error_class(), "Unknown C++ exception was thrown.")); \
 	}
 
 #define RUBY_THROW(exception) \

data/include/rucy/function.h.erb

@@ -1,5 +1,4 @@
 // -*- c++ -*-
-% require 'support'
 #pragma once
 #ifndef __RUCY_FUNCTION_H__
 #define __RUCY_FUNCTION_H__

data/include/rucy/module.h

@@ -39,6 +39,8 @@ namespace Rucy
 
 			Module include_module (Value module);
 
+			Module extend_module (Value module);
+
 			Module define_function (const char* name, RubyFunctionN fun);
 			Module define_function (const char* name, RubyFunction0 fun);
 			Module define_function (const char* name, RubyFunction1 fun);
@@ -85,9 +87,9 @@ namespace Rucy
 
 	Module define_module (const char* name);
 
+	Class define_class (const char* name, Value super = rb_cObject);
 
-	Module rucy_module ();
-	// module Rucy
+	void define_const (const char* name, Value val);
 
 
 }// Rucy

data/include/rucy/module.h.erb

@@ -1,5 +1,4 @@
 // -*- c++ -*-
-% require 'support'
 #pragma once
 #ifndef __RUCY_MODULE_H__
 #define __RUCY_MODULE_H__
@@ -40,6 +39,8 @@ namespace Rucy
 
 			Module include_module (Value module);
 
+			Module extend_module (Value module);
+
 %			[
 %				'define_function',
 %				'define_method',
@@ -57,9 +58,9 @@ namespace Rucy
 
 	Module define_module (const char* name);
 
+	Class define_class (const char* name, Value super = rb_cObject);
 
-	Module rucy_module ();
-	// module Rucy
+	void define_const (const char* name, Value val);
 
 
 }// Rucy

data/include/rucy/rucy.h

@@ -5,7 +5,7 @@
 
 
 #include <ruby.h>
-#include <rucy/value.h>
+#include <rucy/class.h>
 
 
 namespace Rucy
@@ -14,13 +14,21 @@ namespace Rucy
 
 	bool init ();
 
+	bool check_class (Value obj, Value klass);
 
-	Value require (const char* name);
 
-	void define_const (const char* name, Value val);
+	Module rucy_module ();
+	// module Rucy
 
 
-	bool check_class (Value obj, Value class_);
+	Class native_error_class ();
+	// class Rucy::NativeError < RuntimeError
+
+	Class system_error_class ();
+	// class Rucy::SystemError < Rucy::NativeError
+
+	Class invalid_object_error_class ();
+	// class Rucy::InvalidObjectError < Rucy::NativeError
 
 
 	template <typename T> inline void mark_type (void* p)

data/include/rucy/value.h.erb

@@ -1,5 +1,4 @@
 // -*- c++ -*-
-% require 'support'
 #pragma once
 #ifndef __RUCY_VALUE_H__
 #define __RUCY_VALUE_H__

data/include/rucy.h

@@ -1,10 +1,10 @@
 // -*- c++ -*-
+#include <rucy/defs.h>
 #include <rucy/rucy.h>
-#include <rucy/class.h>
+#include <rucy/value.h>
 #include <rucy/exception.h>
 #include <rucy/function.h>
-#include <rucy/gc.h>
 #include <rucy/module.h>
-#include <rucy/string.h>
+#include <rucy/class.h>
 #include <rucy/symbol.h>
-#include <rucy/value.h>
+#include <rucy/gc.h>

data/lib/rucy/module.rb

@@ -10,12 +10,20 @@ module Rucy
       File.expand_path(File.join File.dirname(__FILE__), '..', '..')
     end
 
-	  def include_dirs ()
+    def include_dirs ()
       [File.join(root_dir, 'include')]
     end
 
     def library_dirs ()
-      [File.join(root_dir, 'lib')]
+      %w[lib].map {|dir| File.join root_dir, dir}
+    end
+
+    def task_dir ()
+      File.join root_dir, 'task'
+    end
+
+    def load_tasks ()
+      Dir["#{task_dir}/**/*.rake"].each {|path| load path}
     end
 
     def version ()

data/rucy.gemspec

@@ -7,38 +7,50 @@ require 'rake'
 require 'rucy/module'
 
 
-FILES = FileList[*%w[
+MODULE = Rucy
+NAME   = MODULE.name.downcase
+
+
+FILES = FileList[*%W[
   README
   ChangeLog
   Rakefile
-  support.rb
-  rucy.gemspec
+  #{NAME}.gemspec
   VERSION
   task/**/*.rake
   ext/**/*.rb
+  ext/**/*.h
   ext/**/*.cpp
-  include/**/*.h
   include/**/*.erb
+  include/**/*.h
   lib/**/*.rb
-  src/**/*.cpp
   src/**/*.erb
+  src/**/*.h
+  src/**/*.cpp
   test/**/*.rb
 ]]
 
+RDOCS = FileList[*%W[
+  README
+  .doc/ext/**/*.cpp
+]]
+
+
 Gem::Specification.new do |s|
-  s.name        = 'rucy'
+  s.name        = NAME
   s.summary     = 'A Ruby C++ Extension Helper Library.'
   s.description = 'This library helps you to develop Ruby Extension by C++.'
-  s.version     = Rucy.version
+  s.version     = MODULE.version
 
   s.authors  = %w[snori]
   s.email    = 'snori@xord.org'
-  s.homepage = 'http://github.com/xord/rucy'
+  s.homepage = "http://github.com/xord/#{NAME}"
 
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9.0'
   s.require_paths         << 'ext'
 
+  s.add_runtime_dependency 'xot'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'gemcutter'
 
@@ -46,7 +58,9 @@ Gem::Specification.new do |s|
   s.test_files = FileList['test/**/test_*.rb'].to_a
 
   s.has_rdoc         = true
-  s.extra_rdoc_files = ['README']
+  s.extra_rdoc_files = RDOCS.to_a
+
+  s.executables << 'rucy2rdoc'
 
   s.extensions << 'Rakefile'
 end

data/src/class.cpp

@@ -25,11 +25,4 @@ namespace Rucy
 	}
 
 
-	Class
-	define_class (const char* name, Value super)
-	{
-		return rb_define_class(name, super);
-	}
-
-
 }// Rucy