rucy 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6041d8fce378b57c78ee0112e70ae03bb400b966e601e8a2a02d5ae97ef3f8c
-  data.tar.gz: 325136b2a4c1b1ff6c4b18e7c1e24851cb8e8a9c3d0260b7f3887a8ee6fc8d16
+  metadata.gz: afca4aa57caaccf5b8d75e2c2909ed31b380c03826ae3e38b5cf48398d068d96
+  data.tar.gz: e08567506ca4e42719de7e59521842b4602bfa7e1d47423f8e9a90efb0e89d8e
 SHA512:
-  metadata.gz: 91db05a5b5adbf97882cf5b9416e9956557cb3d16f0df3156f035686fc20f9d16c50e42946c26b08f4e98d9eb028ba3e45c9bce93dddc47ea57866df27af6de3
-  data.tar.gz: 3a08f9dccdb39cbdcd556524f878a516fcc005e88660d0d84a0b9fd57ae3278d09c1e63eaea6d4aecd2a78f35cb5963d9dc126474ad3ae5bae0315225d376773
+  metadata.gz: 3454ac8b968bb97b206ad3e71c1f31bddc17b46a303dcfe157be12077040edc072154ce83e515856b7afb575a2eec70c0324ccc7426393f2f94c82ef86a92dd9
+  data.tar.gz: c0c7eb8522874793fde72c2e339494f910cf99f8c041f57772ebf47e95fa448ad2835e30d25ab482c4e6ba899acfc256c03a253c5721a41af02505709d526cdb

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

@@ -4,6 +4,30 @@
 using namespace Rucy;
 
 
+static
+VALUE value_to_char(VALUE self, VALUE num)
+{
+	return value(to<char>(num));
+}
+
+static
+VALUE value_to_uchar(VALUE self, VALUE num)
+{
+	return value(to<unsigned char>(num));
+}
+
+static
+VALUE value_to_short(VALUE self, VALUE num)
+{
+	return value(to<short>(num));
+}
+
+static
+VALUE value_to_ushort(VALUE self, VALUE num)
+{
+	return value(to<unsigned short>(num));
+}
+
 static
 VALUE true_to_value(VALUE self)
 {
@@ -56,9 +80,15 @@ Init_value ()
 	Module mRucy = rb_define_module("Rucy");
 	Module mTester = rb_define_module_under(mRucy, "Tester");
 
+	rb_define_method(mTester, "value_to_char", RUBY_METHOD_FUNC(value_to_char), 1);
+	rb_define_method(mTester, "value_to_uchar", RUBY_METHOD_FUNC(value_to_uchar), 1);
+	rb_define_method(mTester, "value_to_short", RUBY_METHOD_FUNC(value_to_short), 1);
+	rb_define_method(mTester, "value_to_ushort", RUBY_METHOD_FUNC(value_to_ushort), 1);
+
 	rb_define_method(mTester, "true_to_value", RUBY_METHOD_FUNC(true_to_value), -1);
 	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/ChangeLog.md

@@ -1,6 +1,13 @@
 # rucy ChangeLog
 
 
+## [v0.3.8] - 2025-05-22
+
+- Catch std::out_of_range and std::range_error, then throw Ruby's IndexError and RangeError
+- Rucy::value_to<>() checks the value range when converting a ruby value to char or short
+- Add Rucy::range_error()
+
+
 ## [v0.3.7] - 2025-05-11
 
 - Fixed complex overloading of array(Value,Value) and array(iterator,iterator) functions

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/ext/rucy/value.cpp

@@ -4,6 +4,34 @@
 using namespace Rucy;
 
 
+static
+RUCY_DEF1(value_to_char, num)
+{
+	return value(to<char>(num));
+}
+RUCY_END
+
+static
+RUCY_DEF1(value_to_uchar, num)
+{
+	return value(to<unsigned char>(num));
+}
+RUCY_END
+
+static
+RUCY_DEF1(value_to_short, num)
+{
+	return value(to<short>(num));
+}
+RUCY_END
+
+static
+RUCY_DEF1(value_to_ushort, num)
+{
+	return value(to<unsigned short>(num));
+}
+RUCY_END
+
 static
 RUCY_DEFN(true_to_value)
 {
@@ -61,9 +89,15 @@ Init_value ()
 	Module mRucy   =       define_module("Rucy");
 	Module mTester = mRucy.define_module("Tester");
 
+	mTester.define_method("value_to_char",  value_to_char);
+	mTester.define_method("value_to_uchar", value_to_uchar);
+	mTester.define_method("value_to_short",  value_to_short);
+	mTester.define_method("value_to_ushort", value_to_ushort);
+
 	mTester.define_method("true_to_value", true_to_value);
 	mTester.define_method("false_to_value", false_to_value);
 	mTester.define_method("null_to_value", NULL_to_value);
+
 	mTester.define_method("nil_value", nil_value);
 	mTester.define_method("array_value", array_value);
 }

data/include/rucy/exception.h

@@ -74,15 +74,19 @@ namespace Rucy
 		int n6 = -1, int n7 = -1, int n8 = -1, int n9 = -1, int n10 = -1);
 
 	[[noreturn]]
