rucy 0.1.2 → 0.1.3

data/src/exception.cpp

@@ -4,7 +4,6 @@
 
 #include <ruby.h>
 #include <rucy/rucy.h>
-#include <rucy/string.h>
 
 #ifdef WIN32
 	#include <windows.h>
@@ -19,7 +18,7 @@
 		{ \
 			va_list args; \
 			va_start(args, format); \
-			result = stringf(format, args); \
+			result = Xot::stringf(format, args); \
 			va_end(args); \
 		} \
 	} \
@@ -30,34 +29,43 @@ namespace Rucy
 {
 
 
-	Class
-	native_error_class ()
+	RubyException::RubyException (Value exception)
+	:	Super(""), val(exception)
+	{
+	}
+
+	RubyException::RubyException (Value type, const char* format, ...)
+	:	Super(""), val(Qnil)
 	{
-		static Class c =
-			rucy_module().define_class("NativeError", rb_eRuntimeError);
-		return c;
+		VA_STRING(format, s);
+		val = rb_exc_new2(type, s.c_str());
+	}
+
+	const char*
+	RubyException::what () const throw()
+	{
+		SYM(message);
+		return value().call(message).c_str();
 	}
 
-	Class
-	system_error_class ()
+	Value
+	RubyException::value () const
 	{
-		static Class c =
-			rucy_module().define_class("SystemError", native_error_class());
-		return c;
+		return val;
 	}
 
-	Class
-	invalid_object_error_class ()
+
+	RubyJumptag::RubyJumptag (int tag)
+	:	tag(tag)
 	{
-		static Class c =
-			rucy_module().define_class("InvalidObjectError", native_error_class());
-		return c;
 	}
 
 
 	void
-	error (const char* format, ...)
+	raise (const char* format, ...)
 	{
+		if (!format) throw;
+
 		VA_STRING(format, message);
 		throw message;
 	}
@@ -90,13 +98,13 @@ namespace Rucy
 		int n1, int n2, int n3, int n4, int n5,
 		int n6, int n7, int n8, int n9, int n10)
 	{
-		String message = stringf(
+		String message = Xot::stringf(
 			"wrong number of arguments for %s: %d for %d",
 			method, nargs, nargs_expected);
 
 		int n[10] = {n1, n2, n3, n4, n5, n6, n7, n8, n9, n10};
 		for (int i = 0; i < 5 && n[i] >= 0; ++i)
-			message += stringf(" or %d", n[i]);
+			message += Xot::stringf(" or %d", n[i]);
 
 		message += ".";
 		argument_error(message.c_str());
@@ -146,36 +154,4 @@ namespace Rucy
 	}
 
 
-	RubyException::RubyException (Value exception)
-	:	Super(""), val(exception)
-	{
-	}
-
-	RubyException::RubyException (Value type, const char* format, ...)
-	:	Super(""), val(Qnil)
-	{
-		VA_STRING(format, message);
-		val = rb_exc_new2(type, message.c_str());
-	}
-
-	const char*
-	RubyException::what () const throw()
-	{
-		SYM(message);
-		return value().call(message).c_str();
-	}
-
-	Value
-	RubyException::value () const
-	{
-		return val;
-	}
-
-
-	RubyJumptag::RubyJumptag (int tag)
-	:	tag(tag)
-	{
-	}
-
-
 }// Rucy

data/src/function.cpp

