diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | string.c | 16 | ||||
| -rw-r--r-- | test/ruby/test_symbol.rb | 24 |
3 files changed, 43 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Feb 18 21:05:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (sym_match_m): delegate to String#match but not + String#=~. [ruby-core:72864] [Bug #11991] + Thu Feb 18 14:15:38 2016 Shota Fukumori <her@sorah.jp> * re.c: Add MatchData#named_captures @@ -9423,7 +9423,6 @@ sym_casecmp(VALUE sym, VALUE other) /* * call-seq: * sym =~ obj -> fixnum or nil - * sym.match(obj) -> fixnum or nil * * Returns <code>sym.to_s =~ obj</code>. */ @@ -9436,6 +9435,19 @@ sym_match(VALUE sym, VALUE other) /* * call-seq: + * sym.match(obj) -> MatchData or nil + * + * Returns <code>sym.to_s.match(obj)</code>. + */ + +static VALUE +sym_match_m(int argc, VALUE *argv, VALUE sym) +{ + return rb_str_match_m(argc, argv, rb_sym2str(sym)); +} + +/* + * call-seq: * sym[idx] -> char * sym[b, n] -> string * sym.slice(idx) -> char @@ -9763,7 +9775,7 @@ Init_String(void) rb_define_method(rb_cSymbol, "length", sym_length, 0); rb_define_method(rb_cSymbol, "size", sym_length, 0); rb_define_method(rb_cSymbol, "empty?", sym_empty, 0); - rb_define_method(rb_cSymbol, "match", sym_match, 1); + rb_define_method(rb_cSymbol, "match", sym_match_m, -1); rb_define_method(rb_cSymbol, "upcase", sym_upcase, -1); rb_define_method(rb_cSymbol, "downcase", sym_downcase, -1); diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb index 5d42a5f92d..7ed478864c 100644 --- a/test/ruby/test_symbol.rb +++ b/test/ruby/test_symbol.rb @@ -246,6 +246,30 @@ class TestSymbol < Test::Unit::TestCase assert_equal(:fOo, :FoO.swapcase) end + def test_MATCH # '=~' + assert_equal(10, :"FeeFieFoo-Fum" =~ /Fum$/) + assert_equal(nil, "FeeFieFoo-Fum" =~ /FUM$/) + + o = Object.new + def o.=~(x); x + "bar"; end + assert_equal("foobar", :"foo" =~ o) + + assert_raise(TypeError) { :"foo" =~ "foo" } + end + + def test_match_method + assert_equal("bar", :"foobarbaz".match(/bar/).to_s) + + o = Regexp.new('foo') + def o.match(x, y, z); x + y + z; end + assert_equal("foobarbaz", :"foo".match(o, "bar", "baz")) + x = nil + :"foo".match(o, "bar", "baz") {|y| x = y } + assert_equal("foobarbaz", x) + + assert_raise(ArgumentError) { :"foo".match } + end + def test_symbol_poped assert_nothing_raised { eval('a = 1; :"#{ a }"; 1') } end |