1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c (sym_find): Add Symbol.find(str), which returns whether given

Browse Source 
string is defined as symbol or not. [Feature #7854]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-02-25 16:34:00 +00:00
parent 4f180097d3
commit 0b5685a69b
4 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Feb 26 01:29:27 2014 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (sym_find): Add Symbol.find(str), which returns whether given
string is defined as symbol or not. [Feature #7854]
Tue Feb 25 22:52:02 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> Tue Feb 25 22:52:02 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* ext/dl/dl.c (rb_dl_realloc): use NUM2SIZET instead of NUM2INT. * ext/dl/dl.c (rb_dl_realloc): use NUM2SIZET instead of NUM2INT.

3
NEWS
View File

@ -21,6 +21,9 @@ with all sufficient information, see the ChangeLog file.
* min_by * min_by
* max * max
* max_by * max_by
* Symbol
* New methods
* Symbol.find(str) returns whether given string is defined as symbol or not.
=== Core classes compatibility issues (excluding feature bug fixes) === Core classes compatibility issues (excluding feature bug fixes)

22
string.c
View File

@ -8229,6 +8229,27 @@ str_scrub_bang(int argc, VALUE *argv, VALUE str)
*/ */
/*
* call-seq:
* Symbol.find(str) -> symbol or nil
*
* Return the related symbol if the symbol already exists.
* Return nil if not.
*/
static VALUE
sym_find(VALUE dummy, VALUE sym)
{
ID id = rb_check_id(&sym);
if (id) {
return ID2SYM(id);
}
else {
return Qnil;
}
}
/* /*
* call-seq: * call-seq:
* sym == obj -> true or false * sym == obj -> true or false
@ -8787,6 +8808,7 @@ Init_String(void)
rb_undef_alloc_func(rb_cSymbol); rb_undef_alloc_func(rb_cSymbol);
rb_undef_method(CLASS_OF(rb_cSymbol), "new"); rb_undef_method(CLASS_OF(rb_cSymbol), "new");
rb_define_singleton_method(rb_cSymbol, "all_symbols", rb_sym_all_symbols, 0); /* in parse.y */ rb_define_singleton_method(rb_cSymbol, "all_symbols", rb_sym_all_symbols, 0); /* in parse.y */
rb_define_singleton_method(rb_cSymbol, "find", sym_find, 1);
rb_define_method(rb_cSymbol, "==", sym_equal, 1); rb_define_method(rb_cSymbol, "==", sym_equal, 1);
rb_define_method(rb_cSymbol, "===", sym_equal, 1); rb_define_method(rb_cSymbol, "===", sym_equal, 1);

15
test/ruby/test_symbol.rb
View File

@ -1,4 +1,5 @@
require 'test/unit' require 'test/unit'
require_relative 'envutil'
class TestSymbol < Test::Unit::TestCase class TestSymbol < Test::Unit::TestCase
# [ruby-core:3573] # [ruby-core:3573]
@ -206,4 +207,18 @@ class TestSymbol < Test::Unit::TestCase
assert_equal(true, "foo#{Time.now.to_i}".to_sym.frozen?) assert_equal(true, "foo#{Time.now.to_i}".to_sym.frozen?)
assert_equal(true, :foo.to_sym.frozen?) assert_equal(true, :foo.to_sym.frozen?)
end end
def test_sym_find
assert_separately(%w[--disable=gems], <<-"end;")
assert_equal :intern, Symbol.find("intern")
assert_raise(TypeError){ Symbol.find(true) }
str = "__noexistent__"
assert_equal nil, Symbol.find(str)
assert_equal nil, Symbol.find(str)
sym = str.intern
assert_equal str, sym.to_s
assert_equal sym, Symbol.find(str)
end;
end
end end