1 files changed, 27 insertions, 49 deletions

diff --git a/spec/ruby/optional/capi/ext/symbol_spec.c b/spec/ruby/optional/capi/ext/symbol_spec.c
index 7ffa7cf9b1..ba88635faa 100644
--- a/spec/ruby/optional/capi/ext/symbol_spec.c
+++ b/spec/ruby/optional/capi/ext/symbol_spec.c
@@ -1,15 +1,16 @@
 #include "ruby.h"
 #include "rubyspec.h"
 
-#ifdef HAVE_RUBY_ENCODING_H
 #include "ruby/encoding.h"
-#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef HAVE_RB_INTERN
+VALUE symbol_spec_SYMBOL_P(VALUE self, VALUE obj) {
+  return SYMBOL_P(obj) ? Qtrue : Qfalse;
+}
+
 VALUE symbol_spec_rb_intern(VALUE self, VALUE string) {
   return ID2SYM(rb_intern(RSTRING_PTR(string)));
 }
@@ -31,9 +32,7 @@ VALUE symbol_spec_rb_intern2_c_compare(VALUE self, VALUE string, VALUE len, VALU
   ID symbol = rb_intern2(RSTRING_PTR(string), FIX2LONG(len));
   return (SYM2ID(sym) == symbol) ? Qtrue : Qfalse;
 }
-#endif
 
-#ifdef HAVE_RB_INTERN3
 VALUE symbol_spec_rb_intern3(VALUE self, VALUE string, VALUE len, VALUE enc) {
   return ID2SYM(rb_intern3(RSTRING_PTR(string), FIX2LONG(len), rb_enc_get(enc)));
 }
@@ -42,95 +41,74 @@ VALUE symbol_spec_rb_intern3_c_compare(VALUE self, VALUE string, VALUE len, VALU
   ID symbol = rb_intern3(RSTRING_PTR(string), FIX2LONG(len), rb_enc_get(enc));
   return (SYM2ID(sym) == symbol) ? Qtrue : Qfalse;
 }
-#endif
 
-#ifdef HAVE_RB_ID2NAME
 VALUE symbol_spec_rb_id2name(VALUE self, VALUE symbol) {
   const char* c_str = rb_id2name(SYM2ID(symbol));
   return rb_str_new(c_str, strlen(c_str));
 }
-#endif
 
-#ifdef HAVE_RB_ID2STR
+VALUE symbol_spec_rb_id2name_id_zero(VALUE self) {
+  const char* c_str = rb_id2name((ID) 0);
+  return c_str ? rb_str_new(c_str, strlen(c_str)) : Qnil;
+}
+
 VALUE symbol_spec_rb_id2str(VALUE self, VALUE symbol) {
   return rb_id2str(SYM2ID(symbol));
 }
-#endif
 
-#ifdef HAVE_RB_INTERN_STR
+VALUE symbol_spec_rb_id2str_id_zero(VALUE self) {
+  return rb_id2str((ID) 0);
+}
+
 VALUE symbol_spec_rb_intern_str(VALUE self, VALUE str) {
   return ID2SYM(rb_intern_str(str));
 }
-#endif
 
-#ifdef HAVE_RB_IS_CLASS_ID
+VALUE symbol_spec_rb_check_symbol_cstr(VALUE self, VALUE str) {
+  return rb_check_symbol_cstr(RSTRING_PTR(str), RSTRING_LEN(str), rb_enc_get(str));
+}
+
 VALUE symbol_spec_rb_is_class_id(VALUE self, VALUE sym) {
   return rb_is_class_id(SYM2ID(sym)) ? Qtrue : Qfalse;
 }
-#endif
 
-#ifdef HAVE_RB_IS_CONST_ID
 VALUE symbol_spec_rb_is_const_id(VALUE self, VALUE sym) {
   return rb_is_const_id(SYM2ID(sym)) ? Qtrue : Qfalse;
 }
-#endif
 
-#ifdef HAVE_RB_IS_INSTANCE_ID
 VALUE symbol_spec_rb_is_instance_id(VALUE self, VALUE sym) {
   return rb_is_instance_id(SYM2ID(sym)) ? Qtrue : Qfalse;
 }
-#endif
 
-#ifdef HAVE_RB_SYM2STR
 VALUE symbol_spec_rb_sym2str(VALUE self, VALUE sym) {
   return rb_sym2str(sym);
 }
-#endif
 
-void Init_symbol_spec(void) {
-  VALUE cls;
-  cls = rb_define_class("CApiSymbolSpecs", rb_cObject);
+VALUE symbol_spec_rb_to_symbol(VALUE self, VALUE val) {
+  return rb_to_symbol(val);
+}
 
-#ifdef HAVE_RB_INTERN
+void Init_symbol_spec(void) {
+  VALUE cls = rb_define_class("CApiSymbolSpecs", rb_cObject);
+  rb_define_method(cls, "SYMBOL_P", symbol_spec_SYMBOL_P, 1);
   rb_define_method(cls, "rb_intern", symbol_spec_rb_intern, 1);
   rb_define_method(cls, "rb_intern2", symbol_spec_rb_intern2, 2);
   rb_define_method(cls, "rb_intern_const", symbol_spec_rb_intern_const, 1);
   rb_define_method(cls, "rb_intern_c_compare", symbol_spec_rb_intern_c_compare, 2);
   rb_define_method(cls, "rb_intern2_c_compare", symbol_spec_rb_intern2_c_compare, 3);
-#endif
-
-#ifdef HAVE_RB_INTERN3
   rb_define_method(cls, "rb_intern3", symbol_spec_rb_intern3, 3);
   rb_define_method(cls, "rb_intern3_c_compare", symbol_spec_rb_intern3_c_compare, 4);
-#endif
-
-#ifdef HAVE_RB_ID2NAME
   rb_define_method(cls, "rb_id2name", symbol_spec_rb_id2name, 1);
-#endif
-
-#ifdef HAVE_RB_ID2STR
+  rb_define_method(cls, "rb_id2name_id_zero", symbol_spec_rb_id2name_id_zero, 0);
   rb_define_method(cls, "rb_id2str", symbol_spec_rb_id2str, 1);
-#endif
-
-#ifdef HAVE_RB_INTERN_STR
+  rb_define_method(cls, "rb_id2str_id_zero", symbol_spec_rb_id2str_id_zero, 0);
   rb_define_method(cls, "rb_intern_str", symbol_spec_rb_intern_str, 1);
-#endif
-
-#ifdef HAVE_RB_IS_CLASS_ID
+  rb_define_method(cls, "rb_check_symbol_cstr", symbol_spec_rb_check_symbol_cstr, 1);
   rb_define_method(cls, "rb_is_class_id", symbol_spec_rb_is_class_id, 1);
-#endif
-
-#ifdef HAVE_RB_IS_CONST_ID
   rb_define_method(cls, "rb_is_const_id", symbol_spec_rb_is_const_id, 1);
-#endif
-
-#ifdef HAVE_RB_IS_INSTANCE_ID
   rb_define_method(cls, "rb_is_instance_id", symbol_spec_rb_is_instance_id, 1);
-#endif
-
-#ifdef HAVE_RB_SYM2STR
   rb_define_method(cls, "rb_sym2str", symbol_spec_rb_sym2str, 1);
-#endif
+  rb_define_method(cls, "rb_to_symbol", symbol_spec_rb_to_symbol, 1);
 }
 
 #ifdef __cplusplus