rucy 0.1.15 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3318eec71901bf3df44d0671f812db3587cba4398fcffe2626d890e1f2661b4c
-  data.tar.gz: e52137f3e90d24e0488241782a7c16073a08739f1b49dbc4b2481b31fb6d2540
+  metadata.gz: be3ad08f2350b6189dc5017966c8b56f690fc3c2e1b30c3b55fefc8a9c43ab65
+  data.tar.gz: 476beb3b1428d3000300fe8eb1a24dc1ce504832ec2ac78ddc5c9d5a22e248b3
 SHA512:
-  metadata.gz: 4bb51a1e39c354397dae4bbf9646347afae280cff1bf3a6bd8bf6642aa5d61cc2521686740c96861886db7634be0102dd34bf7377e343f472f3a67eda35b7cce
-  data.tar.gz: 82d1edba03b208254d356ccb7a19e2fbcc83b16bdf9e938a70a7c852e926f66745de8ad5c315f24eebef2ca6950daa13658c9545dcb0c4e0afbf1d90e7d80c9f
+  metadata.gz: 3b9762e6f235eea1d474c8d8ed10e2aa89e09f790acb9765bc202549efcff7382b2f182a7b26babf7474b99c91d7c788c4fa5fc1b6308e9623de7f8a28205d25
+  data.tar.gz: db15d626a323c41c328ebeeb5f03212ba81ea4535b20704e6a2acb6c87cfba34aeac77b91858531d4af8574e2a3eada723e0ba972f53bec4adc7e4391919c5af

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

@@ -177,6 +177,6 @@ Init_class ()
 	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);
+	rb_define_module_function(cSimpleObj, "set_refs", RUBY_METHOD_FUNC(simpleobj_set_refs), 1);
+	rb_define_module_function(cSimpleObj, "clear_refs", RUBY_METHOD_FUNC(simpleobj_clear_refs), 0);
 }

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

@@ -54,8 +54,8 @@ Init_tester ()
 	Module mRucy = rb_define_module("Rucy");
 	Module mTester = rb_define_module_under(mRucy, "Tester");
 
-	rb_define_function(mTester, "all_logs", RUBY_METHOD_FUNC(all_logs), 0);
-	rb_define_function(mTester, "clear_logs", RUBY_METHOD_FUNC(clear_logs), 0);
+	rb_define_module_function(mTester, "all_logs", RUBY_METHOD_FUNC(all_logs), 0);
+	rb_define_module_function(mTester, "clear_logs", RUBY_METHOD_FUNC(clear_logs), 0);
 
 	Init_value();
 	Init_exception();

data/VERSION

@@ -1 +1 @@
-0.1.15
+0.1.22

data/bin/rucy2rdoc

@@ -3,12 +3,12 @@
 
 class Parser
 
-  def initialize (lines)
+  def initialize(lines)
     @funs = {}
     @lines = lines
   end
 
-  def parse ()
+  def parse()
     parse_functions @lines
     parse_Init @lines
     @lines
@@ -16,7 +16,7 @@ class Parser
 
   private
 
-    def process_lines (lines, regexp, &block)
+    def process_lines(lines, regexp, &block)
       lines.gsub! regexp do |str|
         params = $~[1..-1]
         params.unshift str
@@ -24,7 +24,7 @@ class Parser
       end
     end
 
