diff options
| -rw-r--r-- | internal.h | 1 | ||||
| -rw-r--r-- | string.c | 31 |
2 files changed, 24 insertions, 8 deletions
diff --git a/internal.h b/internal.h index c91670a388..4a5134d20a 100644 --- a/internal.h +++ b/internal.h @@ -810,6 +810,7 @@ void rb_gc_free_dsymbol(VALUE); VALUE rb_str_dynamic_intern(VALUE); ID rb_id_attrget(ID id); +VALUE rb_to_symbol(VALUE name); VALUE rb_check_symbol(volatile VALUE *namep); #ifdef RUBY_ENCODING_H VALUE rb_check_symbol_cstr(const char *ptr, long len, rb_encoding *enc); @@ -8713,25 +8713,40 @@ sym_encoding(VALUE sym) return rb_obj_encoding(rb_sym2str(sym)); } -ID -rb_to_id(VALUE name) +static VALUE +string_for_symbol(VALUE name) { - VALUE tmp; - - if (SYMBOL_P(name)) { - return SYM2ID(name); - } if (!RB_TYPE_P(name, T_STRING)) { - tmp = rb_check_string_type(name); + VALUE tmp = rb_check_string_type(name); if (NIL_P(tmp)) { rb_raise(rb_eTypeError, "%+"PRIsVALUE" is not a symbol", name); } name = tmp; } + return name; +} + +ID +rb_to_id(VALUE name) +{ + if (SYMBOL_P(name)) { + return SYM2ID(name); + } + name = string_for_symbol(name); return rb_intern_str(name); } +VALUE +rb_to_symbol(VALUE name) +{ + if (SYMBOL_P(name)) { + return name; + } + name = string_for_symbol(name); + return rb_str_dynamic_intern(name); +} + /* * A <code>String</code> object holds and manipulates an arbitrary sequence of * bytes, typically representing characters. String objects may be created |