@@ -13,6 +13,7 @@
 namespace Rucy
 {
 
+
 	void
 	define_function (const char* name, RubyFunctionN fun)
 	{

data/src/function.cpp.erb

@@ -1,5 +1,4 @@
 // -*- c++ -*-
-% require 'support'
 #include "rucy/function.h"
 
 
@@ -14,6 +13,7 @@
 namespace Rucy
 {
 
+
 	void
 	define_function (const char* name, RubyFunctionN fun)
 	{

data/src/module.cpp

@@ -309,12 +309,16 @@ namespace Rucy
 		return rb_define_module(name);
 	}
 
+	Class
+	define_class (const char* name, Value super)
+	{
+		return rb_define_class(name, super);
+	}
 
-	Module
-	rucy_module ()
+	void
+	define_const (const char* name, Value val)
 	{
-		static Module m = define_module("Rucy");
-		return m;
+		rb_define_global_const(name, val);
 	}
 
 

data/src/module.cpp.erb

@@ -1,5 +1,4 @@
 // -*- c++ -*-
-% require 'support'
 #include "rucy/module.h"
 
 
@@ -91,12 +90,16 @@ namespace Rucy
 		return rb_define_module(name);
 	}
 
+	Class
+	define_class (const char* name, Value super)
+	{
+		return rb_define_class(name, super);
+	}
 
-	Module
-	rucy_module ()
+	void
+	define_const (const char* name, Value val)
 	{
-		static Module m = define_module("Rucy");
-		return m;
+		rb_define_global_const(name, val);
 	}
 
 

data/src/rucy.cpp

@@ -2,7 +2,6 @@
 #include "rucy/rucy.h"
 
 
-#include <rucy/module.h>
 #include <rucy/exception.h>
 
 
@@ -19,27 +18,16 @@ namespace Rucy
 
 		rucy_module();
 		native_error_class();
-		return true;
-	}
-
-
-	Value
-	require (const char* name)
-	{
-		return rb_require(name);
-	}
+		system_error_class();
+		invalid_object_error_class();
 
-	void
-	define_const (const char* name, Value val)
-	{
-		rb_define_global_const(name, val);
+		return true;
 	}
 
-
 	bool
-	check_class (Value obj, Value class_)
+	check_class (Value obj, Value klass)
 	{
-		return class_ && obj.is_kind_of(class_);
+		return klass && obj.is_kind_of(klass);
 
 #if 0
 		SYMBOL(klass, "class");
@@ -53,4 +41,37 @@ namespace Rucy
 	}
 
 
+	Module
+	rucy_module ()
+	{
+		static Module m = define_module("Rucy");
+		return m;
+	}
+
+
+	Class
+	native_error_class ()
+	{
+		static Class c =
+			rucy_module().define_class("NativeError", rb_eRuntimeError);
+		return c;
+	}
+
+	Class
+	system_error_class ()
+	{
+		static Class c =
+			rucy_module().define_class("SystemError", native_error_class());
+		return c;
+	}
+
+	Class
+	invalid_object_error_class ()
+	{
+		static Class c =
+			rucy_module().define_class("InvalidObjectError", native_error_class());
+		return c;
+	}
+
+
 }// Rucy

data/src/value.cpp.erb

@@ -1,5 +1,4 @@
 // -*- c++ -*-
-% require 'support'
 #include "rucy/value.h"
 
 

data/task/ext.rake

@@ -1,37 +1,96 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
+require 'rbconfig'
+require 'rucy/module'
+
+
 namespace :ext do
 
-  dir     = "#{EXTDIR}/#{NAME}"
-  name    = "#{NAME}/tester"
-  outname = "#{name}.#{EXTEXT}"
-  out     = File.join EXTDIR, outname
+
+  rbconf = RbConfig::CONFIG
+
+  mod       = MODULE
+  name      = env :NAME, MODULE.name.downcase
+  extdir    = env :EXTDIR,    'ext'
+  docdir    = env :DOCDIR,    'doc'
+  dlext     = env :DLEXT,     rbconf['DLEXT'] || 'so'
+  ruby      = env :RUBY,      'ruby'
+  make      = env :MAKE,      'make'
+  cc        = env :CC,        rbconf['CC'] || 'g++'
+  rdoc      = env :RDOC,      'rdoc'# 'yardoc'
+  rucy2rdoc = env :RUCY2RDOC, 'rucy2rdoc'
+  defs      = env :DEFS,      []
+  incdirs   = env(:INCDIRS) ? env(:INCDIRS) : []
+  cflags    = env(:CFLAGS, '-Wall -O -g').dup
+
+  dir     = "#{extdir}/#{name}"
+  modname = "#{name}/native"
+  outname = "#{name}.#{dlext}"
+  out     = File.join extdir, outname
+
+  srcs = FileList["#{dir}/**/*.cpp"]
+
+  incroot = rbconf['rubyhdrdir']
+  incdirs.concat mod.include_dirs + Rucy.include_dirs + [
+    incroot,
+    "#{incroot}/#{RUBY_PLATFORM}",
+    '/opt/local/include',
+    '/opt/include'
+  ]
+  incdirs.uniq!
+
+  defs   << 'WIN32' if win32?
+  defs   << 'COCOA' if cocoa?
+  cflags << defs.map{|s| " -D#{s}"}.join
+  cflags << incdirs.map{|s| " -I#{s}"}.join
 
   extconf  = File.join dir, "extconf.rb"
   makefile = File.join dir, "Makefile"
   depend   = File.join dir, "depend"
 