-    def parse_functions (lines)
+    def parse_functions(lines)
       re = %r{
         (?:RUCY_)?DEF(\d+|N|_ALLOC)\( (\w+) \s* ((?:\, \s* \w+)*) \s* \) \s*
         (\{ \s*
@@ -50,7 +50,7 @@ class Parser
       end
     end
 
-    def parse_Init (lines)
+    def parse_Init(lines)
       re = %r{
         Init_(\w*) \s* \( \s* \) \s*
         \{ \s*
@@ -64,7 +64,7 @@ class Parser
       end
     end
 
-    def parse_module_and_class (lines)
+    def parse_module_and_class(lines)
       re = %r{
         (\w+) \s* \= \s*
           (?: (\w+) \s* \. )? \s* (define_(?:module|class)) \s*
@@ -79,7 +79,7 @@ class Parser
       end
     end
 
-    def parse_methods (lines)
+    def parse_methods(lines)
       re = %r{
         (\w+) \s* \. \s* (define_\w+) \s*
           \( \s* (?: (\"\w+(?:\=|\?\!)?\") \s* \, \s* )? (\w+) \s* \) \s* ;
@@ -100,11 +100,11 @@ class Parser
 end# Parser
 
 
-def usage ()
+def usage()
   "rucy2rdoc FILE"
 end
 
-def main (argv)
+def main(argv)
   if path = argv.shift
     print Parser.new(File.read path).parse
   else

data/ext/rucy/class.cpp

@@ -190,6 +190,6 @@ Init_class ()
 	cSimpleObj = mTester.define_class("SimpleObj");
 	cSimpleObj.define_alloc_func(simpleobj_alloc);
 	cSimpleObj.define_private_method("initialize", simpleobj_initialize);
-	cSimpleObj.define_function("set_refs",   simpleobj_set_refs);
-	cSimpleObj.define_function("clear_refs", simpleobj_clear_refs);
+	cSimpleObj.define_module_function("set_refs",   simpleobj_set_refs);
+	cSimpleObj.define_module_function("clear_refs", simpleobj_clear_refs);
 }

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/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

@@ -27,14 +27,20 @@
 		template <> const native_class& value_to<const native_class&> (Value value, bool convert); \
 	}
 
-#define RUCY_DECLARE_VALUE_OR_ARRAY_TO(native_class) \
-	RUCY_DECLARE_VALUE_TO(native_class) \
+#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 \
 	{ \
@@ -92,8 +98,7 @@
 		} \
 	}
 
-#define RUCY_DEFINE_VALUE_OR_ARRAY_TO(native_class) \
-	RUCY_DEFINE_VALUE_TO(native_class) \
+#define RUCY_DEFINE_ARRAY_TO(native_class) \
 	namespace Rucy \
 	{ \
 		template <> native_class \
@@ -106,6 +111,13 @@
 		} \
 	}
 
+#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 \
 	{ \

data/include/rucy/module.h.erb

@@ -41,7 +41,7 @@ namespace Rucy
 			void extend_module (Value module);
 
 %			[
-%				'define_function',
+%				'define_module_function',
 %				'define_method',
 %				'define_private_method',
 %				'define_singleton_method',

data/include/rucy/ruby.h

@@ -5,7 +5,6 @@
 
 
 #include <ruby.h>
-#include <ruby/intern.h>
 
 
 namespace Rucy

data/lib/rucy/module.rb

@@ -8,23 +8,23 @@ module Rucy
 
     module_function
 
-    def name ()
+    def name()
       super.split('::')[-2]
     end
 
-    def version ()
+    def version()
       open(root_dir 'VERSION') {|f| f.readline.chomp}
     end
 
-    def root_dir (path = '')
+    def root_dir(path = '')
       File.expand_path "../../#{path}", __dir__
     end
 
-    def inc_dir ()
+    def inc_dir()
       root_dir 'include'
     end
 
-    def lib_dir ()
+    def lib_dir()
       root_dir 'lib'
     end
 

data/lib/rucy/rake.rb

@@ -10,15 +10,15 @@ module Rucy
   module Rake
 
 
-    def rdoc ()
+    def rdoc()
       env :RDOC, 'rdoc'# 'yardoc'
     end
 
-    def rucy2rdoc ()
+    def rucy2rdoc()
       env :RUCY2RDOC, 'rucy2rdoc'
     end
 
-    def generate_documents ()
+    def generate_documents()
       rdocdir = ".doc/#{ext_dir}"
       srcs    = FileList["#{ext_dir}/**/*.{#{src_exts.join ','}}"]
       rdocs   = Hash[srcs.map{|path| [path, "#{rdocdir}/#{File.basename path}"]}]

data/rucy.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '~> 2'
 
-  s.add_runtime_dependency 'xot', '~> 0.1'
+  s.add_runtime_dependency 'xot', '~> 0.1.22'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/module.cpp.erb

@@ -58,7 +58,7 @@ namespace Rucy
 	}
 
 %	[
-%		['define_function',         'rb_define_module_function'],
+%		['define_module_function',  'rb_define_module_function'],
 %		['define_method',           'rb_define_method'],
 %		['define_private_method',   'rb_define_private_method'],
 %		['define_singleton_method', 'rb_define_singleton_method']

data/src/value.cpp.erb

@@ -3,6 +3,7 @@
 
 
 #include <assert.h>
+#include <ruby/encoding.h>
 #include "rucy/function.h"
 #include "rucy/exception.h"
 #include "rucy/debug.h"
@@ -55,15 +56,29 @@ namespace Rucy
 	{
 	}
 
+	static VALUE
+	str_new (const char* s)
+	{
+		rb_encoding* e = rb_default_internal_encoding();
+		return e ? rb_enc_str_new_cstr(s, e) : rb_str_new_cstr(s);
+	}
+
+	static VALUE
+	str_new (const char* s, size_t len)
+	{
+		rb_encoding* e = rb_default_internal_encoding();
+		return e ? rb_enc_str_new(s, len, e) : rb_str_new(s, len);
+	}
+
 	Value::Value (const char* s)
-	:	val(s ? rb_str_new2(s) : Qnil)
+	:	val(s ? str_new(s) : Qnil)
 	{
 		if (!s)
 			argument_error(__FILE__, __LINE__);
 	}
 
 	Value::Value (const char* s, size_t len)
-	:	val(s ? rb_str_new(s, len) : Qnil)
+	:	val(s ? str_new(s, len) : Qnil)
 	{
 		if (!s)
 			argument_error(__FILE__, __LINE__);

data/test/test_class.rb

@@ -6,11 +6,11 @@ require_relative 'helper'
 
 class Temp < Rucy::Tester::Sub
 
-  def name ()
+  def name()
     "Temp::name"
   end
 
-  def name_overridable ()
+  def name_overridable()
     "Temp::name_overridable"
   end
 
@@ -21,33 +21,33 @@ class TestClass < Test::Unit::TestCase
 
   include Rucy::Tester
 
-  def base (*args)
-    Base.new *args
+  def base(*args)
+    Base.new(*args)
   end
 
-  def sub (*args)
-    Sub.new *args
+  def sub(*args)
+    Sub.new(*args)
   end
 
-  def temp (*args)
-    Temp.new *args
+  def temp(*args)
+    Temp.new(*args)
   end
 
-  def base_raw (*args)
-    Base.new_raw *args
+  def base_raw(*args)
+    Base.new_raw(*args)
   end
 
-  def sub_raw (*args)
-    Sub.new_raw *args
+  def sub_raw(*args)
+    Sub.new_raw(*args)
   end
 
-  def last_log (pattern = nil)
+  def last_log(pattern = nil)
     logs = Rucy::Tester.all_logs
     logs.select! {|o| o =~ pattern} if pattern
     logs.last
   end
 
-  def test_is_kind_of_base ()
+  def test_is_kind_of_base()
     assert_kind_of Base, base
     assert_kind_of Base, base_raw
 
@@ -69,7 +69,7 @@ class TestClass < Test::Unit::TestCase
     assert_not sub_raw.kind_of?(Temp)
   end
 
-  def test_name ()
+  def test_name()
     assert_equal "Base::name", base    .name
     assert_equal "Base::name", base_raw.name
     assert_equal "Sub::name",  sub     .name
@@ -77,7 +77,7 @@ class TestClass < Test::Unit::TestCase
     assert_equal "Temp::name", temp    .name
   end
 
-  def test_name_overridable ()
+  def test_name_overridable()
     assert_equal "Base::name_overridable", base    .name_overridable
     assert_equal "Base::name_overridable", base_raw.name_overridable
     assert_equal "Sub::name_overridable",  sub     .name_overridable
@@ -85,7 +85,7 @@ class TestClass < Test::Unit::TestCase
     assert_equal "Temp::name_overridable", temp    .name_overridable
   end
 
-  def test_call_name ()
+  def test_call_name()
     assert_equal "Base::name", base    .call_name
     assert_equal "Base::name", base_raw.call_name
     assert_equal "Sub::name",  sub     .call_name
@@ -93,7 +93,7 @@ class TestClass < Test::Unit::TestCase
     assert_equal "Sub::name",  temp    .call_name# "Sub" instead of "Temp"!
   end
 
-  def test_call_name_overridable ()
+  def test_call_name_overridable()
     assert_equal "Base::name_overridable", base    .call_name_overridable
     assert_equal "Base::name_overridable", base_raw.call_name_overridable
     assert_equal "Sub::name_overridable",  sub     .call_name_overridable
@@ -101,9 +101,9 @@ class TestClass < Test::Unit::TestCase
     assert_equal "Temp::name_overridable", temp    .call_name_overridable
   end
 
-  def test_gc ()
-    def simple_objs (name, n = 10) ([nil] * n).map {SimpleObj.new name} end
-    def gc () GC.start end
+  def test_gc()
+    def simple_objs(name, n = 10) ([nil] * n).map {SimpleObj.new name} end
+    def gc() GC.start end
     rt = Rucy::Tester
 
     gc

data/test/test_exception.rb

@@ -8,31 +8,31 @@ class TestException < Test::Unit::TestCase
 
   include Rucy::Tester
 
-  def test_raise_ruby_exception ()
+  def test_raise_ruby_exception()
     assert_raise(StandardError) {raise_ruby_exception}
   end
 
-  def test_raise_in_eval ()
+  def test_raise_in_eval()
     assert_raise(RuntimeError) {raise_in_eval}
   end
 
-  def test_throw_std_exception ()
+  def test_throw_std_exception()
     assert_raise(Rucy::NativeError) {throw_std_exception}
   end
 
-  def test_throw_std_runtime_error ()
+  def test_throw_std_runtime_error()
     assert_raise(Rucy::NativeError) {throw_std_runtime_error}
   end
 
-  def test_throw_custom_exception ()
+  def test_throw_custom_exception()
     assert_raise(Rucy::NativeError) {throw_custom_exception}
   end
 
-  def test_throw_std_string ()
+  def test_throw_std_string()
     assert_raise(Rucy::NativeError) {throw_std_string}
   end
 
-  def test_throw_cstring ()
+  def test_throw_cstring()
     assert_raise(Rucy::NativeError) {throw_cstring}
   end
 

data/test/test_function.rb

@@ -8,27 +8,27 @@ class TestFunction < Test::Unit::TestCase
 
   include Rucy::Tester
 
-  def test_do_nothing_returns_nil ()
+  def test_do_nothing_returns_nil()
     assert_equal nil, do_nothing
   end
 
-  def test_returns_nil ()
+  def test_returns_nil()
     assert_equal nil, return_nil
   end
 
-  def test_return_int ()
+  def test_return_int()
     assert_kind_of Integer, return_int
   end
 
-  def test_return_float ()
+  def test_return_float()
     assert_kind_of Float, return_float
   end
 
-  def test_return_string ()
+  def test_return_string()
     assert_kind_of String, return_string
   end
 
-  def test_check_arg_count ()
+  def test_check_arg_count()
     assert_equal :ok, arg_count_must_1(:arg1)
     assert_raise(ArgumentError) {arg_count_must_1}
     assert_raises(ArgumentError) {arg_count_must_1 :arg1, :arg2}

data/test/test_struct.rb

@@ -6,20 +6,20 @@ require_relative 'helper'
 
 class TestStruct < Test::Unit::TestCase
 
-  def setup ()
+  def setup()
     @x = Rucy::Tester::Struct.new
   end
 
-  def test_default_value_is_0 ()
+  def test_default_value_is_0()
     assert_equal 0, @x.num
   end
 
-  def test_get_set_num ()
+  def test_get_set_num()
     @x.num = 1
     assert_equal 1, @x.num
   end
 
-  def test_dup ()
+  def test_dup()
     assert_equal 0, @x.num
     x = @x.dup
     @x.num = 1

data/test/test_value.rb

@@ -8,7 +8,7 @@ class TestFunction < Test::Unit::TestCase
 
   include Rucy::Tester
 
-  def test_to_value ()
+  def test_to_value()
     assert_equal true, true_to_value
     assert_equal false, false_to_value
     assert_equal nil, null_to_value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucy
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.22
 platform: ruby
 authors:
 - xordog
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2021-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.22
 description: This library helps you to develop Ruby Extension by C++.
 email: xordog@gmail.com
 executables:
@@ -91,7 +91,7 @@ files:
 homepage: https://github.com/xord/rucy
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Ruby C++ Extension Helper Library.
 test_files: