Update to ruby/spec@35a9fba

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 240 deletions

diff --git a/spec/ruby/optional/capi/ext/object_spec.c b/spec/ruby/optional/capi/ext/object_spec.c
index 45a28169ef..c70c2ecf3a 100644
--- a/spec/ruby/optional/capi/ext/object_spec.c
+++ b/spec/ruby/optional/capi/ext/object_spec.c
@@ -5,7 +5,6 @@
 extern "C" {
 #endif
 
-#ifdef HAVE_FL_ABLE
 static VALUE object_spec_FL_ABLE(VALUE self, VALUE obj) {
   if (FL_ABLE(obj)) {
     return Qtrue;
@@ -13,9 +12,7 @@ static VALUE object_spec_FL_ABLE(VALUE self, VALUE obj) {
     return Qfalse;
   }
 }
-#endif
 
-#ifdef HAVE_FL_TEST
 static int object_spec_FL_TEST_flag(VALUE flag_string) {
   char *flag_cstr = StringValueCStr(flag_string);
   if (strcmp(flag_cstr, "FL_TAINT") == 0) {
@@ -29,115 +26,79 @@ static int object_spec_FL_TEST_flag(VALUE flag_string) {
 static VALUE object_spec_FL_TEST(VALUE self, VALUE obj, VALUE flag) {
   return INT2FIX(FL_TEST(obj, object_spec_FL_TEST_flag(flag)));
 }
-#endif
 
-#ifdef HAVE_OBJ_TAINT
 static VALUE object_spec_OBJ_TAINT(VALUE self, VALUE obj) {
   OBJ_TAINT(obj);
   return Qnil;
 }
-#endif
 
-#ifdef HAVE_OBJ_TAINTED
 static VALUE object_spec_OBJ_TAINTED(VALUE self, VALUE obj) {
   return OBJ_TAINTED(obj) ? Qtrue : Qfalse;
 }
-#endif
 
-#ifdef HAVE_OBJ_INFECT
 static VALUE object_spec_OBJ_INFECT(VALUE self, VALUE host, VALUE source) {
   OBJ_INFECT(host, source);
   return Qnil;
 }
-#endif
 
-#ifdef HAVE_RB_ANY_TO_S
 static VALUE object_spec_rb_any_to_s(VALUE self, VALUE obj) {
   return rb_any_to_s(obj);
 }
-#endif
 
-#ifdef HAVE_RB_ATTR_GET
 static VALUE so_attr_get(VALUE self, VALUE obj, VALUE attr) {
   return rb_attr_get(obj, SYM2ID(attr));
 }
-#endif
 
-#ifdef HAVE_RB_OBJ_INSTANCE_VARIABLES
 static VALUE object_spec_rb_obj_instance_variables(VALUE self, VALUE obj) {
   return rb_obj_instance_variables(obj);
 }
-#endif
 
-#ifdef HAVE_RB_CHECK_ARRAY_TYPE
 static VALUE so_check_array_type(VALUE self, VALUE ary) {
   return rb_check_array_type(ary);
 }
-#endif
 
-#ifdef HAVE_RB_CHECK_CONVERT_TYPE
 static VALUE so_check_convert_type(VALUE self, VALUE obj, VALUE klass, VALUE method) {
   return rb_check_convert_type(obj, T_ARRAY, RSTRING_PTR(klass), RSTRING_PTR(method));
 }
-#endif
 
-#ifdef HAVE_RB_CHECK_TO_INTEGER
 static VALUE so_check_to_integer(VALUE self, VALUE obj, VALUE method) {
   return rb_check_to_integer(obj, RSTRING_PTR(method));
 }
-#endif
 
-#ifdef HAVE_RB_CHECK_FROZEN
 static VALUE object_spec_rb_check_frozen(VALUE self, VALUE obj) {
   rb_check_frozen(obj);
   return Qnil;
 }
-#endif
 
-#ifdef HAVE_RB_CHECK_STRING_TYPE
 static VALUE so_check_string_type(VALUE self, VALUE str) {
   return rb_check_string_type(str);
 }
-#endif
 
-#ifdef HAVE_RB_CLASS_OF
 static VALUE so_rbclassof(VALUE self, VALUE obj) {
   return rb_class_of(obj);
 }
-#endif
 
-#ifdef HAVE_RB_CONVERT_TYPE
 static VALUE so_convert_type(VALUE self, VALUE obj, VALUE klass, VALUE method) {
   return rb_convert_type(obj, T_ARRAY, RSTRING_PTR(klass), RSTRING_PTR(method));
 }
-#endif
 
-#ifdef HAVE_RB_EXTEND_OBJECT
 static VALUE object_spec_rb_extend_object(VALUE self, VALUE obj, VALUE mod) {
   rb_extend_object(obj, mod);
   return obj;
 }
-#endif
 
-#ifdef HAVE_RB_INSPECT
 static VALUE so_inspect(VALUE self, VALUE obj) {
   return rb_inspect(obj);
 }
-#endif
 
-#ifdef HAVE_RB_OBJ_ALLOC
 static VALUE so_rb_obj_alloc(VALUE self, VALUE klass) {
   return rb_obj_alloc(klass);
 }
-#endif
 
-#ifdef HAVE_RB_OBJ_DUP
 static VALUE so_rb_obj_dup(VALUE self, VALUE klass) {
   return rb_obj_dup(klass);
 }
-#endif
 
-#ifdef HAVE_RB_OBJ_CALL_INIT
 static VALUE so_rb_obj_call_init(VALUE self, VALUE object,
                                  VALUE nargs, VALUE args) {
   int c_nargs = FIX2INT(nargs);
@@ -151,84 +112,58 @@ static VALUE so_rb_obj_call_init(VALUE self, VALUE object,
 
   return Qnil;
 }
-#endif
 
-#ifdef HAVE_RB_OBJ_CLASSNAME
 static VALUE so_rbobjclassname(VALUE self, VALUE obj) {
   return rb_str_new2(rb_obj_classname(obj));
 }
 
-#endif
 
-#ifdef HAVE_RB_OBJ_FREEZE
 static VALUE object_spec_rb_obj_freeze(VALUE self, VALUE obj) {
   return rb_obj_freeze(obj);
 }
-#endif
 
-#ifdef HAVE_RB_OBJ_FROZEN_P
 static VALUE object_spec_rb_obj_frozen_p(VALUE self, VALUE obj) {
   return rb_obj_frozen_p(obj);
 }
-#endif
 
-#ifdef HAVE_RB_OBJ_ID
 static VALUE object_spec_rb_obj_id(VALUE self, VALUE obj) {
   return rb_obj_id(obj);
 }
-#endif
 
-#ifdef HAVE_RB_OBJ_IS_INSTANCE_OF
 static VALUE so_instance_of(VALUE self, VALUE obj, VALUE klass) {
   return rb_obj_is_instance_of(obj, klass);
 }
-#endif
 
-#ifdef HAVE_RB_OBJ_IS_KIND_OF
 static VALUE so_kind_of(VALUE self, VALUE obj, VALUE klass) {
   return rb_obj_is_kind_of(obj, klass);
 }
-#endif
 
-#ifdef HAVE_RB_OBJ_METHOD_ARITY
 static VALUE object_specs_rb_obj_method_arity(VALUE self, VALUE obj, VALUE mid) {
   return INT2FIX(rb_obj_method_arity(obj, SYM2ID(mid)));
 }
-#endif
 
-#ifdef HAVE_RB_OBJ_TAINT
 static VALUE object_spec_rb_obj_taint(VALUE self, VALUE obj) {
   return rb_obj_taint(obj);
 }
-#endif
 
-#ifdef HAVE_RB_REQUIRE
 static VALUE so_require(VALUE self) {
   rb_require("fixtures/foo");
   return Qnil;
 }
-#endif
 
-#ifdef HAVE_RB_RESPOND_TO
 static VALUE so_respond_to(VALUE self, VALUE obj, VALUE sym) {
   return rb_respond_to(obj, SYM2ID(sym)) ? Qtrue : Qfalse;
 }
-#endif
 
-#ifdef HAVE_RB_OBJ_RESPOND_TO
 static VALUE so_obj_respond_to(VALUE self, VALUE obj, VALUE sym, VALUE priv) {
   return rb_obj_respond_to(obj, SYM2ID(sym), priv == Qtrue ? 1 : 0) ? Qtrue : Qfalse;
 }
-#endif
 
-#ifdef HAVE_RB_METHOD_BOUNDP
 static VALUE object_spec_rb_method_boundp(VALUE self, VALUE obj, VALUE method, VALUE exclude_private) {
   ID id = SYM2ID(method);
   return rb_method_boundp(obj, id, exclude_private == Qtrue ? 1 : 0) ? Qtrue : Qfalse;
 }
-#endif
 
-#ifdef HAVE_RB_SPECIAL_CONST_P
 static VALUE object_spec_rb_special_const_p(VALUE self, VALUE value) {
   if (rb_special_const_p(value)) {
     return Qtrue;
@@ -236,21 +171,15 @@ static VALUE object_spec_rb_special_const_p(VALUE self, VALUE value) {
     return Qfalse;
   }
 }
-#endif
 
-#ifdef HAVE_RB_TO_ID
 static VALUE so_to_id(VALUE self, VALUE obj) {
   return ID2SYM(rb_to_id(obj));
 }
-#endif
 
-#ifdef HAVE_RTEST
 static VALUE object_spec_RTEST(VALUE self, VALUE value) {
   return RTEST(value) ? Qtrue : Qfalse;
 }
-#endif
 
-#ifdef HAVE_TYPE
 static VALUE so_is_type_nil(VALUE self, VALUE obj) {
   if(TYPE(obj) == T_NIL) {
     return Qtrue;
@@ -292,9 +221,7 @@ static VALUE so_is_type_data(VALUE self, VALUE obj) {
   }
   return Qfalse;
 }
-#endif
 
-#ifdef HAVE_RB_TYPE_P
 static VALUE so_is_rb_type_p_nil(VALUE self, VALUE obj) {
   if(rb_type_p(obj, T_NIL)) {
     return Qtrue;
@@ -336,9 +263,7 @@ static VALUE so_is_rb_type_p_data(VALUE self, VALUE obj) {
   }
   return Qfalse;
 }
-#endif
 
-#ifdef HAVE_BUILTIN_TYPE
 static VALUE so_is_builtin_type_object(VALUE self, VALUE obj) {
   if(BUILTIN_TYPE(obj) == T_OBJECT) {
     return Qtrue;
@@ -373,272 +298,108 @@ static VALUE so_is_builtin_type_data(VALUE self, VALUE obj) {
   }
   return Qfalse;
 }
-#endif
 
-#ifdef HAVE_RB_TO_INT
 static VALUE object_spec_rb_to_int(VALUE self, VALUE obj) {
   return rb_to_int(obj);
 }
-#endif
 
-#ifdef HAVE_RB_OBJ_INSTANCE_EVAL
 static VALUE object_spec_rb_obj_instance_eval(VALUE self, VALUE obj) {
   return rb_obj_instance_eval(0, NULL, obj);
 }
-#endif
 
-#ifdef HAVE_RB_IV_GET
 static VALUE object_spec_rb_iv_get(VALUE self, VALUE obj, VALUE name) {
   return rb_iv_get(obj, RSTRING_PTR(name));
 }
-#endif
 
-#ifdef HAVE_RB_IV_SET
 static VALUE object_spec_rb_iv_set(VALUE self, VALUE obj, VALUE name, VALUE value) {
   return rb_iv_set(obj, RSTRING_PTR(name), value);
 }
-#endif
 
-#ifdef HAVE_RB_IVAR_GET
 static VALUE object_spec_rb_ivar_get(VALUE self, VALUE obj, VALUE sym_name) {
   return rb_ivar_get(obj, SYM2ID(sym_name));
 }
-#endif
 
-#ifdef HAVE_RB_IVAR_SET
 static VALUE object_spec_rb_ivar_set(VALUE self, VALUE obj, VALUE sym_name, VALUE value) {
   return rb_ivar_set(obj, SYM2ID(sym_name), value);
 }
-#endif
 
-#ifdef HAVE_RB_IVAR_DEFINED
 static VALUE object_spec_rb_ivar_defined(VALUE self, VALUE obj, VALUE sym_name) {
   return rb_ivar_defined(obj, SYM2ID(sym_name));
 }
-#endif
 
-#ifdef HAVE_RB_EQUAL
 static VALUE object_spec_rb_equal(VALUE self, VALUE a, VALUE b) {
   return rb_equal(a, b);
 }
-#endif
 
-#ifdef HAVE_RB_CLASS_INHERITED_P
 static VALUE object_spec_rb_class_inherited_p(VALUE self, VALUE mod, VALUE arg) {
   return rb_class_inherited_p(mod, arg);
 }
-#endif
 
 
 void Init_object_spec(void) {
-  VALUE cls;
-  cls = rb_define_class("CApiObjectSpecs", rb_cObject);
-
-#ifdef HAVE_FL_ABLE
+  VALUE cls = rb_define_class("CApiObjectSpecs", rb_cObject);
   rb_define_method(cls, "FL_ABLE", object_spec_FL_ABLE, 1);
-#endif
-
-#ifdef HAVE_FL_TEST
   rb_define_method(cls, "FL_TEST", object_spec_FL_TEST, 2);
-#endif
-
-#ifdef HAVE_OBJ_TAINT
   rb_define_method(cls, "OBJ_TAINT", object_spec_OBJ_TAINT, 1);
-#endif
-
-#ifdef HAVE_OBJ_TAINTED
   rb_define_method(cls, "OBJ_TAINTED", object_spec_OBJ_TAINTED, 1);
-#endif
-
-#ifdef HAVE_OBJ_INFECT
   rb_define_method(cls, "OBJ_INFECT", object_spec_OBJ_INFECT, 2);
-#endif
-
-#ifdef HAVE_RB_ANY_TO_S
   rb_define_method(cls, "rb_any_to_s", object_spec_rb_any_to_s, 1);
-#endif
-
-#ifdef HAVE_RB_ATTR_GET
   rb_define_method(cls, "rb_attr_get", so_attr_get, 2);
-#endif
-
-#ifdef HAVE_RB_OBJ_INSTANCE_VARIABLES
   rb_define_method(cls, "rb_obj_instance_variables", object_spec_rb_obj_instance_variables, 1);
-#endif
-
-#ifdef HAVE_RB_CHECK_ARRAY_TYPE
   rb_define_method(cls, "rb_check_array_type", so_check_array_type, 1);
-#endif
-
-#ifdef HAVE_RB_CHECK_CONVERT_TYPE
   rb_define_method(cls, "rb_check_convert_type", so_check_convert_type, 3);
-#endif
-
-#ifdef HAVE_RB_CHECK_TO_INTEGER
   rb_define_method(cls, "rb_check_to_integer", so_check_to_integer, 2);
-#endif
-
-#ifdef HAVE_RB_CHECK_FROZEN
   rb_define_method(cls, "rb_check_frozen", object_spec_rb_check_frozen, 1);
-#endif
-
-#ifdef HAVE_RB_CHECK_STRING_TYPE
   rb_define_method(cls, "rb_check_string_type", so_check_string_type, 1);
-#endif
-
-#ifdef HAVE_RB_CLASS_OF
   rb_define_method(cls, "rb_class_of", so_rbclassof, 1);
-#endif
-
-#ifdef HAVE_RB_CONVERT_TYPE
   rb_define_method(cls, "rb_convert_type", so_convert_type, 3);
-#endif
-
-#ifdef HAVE_RB_EXTEND_OBJECT
   rb_define_method(cls, "rb_extend_object", object_spec_rb_extend_object, 2);
-#endif
-
-#ifdef HAVE_RB_INSPECT
   rb_define_method(cls, "rb_inspect", so_inspect, 1);
-#endif
-
-#ifdef HAVE_RB_OBJ_ALLOC
   rb_define_method(cls, "rb_obj_alloc", so_rb_obj_alloc, 1);
-#endif
-
-#ifdef HAVE_RB_OBJ_ALLOC
   rb_define_method(cls, "rb_obj_dup", so_rb_obj_dup, 1);
-#endif
-
-#ifdef HAVE_RB_OBJ_CALL_INIT
   rb_define_method(cls, "rb_obj_call_init", so_rb_obj_call_init, 3);
-#endif
-
-#ifdef HAVE_RB_OBJ_CLASSNAME
   rb_define_method(cls, "rb_obj_classname", so_rbobjclassname, 1);
-#endif
-
-#ifdef HAVE_RB_OBJ_FREEZE
   rb_define_method(cls, "rb_obj_freeze", object_spec_rb_obj_freeze, 1);
-#endif
-
-#ifdef HAVE_RB_OBJ_FROZEN_P
   rb_define_method(cls, "rb_obj_frozen_p", object_spec_rb_obj_frozen_p, 1);
-#endif
-
-#ifdef HAVE_RB_OBJ_ID
   rb_define_method(cls, "rb_obj_id", object_spec_rb_obj_id, 1);
-#endif
-
-#ifdef HAVE_RB_OBJ_IS_INSTANCE_OF
   rb_define_method(cls, "rb_obj_is_instance_of", so_instance_of, 2);
-#endif
-
-#ifdef HAVE_RB_OBJ_IS_KIND_OF
   rb_define_method(cls, "rb_obj_is_kind_of", so_kind_of, 2);
-#endif
-
-#ifdef HAVE_RB_OBJ_METHOD_ARITY
   rb_define_method(cls, "rb_obj_method_arity", object_specs_rb_obj_method_arity, 2);
-#endif
-
-#ifdef HAVE_RB_OBJ_TAINT
   rb_define_method(cls, "rb_obj_taint", object_spec_rb_obj_taint, 1);
-#endif
-
-#ifdef HAVE_RB_REQUIRE
   rb_define_method(cls, "rb_require", so_require, 0);
-#endif
-
-#ifdef HAVE_RB_RESPOND_TO
   rb_define_method(cls, "rb_respond_to", so_respond_to, 2);
-#endif
-
-#ifdef HAVE_RB_METHOD_BOUNDP
   rb_define_method(cls, "rb_method_boundp", object_spec_rb_method_boundp, 3);
-#endif
-
-#ifdef HAVE_RB_OBJ_RESPOND_TO
   rb_define_method(cls, "rb_obj_respond_to", so_obj_respond_to, 3);
-#endif
-
-#ifdef HAVE_RB_SPECIAL_CONST_P
   rb_define_method(cls, "rb_special_const_p", object_spec_rb_special_const_p, 1);
-#endif
 
-#ifdef HAVE_RB_STR_NEW2
-#endif
-
-#ifdef HAVE_RB_TO_ID
   rb_define_method(cls, "rb_to_id", so_to_id, 1);
-#endif
-
-#ifdef HAVE_RTEST
   rb_define_method(cls, "RTEST", object_spec_RTEST, 1);
-#endif
-
-#ifdef HAVE_TYPE
   rb_define_method(cls, "rb_is_type_nil", so_is_type_nil, 1);
   rb_define_method(cls, "rb_is_type_object", so_is_type_object, 1);
   rb_define_method(cls, "rb_is_type_array", so_is_type_array, 1);
   rb_define_method(cls, "rb_is_type_module", so_is_type_module, 1);
   rb_define_method(cls, "rb_is_type_class", so_is_type_class, 1);
   rb_define_method(cls, "rb_is_type_data", so_is_type_data, 1);
-#endif
-
-#ifdef HAVE_RB_TYPE_P
   rb_define_method(cls, "rb_is_rb_type_p_nil", so_is_rb_type_p_nil, 1);
   rb_define_method(cls, "rb_is_rb_type_p_object", so_is_rb_type_p_object, 1);
   rb_define_method(cls, "rb_is_rb_type_p_array", so_is_rb_type_p_array, 1);
   rb_define_method(cls, "rb_is_rb_type_p_module", so_is_rb_type_p_module, 1);
   rb_define_method(cls, "rb_is_rb_type_p_class", so_is_rb_type_p_class, 1);
   rb_define_method(cls, "rb_is_rb_type_p_data", so_is_rb_type_p_data, 1);
-#endif
-
-#ifdef HAVE_BUILTIN_TYPE
   rb_define_method(cls, "rb_is_builtin_type_object", so_is_builtin_type_object, 1);
   rb_define_method(cls, "rb_is_builtin_type_array", so_is_builtin_type_array, 1);
   rb_define_method(cls, "rb_is_builtin_type_module", so_is_builtin_type_module, 1);
   rb_define_method(cls, "rb_is_builtin_type_class", so_is_builtin_type_class, 1);
   rb_define_method(cls, "rb_is_builtin_type_data", so_is_builtin_type_data, 1);
-#endif
-
-#ifdef HAVE_RB_TO_INT
   rb_define_method(cls, "rb_to_int", object_spec_rb_to_int, 1);
-#endif
-
-#ifdef HAVE_RB_EQUAL
   rb_define_method(cls, "rb_equal", object_spec_rb_equal, 2);
-#endif
-
-#ifdef HAVE_RB_CLASS_INHERITED_P
   rb_define_method(cls, "rb_class_inherited_p", object_spec_rb_class_inherited_p, 2);
-#endif
-
-#ifdef HAVE_RB_OBJ_INSTANCE_EVAL
   rb_define_method(cls, "rb_obj_instance_eval", object_spec_rb_obj_instance_eval, 1);
-#endif
-
-#ifdef HAVE_RB_IV_GET
   rb_define_method(cls, "rb_iv_get", object_spec_rb_iv_get, 2);
-#endif
-
-#ifdef HAVE_RB_IV_SET
   rb_define_method(cls, "rb_iv_set", object_spec_rb_iv_set, 3);
-#endif
-
-#ifdef HAVE_RB_IVAR_GET
   rb_define_method(cls, "rb_ivar_get", object_spec_rb_ivar_get, 2);
-#endif
-
-#ifdef HAVE_RB_IVAR_SET
   rb_define_method(cls, "rb_ivar_set", object_spec_rb_ivar_set, 3);
-#endif
-
-#ifdef HAVE_RB_IVAR_DEFINED
   rb_define_method(cls, "rb_ivar_defined", object_spec_rb_ivar_defined, 2);
-#endif
-
 }
 
 #ifdef __cplusplus