-	void invalid_state_error (
+	void index_error (
 		const char* file, int line, const char* format = NULL, ...);
 
 	[[noreturn]]
-	void invalid_object_error (
+	void range_error (
 		const char* file, int line, const char* format = NULL, ...);
 
 	[[noreturn]]
-	void index_error (
+	void invalid_state_error (
+		const char* file, int line, const char* format = NULL, ...);
+
+	[[noreturn]]
+	void invalid_object_error (
 		const char* file, int line, const char* format = NULL, ...);
 
 	[[noreturn]]

data/include/rucy/extension.h.erb

@@ -222,6 +222,14 @@
 	{ \
 		RUCY_GOTO_RAISE(rb_exc_new2(rb_eArgError, e.what())); \
 	} \
+	catch (const std::out_of_range& e) \
+	{ \
+		RUCY_GOTO_RAISE(rb_exc_new2(rb_eIndexError, e.what())); \
+	} \
+	catch (const std::range_error& e) \
+	{ \
+		RUCY_GOTO_RAISE(rb_exc_new2(rb_eRangeError, e.what())); \
+	} \
 	catch (const std::exception& e) \
 	{ \
 		Xot::String text = e.what(), type = typeid(e).name(); \

data/rucy.gemspec

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

data/src/exception.cpp

@@ -102,24 +102,31 @@ namespace Rucy
 	}
 
 	void
-	invalid_state_error (const char* file, int line, const char* format, ...)
+	index_error (const char* file, int line, const char* format, ...)
 	{
 		XOT_STRINGF(format, s);
-		raise(invalid_state_error_class(), Xot::error_text(file, line, s));
+		raise(rb_eIndexError, Xot::error_text(file, line, s));
 	}
 
 	void
-	invalid_object_error (const char* file, int line, const char* format, ...)
+	range_error (const char* file, int line, const char* format, ...)
 	{
 		XOT_STRINGF(format, s);
-		raise(invalid_object_error_class(), Xot::error_text(file, line, s));
+		raise(rb_eRangeError, Xot::error_text(file, line, s));
 	}
 
 	void
-	index_error (const char* file, int line, const char* format, ...)
+	invalid_state_error (const char* file, int line, const char* format, ...)
 	{
 		XOT_STRINGF(format, s);
-		raise(rb_eIndexError, Xot::error_text(file, line, s));
+		raise(invalid_state_error_class(), Xot::error_text(file, line, s));
+	}
+
+	void
+	invalid_object_error (const char* file, int line, const char* format, ...)
+	{
+		XOT_STRINGF(format, s);
+		raise(invalid_object_error_class(), Xot::error_text(file, line, s));
 	}
 
 	void

data/src/value.cpp.erb

@@ -2,6 +2,7 @@
 #include "rucy/value.h"
 
 
+#include <limits>
 #include "rucy/function.h"
 #include "rucy/exception.h"
 #include "rucy/debug.h"
@@ -662,25 +663,53 @@ namespace Rucy
 	template <> char
 	value_to<char> (Value obj, bool convert)
 	{
-		return (char) value_to<int>(obj, convert);
+		int n = value_to<int>(obj, convert);
+		if (
+			n < std::numeric_limits<char>::min() ||
+			n > std::numeric_limits<char>::max())
+		{
+			range_error(__FILE__, __LINE__, "cannot cast '%d' to char");
+		}
+		return (char) n;
 	}
 
 	template <> unsigned char
 	value_to<unsigned char> (Value obj, bool convert)
 	{
-		return (unsigned char) value_to<unsigned int>(obj, convert);
+		int n = value_to<int>(obj, convert);
+		if (
+			n < std::numeric_limits<unsigned char>::min() ||
+			n > std::numeric_limits<unsigned char>::max())
+		{
+			range_error(__FILE__, __LINE__, "cannot cast '%d' to unsigned char");
+		}
+		return (unsigned char) n;
 	}
 
 	template <> short
 	value_to<short> (Value obj, bool convert)
 	{
-		return (short) value_to<int>(obj, convert);
+		int n = value_to<int>(obj, convert);
+		if (
+			n < std::numeric_limits<short>::min() ||
+			n > std::numeric_limits<short>::max())
+		{
+			range_error(__FILE__, __LINE__, "cannot cast '%d' to short");
+		}
+		return (short) n;
 	}
 
 	template <> unsigned short
 	value_to<unsigned short> (Value obj, bool convert)
 	{
-		return (unsigned short) value_to<unsigned int>(obj, convert);
+		int n = value_to<int>(obj, convert);
+		if (
+			n < std::numeric_limits<unsigned short>::min() ||
+			n > std::numeric_limits<unsigned short>::max())
+		{
+			range_error(__FILE__, __LINE__, "cannot cast '%d' to unsigned short");
+		}
+		return (unsigned short) n;
 	}
 
 	template <> long

data/test/test_value.rb

@@ -5,6 +5,36 @@ class TestFunction < Test::Unit::TestCase
 
   include Rucy::Tester
 
+  def test_value_to_char()
+    assert_equal    0,        value_to_char(   0)
+    assert_equal  127,        value_to_char( 127)
+    assert_equal -128,        value_to_char(-128)
+    assert_raise(RangeError) {value_to_char  128}
+    assert_raise(RangeError) {value_to_char -129}
+  end
+
+  def test_value_to_uchar()
+    assert_equal   0,         value_to_uchar(  0)
+    assert_equal 255,         value_to_uchar(255)
+    assert_raise(RangeError) {value_to_uchar 256}
+    assert_raise(RangeError) {value_to_uchar  -1}
+  end
+
+  def test_value_to_short()
+    assert_equal      0,        value_to_short(   0)
+    assert_equal  32767,      value_to_short( 32767)
+    assert_equal -32768,      value_to_short(-32768)
+    assert_raise(RangeError) {value_to_short  32768}
+    assert_raise(RangeError) {value_to_short -32769}
+  end
+
+  def test_value_to_ushort()
+    assert_equal     0,         value_to_ushort(  0)
+    assert_equal 65535,       value_to_ushort(65535)
+    assert_raise(RangeError) {value_to_ushort 65536}
+    assert_raise(RangeError) {value_to_ushort    -1}
+  end
+
   def test_to_value()
     assert_equal true, true_to_value
     assert_equal false, false_to_value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rucy
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-10 00:00:00.000000000 Z
+date: 2025-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.3.8
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.3.8
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.3.8
 description: This library helps you to develop Ruby Extension by C++.
 email: xordog@gmail.com
 executables: