[GR-19220] Implement rb_syserr_new in C

PullRequest: truffleruby/3930

Author: andrykonchin

CHANGELOG.md

@@ -34,6 +34,7 @@ Compatibility:
 * Add `Module#undefined_instance_methods` (#3039, @itarato).
 * Add `Thread.each_caller_location` (#3039, @itarato).
 * Add `timeout` argument to `Thread::SizedQueue#push` (#3039, @itarato).
+* Add `rb_syserr_new` function (@rwstauner).
 
 Performance:
 

lib/cext/ABI_version.txt

@@ -1 +1 @@
-9
+10

spec/ruby/core/exception/case_compare_spec.rb

@@ -26,13 +26,11 @@
   end
 
   it "returns true if receiver is generic and arg is kind of SystemCallError" do
-    unknown_error_number = Errno.constants.size
     e = SystemCallError.new('foo', @example_errno)
     SystemCallError.===(e).should == true
   end
 
   it "returns false if receiver is generic and arg is not kind of SystemCallError" do
-    unknown_error_number = Errno.constants.size
     e = Object.new
     SystemCallError.===(e).should == false
   end

spec/ruby/optional/capi/exception_spec.rb

@@ -100,6 +100,40 @@
     end
   end
 
+  describe "rb_syserr_new" do
+    it "returns system error with default message when passed message is NULL" do
+      exception = @s.rb_syserr_new(Errno::ENOENT::Errno, nil)
+      exception.class.should == Errno::ENOENT
+      exception.message.should include("No such file or directory")
+      exception.should.is_a?(SystemCallError)
+    end
+
+    it "returns system error with custom message" do
+      exception = @s.rb_syserr_new(Errno::ENOENT::Errno, "custom message")
+
+      exception.message.should include("custom message")
+      exception.class.should == Errno::ENOENT
+      exception.should.is_a?(SystemCallError)
+    end
+  end
+
+  describe "rb_syserr_new_str" do
+    it "returns system error with default message when passed message is nil" do
+      exception = @s.rb_syserr_new_str(Errno::ENOENT::Errno, nil)
+
+      exception.message.should include("No such file or directory")
+      exception.class.should == Errno::ENOENT
+      exception.should.is_a?(SystemCallError)
+    end
+
+    it "returns system error with custom message" do
+      exception = @s.rb_syserr_new_str(Errno::ENOENT::Errno, "custom message")
+      exception.message.should include("custom message")
+      exception.class.should == Errno::ENOENT
+      exception.should.is_a?(SystemCallError)
+    end
+  end
+
   describe "rb_make_exception" do
     it "returns a RuntimeError when given a String argument" do
       e = @s.rb_make_exception(["Message"])

spec/ruby/optional/capi/ext/class_spec.c

@@ -72,7 +72,7 @@ static VALUE class_spec_rb_class_new_instance_kw(VALUE self, VALUE args, VALUE k
 #endif
 
 static VALUE class_spec_rb_class_real(VALUE self, VALUE object) {
-  if(rb_type_p(object, T_FIXNUM)) {
+  if (rb_type_p(object, T_FIXNUM)) {
     return INT2FIX(rb_class_real(FIX2INT(object)));
   } else {
     return rb_class_real(CLASS_OF(object));
@@ -116,19 +116,19 @@ VALUE class_spec_define_attr(VALUE self, VALUE klass, VALUE sym, VALUE read, VAL
 }
 
 static VALUE class_spec_rb_define_class(VALUE self, VALUE name, VALUE super) {
-  if(NIL_P(super)) super = 0;
+  if (NIL_P(super)) super = 0;
   return rb_define_class(RSTRING_PTR(name), super);
 }
 
 static VALUE class_spec_rb_define_class_under(VALUE self, VALUE outer,
                                                  VALUE name, VALUE super) {
-  if(NIL_P(super)) super = 0;
+  if (NIL_P(super)) super = 0;
   return rb_define_class_under(outer, RSTRING_PTR(name), super);
 }
 
 static VALUE class_spec_rb_define_class_id_under(VALUE self, VALUE outer,
                                                  VALUE name, VALUE super) {
-  if(NIL_P(super)) super = 0;
+  if (NIL_P(super)) super = 0;
   return rb_define_class_id_under(outer, SYM2ID(name), super);
 }
 

spec/ruby/optional/capi/ext/debug_spec.c

@@ -45,7 +45,7 @@ static VALUE rb_debug_inspector_frame_iseq_get_callback(const rb_debug_inspector
   return rb_debug_inspector_frame_iseq_get(dc, NUM2LONG((VALUE) ptr));
 }
 
-static VALUE debug_spec_callback_data(VALUE self){
+static VALUE debug_spec_callback_data(VALUE self) {
   return callback_data;
 }
 

spec/ruby/optional/capi/ext/encoding_spec.c

@@ -12,7 +12,7 @@ static VALUE encoding_spec_MBCLEN_CHARFOUND_P(VALUE self, VALUE obj) {
 }
 
 static VALUE encoding_spec_ENC_CODERANGE_ASCIIONLY(VALUE self, VALUE obj) {
-  if(ENC_CODERANGE_ASCIIONLY(obj)) {
+  if (ENC_CODERANGE_ASCIIONLY(obj)) {
     return Qtrue;
   } else {
     return Qfalse;
@@ -61,13 +61,13 @@ static VALUE encoding_spec_rb_filesystem_encindex(VALUE self) {
 
 static VALUE encoding_spec_rb_default_internal_encoding(VALUE self) {
   rb_encoding* enc = rb_default_internal_encoding();
-  if(enc == 0) return Qnil;
+  if (enc == 0) return Qnil;
   return rb_str_new2(enc->name);
 }
 
 static VALUE encoding_spec_rb_default_external_encoding(VALUE self) {
   rb_encoding* enc = rb_default_external_encoding();
-  if(enc == 0) return Qnil;
+  if (enc == 0) return Qnil;
   return rb_str_new2(enc->name);
 }
 
@@ -86,7 +86,7 @@ static VALUE encoding_spec_rb_enc_associate_index(VALUE self, VALUE obj, VALUE i
 static VALUE encoding_spec_rb_enc_compatible(VALUE self, VALUE a, VALUE b) {
   rb_encoding* enc = rb_enc_compatible(a, b);
 
-  if(!enc) return INT2FIX(0);
+  if (!enc) return INT2FIX(0);
 
   return rb_enc_from_encoding(enc);
 }

spec/ruby/optional/capi/ext/exception_spec.c

@@ -27,7 +27,7 @@ VALUE exception_spec_rb_exc_new3(VALUE self, VALUE str) {
 }
 
 VALUE exception_spec_rb_exc_raise(VALUE self, VALUE exc) {
-    if (self != Qundef) rb_exc_raise(exc);
+  if (self != Qundef) rb_exc_raise(exc);
   return Qnil;
 }
 
@@ -36,6 +36,21 @@ VALUE exception_spec_rb_set_errinfo(VALUE self, VALUE exc) {
   return Qnil;
 }
 
+VALUE exception_spec_rb_syserr_new(VALUE self, VALUE num, VALUE msg) {
+  int n = NUM2INT(num);
+  char *cstr = NULL;
+
+  if (msg != Qnil) {
+    cstr = StringValuePtr(msg);
+  }
+
+  return rb_syserr_new(n, cstr);
+}
+
+VALUE exception_spec_rb_syserr_new_str(VALUE self, VALUE num, VALUE msg) {
+  int n = NUM2INT(num);
+  return rb_syserr_new_str(n, msg);
+}
 
 VALUE exception_spec_rb_make_exception(VALUE self, VALUE ary) {
   int argc = RARRAY_LENINT(ary);
@@ -51,6 +66,8 @@ void Init_exception_spec(void) {
   rb_define_method(cls, "rb_exc_new3", exception_spec_rb_exc_new3, 1);
   rb_define_method(cls, "rb_exc_raise", exception_spec_rb_exc_raise, 1);
   rb_define_method(cls, "rb_set_errinfo", exception_spec_rb_set_errinfo, 1);
+  rb_define_method(cls, "rb_syserr_new", exception_spec_rb_syserr_new, 2);
+  rb_define_method(cls, "rb_syserr_new_str", exception_spec_rb_syserr_new_str, 2);
   rb_define_method(cls, "rb_make_exception", exception_spec_rb_make_exception, 1);
 }
 

spec/ruby/optional/capi/ext/gc_spec.c

@@ -51,7 +51,7 @@ static VALUE gc_spec_rb_gc(VALUE self) {
   return Qnil;
 }
 
-static VALUE gc_spec_rb_gc_latest_gc_info(VALUE self, VALUE hash_or_key){
+static VALUE gc_spec_rb_gc_latest_gc_info(VALUE self, VALUE hash_or_key) {
   return rb_gc_latest_gc_info(hash_or_key);
 }
 

spec/ruby/optional/capi/ext/integer_spec.c

@@ -6,16 +6,15 @@ extern "C" {
 #endif
 
 static VALUE integer_spec_rb_integer_pack(VALUE self, VALUE value,
-    VALUE words, VALUE numwords, VALUE wordsize, VALUE nails, VALUE flags)
-{
+    VALUE words, VALUE numwords, VALUE wordsize, VALUE nails, VALUE flags) {
   int result = rb_integer_pack(value, (void*)RSTRING_PTR(words), FIX2INT(numwords),
       FIX2INT(wordsize), FIX2INT(nails), FIX2INT(flags));
   return INT2FIX(result);
 }
 
 RUBY_EXTERN VALUE rb_int_positive_pow(long x, unsigned long y); /* internal.h, used in ripper */
 
-static VALUE integer_spec_rb_int_positive_pow(VALUE self, VALUE a, VALUE b){
+static VALUE integer_spec_rb_int_positive_pow(VALUE self, VALUE a, VALUE b) {
   return rb_int_positive_pow(FIX2INT(a), FIX2INT(b));
 }