reflexion 0.1.3 → 0.1.4

data/ext/reflex/defs.h

@@ -7,24 +7,7 @@
 #include <reflex/exception.h>
 
 
-using Reflex::error;
-
-
-#define CHECK_OBJ(obj, type, klass) \
-	do \
-	{ \
-		type* p = Rucy::get_type<type>(obj, klass); \
-		if (!p) Rucy::invalid_object_error(); \
-	} \
-	while(0)
-
-#define CHECK_OBJECT(obj, type, klass) \
-	do \
-	{ \
-		type* p = Rucy::get_type<type>(obj, klass); \
-		if (!p || !*p) Rucy::invalid_object_error(); \
-	} \
-	while(0)
+using Reflex::reflex_error;
 
 
 #endif//EOH

data/ext/reflex/extconf.rb

@@ -1,21 +1,19 @@
 # -*- coding: utf-8 -*-
 
 
-%w[. ../xot ../rucy].map {|s| "../../#{s}/lib"}.each do |path|
-  $: << File.expand_path(File.join File.dirname(__FILE__), *path.split('/'))
-end
-
-require 'rubygems'
+require 'bundler/setup'
 require 'mkmf'
 require 'xot/rake/helpers'
 require 'xot/module'
 require 'rucy/module'
+require 'rays/module'
 require 'reflex/module'
 
 include Xot::Rake
 
 
