Update to ruby/spec@35a9fba

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
author: eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> 2019-01-20 20:38:57 +0000
committer: eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> 2019-01-20 20:38:57 +0000
commit: 6204e0804b24f1675b49d5880da014411bcfb831 (patch)
tree: ce6c00bf078fc416936ca3cdc972b9b3c1c78dae /spec/ruby/optional/capi/ext/class_spec.c
parent: 58573c33e4720315ed27491e31dcc22892e1ce95 (diff)
1 files changed, 16 insertions, 107 deletions
diff --git a/spec/ruby/optional/capi/ext/class_spec.c b/spec/ruby/optional/capi/ext/class_spec.c
index e3860df1da..6e5c02e657 100644
--- a/spec/ruby/optional/capi/ext/class_spec.c
+++ b/spec/ruby/optional/capi/ext/class_spec.c
@@ -8,7 +8,6 @@
 extern "C" {
 #endif
 
-#ifdef HAVE_RB_CALL_SUPER
 static VALUE class_spec_call_super_method(VALUE self) {
   return rb_call_super(0, 0);
 }
@@ -17,45 +16,31 @@ static VALUE class_spec_define_call_super_method(VALUE self, VALUE obj, VALUE st
   rb_define_method(obj, RSTRING_PTR(str_name), class_spec_call_super_method, 0);
   return Qnil;
 }
-#endif
 
-#ifdef HAVE_RB_CLASS_PATH
 static VALUE class_spec_rb_class_path(VALUE self, VALUE klass) {
   return rb_class_path(klass);
 }
-#endif
 
-#ifdef HAVE_RB_CLASS_NAME
 static VALUE class_spec_rb_class_name(VALUE self, VALUE klass) {
   return rb_class_name(klass);
 }
-#endif
 
-#ifdef HAVE_RB_CLASS2NAME
 static VALUE class_spec_rb_class2name(VALUE self, VALUE klass) {
   return rb_str_new2( rb_class2name(klass) );
 }
-#endif
 
-#ifdef HAVE_RB_PATH2CLASS
 static VALUE class_spec_rb_path2class(VALUE self, VALUE path) {
   return rb_path2class(RSTRING_PTR(path));
 }
-#endif
 
-#ifdef HAVE_RB_PATH_TO_CLASS
 static VALUE class_spec_rb_path_to_class(VALUE self, VALUE path) {
   return rb_path_to_class(path);
 }
-#endif
 
-#ifdef HAVE_RB_CLASS_NEW
 static VALUE class_spec_rb_class_new(VALUE self, VALUE super) {
   return rb_class_new(super);
 }
-#endif
 
-#ifdef HAVE_RB_CLASS_NEW_INSTANCE
 static VALUE class_spec_rb_class_new_instance(VALUE self,
                                       VALUE nargs, VALUE args,
                                       VALUE klass) {
@@ -68,9 +53,7 @@ static VALUE class_spec_rb_class_new_instance(VALUE self,
 
   return rb_class_new_instance(c_nargs, c_args, klass);
 }
-#endif
 
-#ifdef HAVE_RB_CLASS_REAL
 static VALUE class_spec_rb_class_real(VALUE self, VALUE object) {
   if(rb_type_p(object, T_FIXNUM)) {
     return INT2FIX(rb_class_real(FIX2INT(object)));
@@ -78,49 +61,35 @@ static VALUE class_spec_rb_class_real(VALUE self, VALUE object) {
     return rb_class_real(CLASS_OF(object));
   }
 }
-#endif
 
-#ifdef HAVE_RB_CLASS_SUPERCLASS
 static VALUE class_spec_rb_class_superclass(VALUE self, VALUE klass) {
   return rb_class_superclass(klass);
 }
-#endif
 
-#ifdef HAVE_RB_CVAR_DEFINED
 static VALUE class_spec_cvar_defined(VALUE self, VALUE klass, VALUE id) {
   ID as_id = rb_intern(StringValuePtr(id));
   return rb_cvar_defined(klass, as_id);
 }
-#endif
 
-#ifdef HAVE_RB_CVAR_GET
 static VALUE class_spec_cvar_get(VALUE self, VALUE klass, VALUE name) {
   return rb_cvar_get(klass, rb_intern(StringValuePtr(name)));
 }
-#endif
 
-#ifdef HAVE_RB_CVAR_SET
 static VALUE class_spec_cvar_set(VALUE self, VALUE klass, VALUE name, VALUE val) {
   rb_cvar_set(klass, rb_intern(StringValuePtr(name)), val);
   return Qnil;
 }
-#endif
 
-#ifdef HAVE_RB_CV_GET
 static VALUE class_spec_cv_get(VALUE self, VALUE klass, VALUE name) {
   return rb_cv_get(klass, StringValuePtr(name));
 }
-#endif
 
-#ifdef HAVE_RB_CV_SET
 static VALUE class_spec_cv_set(VALUE self, VALUE klass, VALUE name, VALUE val) {
   rb_cv_set(klass, StringValuePtr(name), val);
 
   return Qnil;
 }
-#endif
 
-#ifdef HAVE_RB_DEFINE_ATTR
 VALUE class_spec_define_attr(VALUE self, VALUE klass, VALUE sym, VALUE read, VALUE write) {
   int int_read, int_write;
   int_read = read == Qtrue ? 1 : 0;
@@ -128,132 +97,72 @@ VALUE class_spec_define_attr(VALUE self, VALUE klass, VALUE sym, VALUE read, VAL
   rb_define_attr(klass, rb_id2name(SYM2ID(sym)), int_read, int_write);
   return Qnil;
 }
-#endif
 
-#ifdef HAVE_RB_DEFINE_CLASS
 static VALUE class_spec_rb_define_class(VALUE self, VALUE name, VALUE super) {
   if(NIL_P(super)) super = 0;
   return rb_define_class(RSTRING_PTR(name), super);
 }
-#endif
 
-#ifdef HAVE_RB_DEFINE_CLASS_UNDER
 static VALUE class_spec_rb_define_class_under(VALUE self, VALUE outer,
                                                  VALUE name, VALUE super) {
   if(NIL_P(super)) super = 0;
   return rb_define_class_under(outer, RSTRING_PTR(name), super);
 }
-#endif
 
-#ifdef HAVE_RB_DEFINE_CLASS_ID_UNDER
 static VALUE class_spec_rb_define_class_id_under(VALUE self, VALUE outer,
                                                  VALUE name, VALUE super) {
   if(NIL_P(super)) super = 0;
   return rb_define_class_id_under(outer, SYM2ID(name), super);
 }
-#endif
 
-#ifdef HAVE_RB_DEFINE_CLASS_VARIABLE
 static VALUE class_spec_define_class_variable(VALUE self, VALUE klass, VALUE name, VALUE val) {
   rb_define_class_variable(klass, StringValuePtr(name), val);
   return Qnil;
 }
-#endif
 
-#ifdef HAVE_RB_INCLUDE_MODULE
 static VALUE class_spec_include_module(VALUE self, VALUE klass, VALUE module) {
   rb_include_module(klass, module);
   return klass;
 }
-#endif
 
-void Init_class_spec(void) {
-  VALUE cls;
-  cls = rb_define_class("CApiClassSpecs", rb_cObject);
+static VALUE class_spec_method_var_args_1(int argc, VALUE *argv, VALUE self) {
+  VALUE ary = rb_ary_new();
+  int i;
+  for (i = 0; i < argc; i++) {
+    rb_ary_push(ary, argv[i]);
+  }
+  return ary;
+}
 
-#ifdef HAVE_RB_CALL_SUPER
-  rb_define_method(cls, "define_call_super_method", class_spec_define_call_super_method, 2);
-#endif
+static VALUE class_spec_method_var_args_2(VALUE self, VALUE argv) {
+  return argv;
+}
 
-#ifdef HAVE_RB_CLASS_PATH
+void Init_class_spec(void) {
+  VALUE cls = rb_define_class("CApiClassSpecs", rb_cObject);
+  rb_define_method(cls, "define_call_super_method", class_spec_define_call_super_method, 2);
   rb_define_method(cls, "rb_class_path", class_spec_rb_class_path, 1);
-#endif
-
-#ifdef HAVE_RB_CLASS_NAME
   rb_define_method(cls, "rb_class_name", class_spec_rb_class_name, 1);
-#endif
-
-#ifdef HAVE_RB_CLASS2NAME
   rb_define_method(cls, "rb_class2name", class_spec_rb_class2name, 1);
-#endif
-
-#ifdef HAVE_RB_PATH2CLASS
   rb_define_method(cls, "rb_path2class", class_spec_rb_path2class, 1);
-#endif
-
-#ifdef HAVE_RB_PATH_TO_CLASS
   rb_define_method(cls, "rb_path_to_class", class_spec_rb_path_to_class, 1);
-#endif
-
-#ifdef HAVE_RB_CLASS_NEW
   rb_define_method(cls, "rb_class_new", class_spec_rb_class_new, 1);
-#endif
-
-#ifdef HAVE_RB_CLASS_NEW_INSTANCE
   rb_define_method(cls, "rb_class_new_instance", class_spec_rb_class_new_instance, 3);
-#endif
-
-#ifdef HAVE_RB_CLASS_REAL
   rb_define_method(cls, "rb_class_real", class_spec_rb_class_real, 1);
-#endif
-
-#ifdef HAVE_RB_CLASS_SUPERCLASS
   rb_define_method(cls, "rb_class_superclass", class_spec_rb_class_superclass, 1);
-#endif
-
-#ifdef HAVE_RB_CVAR_DEFINED
   rb_define_method(cls, "rb_cvar_defined", class_spec_cvar_defined, 2);
-#endif
-
-#ifdef HAVE_RB_CVAR_GET
   rb_define_method(cls, "rb_cvar_get", class_spec_cvar_get, 2);
-#endif
-
-#ifdef HAVE_RB_CVAR_SET
   rb_define_method(cls, "rb_cvar_set", class_spec_cvar_set, 3);
-#endif
-
-#ifdef HAVE_RB_CV_GET
   rb_define_method(cls, "rb_cv_get", class_spec_cv_get, 2);
-#endif
-
-#ifdef HAVE_RB_CV_SET
   rb_define_method(cls, "rb_cv_set", class_spec_cv_set, 3);
-#endif
-
-#ifdef HAVE_RB_DEFINE_ATTR
   rb_define_method(cls, "rb_define_attr", class_spec_define_attr, 4);
-#endif
-
-#ifdef HAVE_RB_DEFINE_CLASS
   rb_define_method(cls, "rb_define_class", class_spec_rb_define_class, 2);
-#endif
-
-#ifdef HAVE_RB_DEFINE_CLASS_UNDER
   rb_define_method(cls, "rb_define_class_under", class_spec_rb_define_class_under, 3);
-#endif
-
-#ifdef HAVE_RB_DEFINE_CLASS_ID_UNDER
   rb_define_method(cls, "rb_define_class_id_under", class_spec_rb_define_class_id_under, 3);
-#endif
-
-#ifdef HAVE_RB_DEFINE_CLASS_VARIABLE
   rb_define_method(cls, "rb_define_class_variable", class_spec_define_class_variable, 3);
-#endif
-
-#ifdef HAVE_RB_INCLUDE_MODULE
   rb_define_method(cls, "rb_include_module", class_spec_include_module, 2);
-#endif
+  rb_define_method(cls, "rb_method_varargs_1", class_spec_method_var_args_1, -1);
+  rb_define_method(cls, "rb_method_varargs_2", class_spec_method_var_args_2, -2);
 }
 
 #ifdef __cplusplus
author	eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>	2019-01-20 20:38:57 +0000
committer	eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>	2019-01-20 20:38:57 +0000
commit	6204e0804b24f1675b49d5880da014411bcfb831 (patch)
tree	ce6c00bf078fc416936ca3cdc972b9b3c1c78dae /spec/ruby/optional/capi/ext/class_spec.c
parent	58573c33e4720315ed27491e31dcc22892e1ce95 (diff)