-  cpps = Dir.glob("#{dir}/**/*.cpp")
+  rdocdir  = ".doc/#{dir}"
+  rdocs    = Hash[srcs.map{|path| [path, "#{rdocdir}/#{File.basename path}"]}]
+  docindex = "#{docdir}/index.html"
 
-  task :build => makefile do
-    sh %( cd #{dir} && #{MAKE} )
-  end
+
+  task :build => out
+
+  task :rdoc => rdocs.values
+
+  task :doc => docindex
 
   task :clean do
-    sh %( cd #{dir} && #{MAKE} clean ) if File.exist? makefile
-    sh %( rm -f #{makefile} #{depend} )
+    sh %( cd #{dir} && #{make} clean ) if File.exist? makefile
+    sh %( rm -rf #{makefile} #{depend} #{docdir} #{rdocs.values.join ' '} )
+  end
+
+  file out => makefile do
+    sh %( cd #{dir} && #{make} )
   end
 
   file makefile => [extconf, depend] do
-    sh %( cd #{dir} && #{RUBY} #{File.basename extconf} )
+    sh %( cd #{dir} && #{ruby} #{File.basename extconf} )
   end
 
-  file depend => ["lib:build"] + cpps do
-    incdirs = INCDIRS.map{|s| " -I#{s}"}.join
-    srcs = cpps.map{|cpp| File.basename cpp}.join ' '
+  file depend => ["lib:build"] + srcs do
+    inc = incdirs.map{|s| " -I#{s}"}.join
+    src = srcs.map{|cpp| File.basename cpp}.join ' '
     dep = File.basename depend
-    sh %( cd #{dir} && #{CC} -M #{CFLAGS} #{incdirs} #{srcs} > #{dep} )
+    sh %( cd #{dir} && #{cc} -M #{cflags} #{inc} #{src} > #{dep} )
+  end
+
+  file docindex => "ext:rdoc" do
+    sh %( #{rdoc} #{rdocs.values.join ' '} )
+  end
+
+  rdocs.each do |(cpp, rdoc)|
+    file rdoc => [cpp, rdocdir] do
+      sh %( #{rucy2rdoc} #{cpp} > #{rdoc} )
+    end
   end
 
+  directory rdocdir
+
+
 end# :ext

data/test/test_rucy.rb

@@ -17,6 +17,15 @@ class TestTester < Test::Unit::TestCase
     assert_equal nil, @t.do_nothing
   end
 
+  def test_set_get ()
+    @t.value = 100
+    assert_equal 100, @t.value
+  end
+
+  def test_no_return_returns_nil ()
+    assert_equal nil, @t.do_nothing
+  end
+
   def test_returns_nil ()
     assert_equal nil, @t.return_nil
   end
@@ -49,6 +58,10 @@ class TestTester < Test::Unit::TestCase
     assert_raise(Rucy::NativeError) {@t.throw_std_runtime_error}
   end
 
+  def test_throw_custom_exception ()
+    assert_raise(Rucy::NativeError) {@t.throw_custom_exception}
+  end
+
   def test_throw_std_string ()
     assert_raise(Rucy::NativeError) {@t.throw_std_string}
   end

metadata

@@ -2,7 +2,7 @@
 name: rucy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - snori
@@ -10,10 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-29 00:00:00 Z
+date: 2011-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: xot
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -21,10 +21,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: gemcutter
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -34,27 +34,39 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: This library helps you to develop Ruby Extension by C++.
 email: snori@xord.org
-executables: []
-
+executables: 
+- rucy2rdoc
 extensions: 
 - Rakefile
 extra_rdoc_files: 
 - README
+- .doc/ext/rucy/tester.cpp
 files: 
 - README
 - ChangeLog
 - Rakefile
-- support.rb
 - rucy.gemspec
 - VERSION
 - task/ext.rake
-- task/gem.rake
-- task/git.rake
-- task/lib.rake
 - ext/rucy/extconf.rb
 - ext/rucy/tester.cpp
+- include/rucy/defs.h.erb
+- include/rucy/function.h.erb
+- include/rucy/module.h.erb
+- include/rucy/value.h.erb
 - include/rucy/class.h
 - include/rucy/defs.h
 - include/rucy/exception.h
@@ -62,29 +74,25 @@ files:
 - include/rucy/gc.h
 - include/rucy/module.h
 - include/rucy/rucy.h
-- include/rucy/string.h
 - include/rucy/symbol.h
 - include/rucy/value.h
 - include/rucy.h
-- include/rucy/defs.h.erb
-- include/rucy/function.h.erb
-- include/rucy/module.h.erb
-- include/rucy/value.h.erb
 - lib/rucy/module.rb
 - lib/rucy.rb
+- src/function.cpp.erb
+- src/module.cpp.erb
+- src/value.cpp.erb
 - src/class.cpp
 - src/exception.cpp
 - src/function.cpp
 - src/gc.cpp
 - src/module.cpp
 - src/rucy.cpp
-- src/string.cpp
 - src/symbol.cpp
 - src/value.cpp
-- src/function.cpp.erb
-- src/module.cpp.erb
-- src/value.cpp.erb
 - test/test_rucy.rb
+- .doc/ext/rucy/tester.cpp
+- bin/rucy2rdoc
 homepage: http://github.com/xord/rucy
 licenses: []
 

data/include/rucy/string.h

@@ -1,28 +0,0 @@
-// -*- c++ -*-
-#pragma once
-#ifndef __RUCY_STRING_H__
-#define __RUCY_STRING_H__
-
-
-#include <stdarg.h>
-#include <string>
-
-
-namespace Rucy
-{
-
-
-	typedef std::string String;
-
-
-	String stringf (const char* format, ...);
-
-	String stringf (const char* format, va_list args);
-
-	template <typename T> String to_s (const T& val);
-
-
-}// Rucy
-
-
-#endif//EOH

data/src/string.cpp

@@ -1,78 +0,0 @@
-// -*- c++ -*-
-#include "rucy/string.h"
-
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <boost/scoped_array.hpp>
-
-
-namespace Rucy
-{
-
-
-	String
-	stringf (const char* format, ...)
-	{
-		va_list args;
-		va_start(args, format);
-		String ret = stringf(format, args);
-		va_end(args);
-		return ret;
-	}
-
-	String
-	stringf (const char* format, va_list args)
-	{
-		enum {BUFSIZE = 256};
-		char stack[BUFSIZE];
-		if (vsnprintf(&stack[0], BUFSIZE, format, args) <= BUFSIZE)
-			return &stack[0];
-
-		int bufsize = BUFSIZE;// vscprintf(format, args);
-		boost::scoped_array<char> heap;
-		while (true)
-		{
-			bufsize *= 2;
-			heap.reset(new char[bufsize]);
-			if (vsnprintf(&heap[0], bufsize, format, args) <= bufsize)
-				return &heap[0];
-		}
-
-		return NULL;
-	}
-
-	template <> String
-	to_s<int> (const int& val)
-	{
-		return stringf("%d", val);
-	}
-
-	template <> String
-	to_s<float> (const float& val)
-	{
-		return stringf("%f", val);
-	}
-
-	template <> String
-	to_s<double> (const double& val)
-	{
-		return stringf("%f", val);
-	}
-
-	typedef const char* const_char_p;
-
-	template <> String
-	to_s<const_char_p> (const const_char_p& val)
-	{
-		return val;
-	}
-
-	template <> String
-	to_s<String> (const String& val)
-	{
-		return val;
-	}
-
-
-}// Rucy

data/support.rb

@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-require 'erb'
-require 'pp'
-
-
-NPARAM_MAX = 8
-NTIMES     = (0..NPARAM_MAX)
-
-
-def glob (*patterns)
-  paths = []
-  patterns.each do |pattern|
-    paths.concat Dir.glob(pattern)
-  end
-  paths
-end
-
-def erb (str)
-  ERB.new(str, nil, "%").result binding
-end
-
-def compile (path, out)
-  open(path) do |input|
-    open(out, "w") do |output|
-      output.write erb(input.read)
-    end
-  end
-#rescue
-end
-
-def params (n, sep = "", &block)
-  raise "block not given." unless block
-  return "" if n == 0
-  (1..n).map(&block).join(sep)
-end
-
-def convertions (paths, convs)
-  raise "empty conversion." if convs.empty?
-  paths = paths.map do |path|
-    convpath = path
-    convs.each do |from, to|
-      convpath = convpath.sub(/#{from.gsub('.', '\.')}$/, to)
-    end
-    [path, convpath]
-  end
-  Hash[*paths.flatten]
-end
-
-alias sh_original sh
-
-def sh (*args)
-  sh_original *args
-#rescue
-end
-
-def win32? ()
-  RUBY_PLATFORM =~ /mswin|ming|cygwin/
-end
-
-def cocoa? ()
-  RUBY_PLATFORM =~ /darwin/
-end