-DEBUG = env :DEBUG, false
+debug = env :DEBUG, false
+
 
 DEFS    = []
 INCDIRS = %w[
@@ -30,19 +28,24 @@ HEADERS    = %w[
   ruby.h
   xot.h
   rucy.h
+  rays.h
   reflex.h
 ]
 LIBS = %w[
   stdc++
   xot
   rucy
+  rays
   reflex
 ]
 FRAMEWORKS = []
 
 
-DEFS << '_DEBUG' if DEBUG
+DEFS << '_DEBUG' if debug
+DEFS << 'NDEBUG' unless debug
 DEFS << $~[0].upcase if RUBY_PLATFORM =~ /mswin|ming|cygwin|darwin/i
+LIBDIRS.concat Rays.library_dirs
+LIBS << 'rays/native' unless cocoa?
 if win32?
   DEFS << 'WINDOWS' << 'WIN32'
   LIBS.unshift 'gdi32', 'opengl32'
@@ -55,14 +58,19 @@ $CPPFLAGS   << DEFS.map       {|s| " -D#{s}"}.join
 $CPPFLAGS   << INCDIRS.map    {|s| " -I#{s}"}.join
 $LDFLAGS    << LIBDIRS.map    {|s| " -L#{s}"}.join
 $LDFLAGS    << FRAMEWORKS.map {|s| " -framework #{s}"}.join
+$LDFLAGS    << ' -Wl,--out-implib=native.dll.a' if cygwin?
+$CFLAGS     << ' --stdlib=libc++' if clang?
 $LOCAL_LIBS << ' -lrucy'
 
-Config::CONFIG.each {|key, val| val.gsub!(/gcc/, 'g++')}
+RbConfig::CONFIG.each do |key, val|
+  {'gcc' => 'g++', 'clang' => 'clang++'}.each {|from, to| val.gsub! from, to}
+end
 
 
 dir_config 'boost'
 dir_config 'xot',    Xot.root_dir
 dir_config 'rucy',   Rucy.root_dir
+dir_config 'rays',   Rays.root_dir
 dir_config 'reflex', Reflex.root_dir
 
 exit 1 unless HEADERS.all? {|s| have_header(s)}

data/ext/reflex/key.cpp

@@ -8,12 +8,13 @@
 using namespace Rucy;
 
 
+static Class cKey;
+
+
 namespace Reflex
 {
 
 
-	static Class cKey;
-
 	Class
 	key_class ()
 	{
@@ -31,63 +32,59 @@ namespace Rucy
 	Value
 	value (const Reflex::Key& key)
 	{
-		return new_type<Reflex::Key>(
-			Reflex::key_class(), new Reflex::Key(key));
+		return new_type(cKey, new Reflex::Key(key));
 	}
 
 
 }// Rucy
 
 
-struct RubyKey : public Reflex::Key
-{
-
-	operator bool () const
-	{
-		return true;
-	}
-
-	bool operator ! () const
-	{
-		return !operator bool();
-	}
-
-};// RubyKey
-
+#define THIS to<Reflex::Key*>(self)
 
-#define this ((RubyKey*) to<Reflex::Key*>(self))
-
-#define CHECK CHECK_OBJECT(self, RubyKey, Reflex::key_class())
+#define CHECK RUCY_CHECK_OBJ(self, Reflex::Key, cKey)
 
 
 static
 RUBY_DEF_ALLOC(alloc, klass)
 {
-	return new_type<RubyKey>(klass, new RubyKey);
+	return new_type<Reflex::Key>(klass);
 }
 RUBY_END
 
 static
 RUBY_DEFN(initialize)
 {
-	CHECK_OBJ(self, RubyKey, Reflex::key_class());
+	RUCY_CHECK_OBJ(self, Reflex::Key, cKey);
 	if (argc < 0 || 4 < argc)
 		argument_error("Key#initialize", argc, 0, 1, 2);
 
-	this->chars     = (argc >= 1) ? argv[0].c_str()   : NULL;
-	this->code      = (argc >= 2) ? to<int>(argv[1])  : Reflex::KEY_NONE;
-	this->repeat    = (argc >= 3) ? to<int>(argv[2])  : 1;
-	this->modifiers = (argc >= 4) ? to<uint>(argv[3]) : (uint) Reflex::MOD_NONE;
+	THIS->chars     = (argc >= 1) ? argv[0].c_str()   : NULL;
+	THIS->code      = (argc >= 2) ? to<int>(argv[1])  : Reflex::KEY_NONE;
+	THIS->repeat    = (argc >= 3) ? to<int>(argv[2])  : 1;
+	THIS->modifiers = (argc >= 4) ? to<uint>(argv[3]) : (uint) Reflex::MOD_NONE;
 
 	return self;
 }
 RUBY_END
 
+static
+RUBY_DEF1(initialize_copy, obj)
+{
+	RUCY_CHECK_OBJ(self, Reflex::Key, cKey);
+
+	Reflex::Key* key = to<Reflex::Key*>(obj);
+	if (!key) argument_error();
+
+	*THIS = *key;
+	return self;
+}
+RUBY_END
+
 static
 RUBY_DEF0(chars)
 {
 	CHECK;
-	return value(this->chars.c_str());
+	return value(THIS->chars.c_str());
 }
 RUBY_END
 
@@ -95,7 +92,7 @@ static
 RUBY_DEF0(code)
 {
 	CHECK;
-	return value(this->code);
+	return value(THIS->code);
 }
 RUBY_END
 
@@ -103,7 +100,7 @@ static
 RUBY_DEF0(repeat)
 {
 	CHECK;
-	return value(this->repeat);
+	return value(THIS->repeat);
 }
 RUBY_END
 
@@ -111,7 +108,7 @@ static
 RUBY_DEF0(modifiers)
 {
 	CHECK;
-	return value(this->modifiers);
+	return value(THIS->modifiers);
 }
 RUBY_END
 
@@ -119,15 +116,14 @@ RUBY_END
 void
 Init_key ()
 {
-	Module m = define_module("Reflex");
-
-	Class c = m.define_class("Key");
-	Reflex::cKey = c;
-
-	c.define_alloc_func(alloc);
-	c.define_method("initialize", initialize);
-	c.define_method("chars", chars);
-	c.define_method("code", code);
-	c.define_method("repeat", repeat);
-	c.define_method("modifiers", modifiers);
+	Module mReflex = define_module("Reflex");
+
+	cKey = mReflex.define_class("Key");
+	cKey.define_alloc_func(alloc);
+	cKey.define_private_method("initialize", initialize);
+	cKey.define_private_method("initialize_copy", initialize_copy);
+	cKey.define_method("chars", chars);
+	cKey.define_method("code", code);
+	cKey.define_method("repeat", repeat);
+	cKey.define_method("modifiers", modifiers);
 }

data/ext/reflex/native.cpp

@@ -6,10 +6,11 @@ using namespace Rucy;
 
 
 void Init_reflex ();
-void Init_application ();
-void Init_window ();
 void Init_key ();
 void Init_points ();
+void Init_application ();
+void Init_window ();
+void Init_view ();
 
 
 extern "C" void
@@ -19,8 +20,9 @@ Init_native ()
 		raise(rb_eLoadError, "Rucy::init() failed.");
 
 	Init_reflex();
-	Init_application();
-	Init_window();
 	Init_key();
 	Init_points();
+	Init_application();
+	Init_window();
+	Init_view();
 }

data/ext/reflex/points.cpp

@@ -10,12 +10,13 @@ using namespace Rucy;
 using Reflex::coord;
 
 
+static Class cPoints;
+
+
 namespace Reflex
 {
 
 
-	static Class cPoints;
-
 	Class
 	points_class ()
 	{
@@ -33,57 +34,53 @@ namespace Rucy
 	Value
 	value (const Reflex::Points& points)
 	{
-		return new_type<Reflex::Points>(
-			Reflex::points_class(), new Reflex::Points(points));
+		return new_type(cPoints, new Reflex::Points(points));
 	}
 
 
 }// Rucy
 
 
-struct RubyPoints : public Reflex::Points
-{
-
-	operator bool () const
-	{
-		return true;
-	}
-
-	bool operator ! () const
-	{
-		return !operator bool();
-	}
-
-};// RubyPoints
+#define THIS to<Reflex::Points*>(self)
 
-
-#define this ((RubyPoints*) to<Reflex::Points*>(self))
-
-#define CHECK CHECK_OBJECT(self, RubyPoints, Reflex::points_class())
+#define CHECK RUCY_CHECK_OBJ(self, Reflex::Points, cPoints)
 
 
 static
 RUBY_DEF_ALLOC(alloc, klass)
 {
-	return new_type<RubyPoints>(klass, new RubyPoints);
+	return new_type<Reflex::Points>(klass);
 }
 RUBY_END
 
 static
 RUBY_DEFN(initialize)
 {
-	CHECK_OBJ(self, RubyPoints, Reflex::points_class());
+	RUCY_CHECK_OBJ(self, Reflex::Points, cPoints);
 	if (argc < 0 || 6 < argc)
 		arg_count_error("Points#initialize", argc, 0, 1, 2, 3, 4, 5, 6);
 
-	this->type      = (argc >= 1) ? to<int>(argv[0])   : Reflex::POINT_NONE;
-	this->x         = (argc >= 2) ? to<coord>(argv[1]) : 0;
-	this->y         = (argc >= 3) ? to<coord>(argv[2]) : 0;
-	this->size      = 1;
-	this->modifiers = (argc >= 4) ? to<uint>(argv[3])  : (uint) Reflex::MOD_NONE;
-	this->count     = (argc >= 5) ? to<uint>(argv[4])  : 0;
-	this->drag      = (argc >= 6) ? to<bool>(argv[5])  : false;
+	THIS->type      = (argc >= 1) ? to<int>(argv[0])   : Reflex::POINT_NONE;
+	THIS->x         = (argc >= 2) ? to<coord>(argv[1]) : 0;
+	THIS->y         = (argc >= 3) ? to<coord>(argv[2]) : 0;
+	THIS->size      = 1;
+	THIS->modifiers = (argc >= 4) ? to<uint>(argv[3])  : (uint) Reflex::MOD_NONE;
+	THIS->count     = (argc >= 5) ? to<uint>(argv[4])  : 0;
+	THIS->drag      = (argc >= 6) ? to<bool>(argv[5])  : false;
+
+	return self;
+}
+RUBY_END
+
+static
+RUBY_DEF1(initialize_copy, obj)
+{
+	RUCY_CHECK_OBJ(self, Reflex::Points, cPoints);
+
+	Reflex::Points* points = to<Reflex::Points*>(obj);
+	if (!points) argument_error();
 
+	*THIS = *points;
 	return self;
 }
 RUBY_END
@@ -92,7 +89,7 @@ static
 RUBY_DEF0(type)
 {
 	CHECK;
-	return value(this->type);
+	return value(THIS->type);
 }
 RUBY_END
 
@@ -100,7 +97,7 @@ static
 RUBY_DEF0(x)
 {
 	CHECK;
-	return value(this->x);
+	return value(THIS->x);
 }
 RUBY_END
 
@@ -108,7 +105,7 @@ static
 RUBY_DEF0(y)
 {
 	CHECK;
-	return value(this->y);
+	return value(THIS->y);
 }
 RUBY_END
 
@@ -116,7 +113,7 @@ static
 RUBY_DEF0(size)
 {
 	CHECK;
-	return value(this->size);
+	return value(THIS->size);
 }
 RUBY_END
 
@@ -124,7 +121,7 @@ static
 RUBY_DEF0(modifiers)
 {
 	CHECK;
-	return value(this->modifiers);
+	return value(THIS->modifiers);
 }
 RUBY_END
 
@@ -132,7 +129,7 @@ static
 RUBY_DEF0(count)
 {
 	CHECK;
-	return value(this->count);
+	return value(THIS->count);
 }
 RUBY_END
 
@@ -140,7 +137,7 @@ static
 RUBY_DEF0(drag)
 {
 	CHECK;
-	return value(this->drag);
+	return value(THIS->drag);
 }
 RUBY_END
 
@@ -148,18 +145,17 @@ RUBY_END
 void
 Init_points ()
 {
-	Module m = define_module("Reflex");
-
-	Class c = m.define_class("Points");
-	Reflex::cPoints = c;
-
-	c.define_alloc_func(alloc);
-	c.define_method("initialize", initialize);
-	c.define_method("type", type);
-	c.define_method("x", x);
-	c.define_method("y", y);
-	c.define_method("size", size);
-	c.define_method("modifiers", modifiers);
-	c.define_method("count", count);
-	c.define_method("drag", drag);
+	Module mReflex = define_module("Reflex");
+
+	cPoints = mReflex.define_class("Points");
+	cPoints.define_alloc_func(alloc);
+	cPoints.define_private_method("initialize", initialize);
+	cPoints.define_private_method("initialize_copy", initialize_copy);
+	cPoints.define_method("type", type);
+	cPoints.define_method("x", x);
+	cPoints.define_method("y", y);
+	cPoints.define_method("size", size);
+	cPoints.define_method("modifiers", modifiers);
+	cPoints.define_method("count", count);
+	cPoints.define_method("drag", drag);
 }

data/ext/reflex/reflex.cpp

@@ -6,12 +6,13 @@
 using namespace Rucy;
 
 
+static Module mReflex;
+
+
 namespace Reflex
 {
 
 
-	static Module mReflex;
-
 	Module
 	reflex_module ()
 	{
@@ -26,7 +27,7 @@ static
 RUBY_DEF0(init)
 {
 	if (!Reflex::init())
-		error("Reflex::init() failed.");
+		reflex_error("Reflex::init() failed.");
 
 	return self;
 }
@@ -36,7 +37,7 @@ static
 RUBY_DEF0(fin)
 {
 	if (!Reflex::fin())
-		error("Reflex::fin() failed.");
+		reflex_error("Reflex::fin() failed.");
 
 	return self;
 }
@@ -46,7 +47,7 @@ static
 RUBY_DEF1(run, name)
 {
 	if (!Reflex::run(name ? name.c_str() : NULL))
-		error("Reflex::run() failed.");
+		reflex_error("Reflex::run() failed.");
 
 	return self;
 }
@@ -56,7 +57,7 @@ static
 RUBY_DEF0(quit)
 {
 	if (!Reflex::quit())
-		error("Reflex::quit() failed.");
+		reflex_error("Reflex::quit() failed.");
 
 	return self;
 }
@@ -66,11 +67,9 @@ RUBY_END
 void
 Init_reflex ()
 {
-	Module m = define_module("Reflex");
-	Reflex::mReflex = m;
-
-	m.define_singleton_method("init!", init);
-	m.define_singleton_method("fin!", fin);
-	m.define_singleton_method("run!", run);
-	m.define_singleton_method("quit", quit);
+	mReflex = define_module("Reflex");
+	mReflex.define_singleton_method("init!", init);
+	mReflex.define_singleton_method("fin!", fin);
+	mReflex.define_singleton_method("run!", run);
+	mReflex.define_singleton_method("quit", quit);
 }