kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

insns.def (opt_regexpmatch2): respect redefined match op

Browse source 
* insns.def (opt_regexpmatch2): respect redefined match op
  Thanks to Sam Rawlins for the fix.
* test/ruby/test_string.rb: test based on Tsuyoshi Sawada's report
  [Bug #9581]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2014-03-11 22:28:33 +00:00
parent c1f1b93171
commit 4101a5690e
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Mar 12 07:26:05 2014 Eric Wong <e@80x24.org>
* insns.def (opt_regexpmatch2): respect redefined match op
Thanks to Sam Rawlins for the fix.
* test/ruby/test_string.rb: test based on Tsuyoshi Sawada's report
[Bug #9581]
Tue Mar 11 22:31:25 2014 Kazuki Tsujimoto <kazuki@callcc.net>
* ext/.document: add objspace/objspace_dump.c to document file.

2
insns.def
View file

@ -2154,7 +2154,7 @@ opt_regexpmatch2
(VALUE obj2, VALUE obj1)
(VALUE val)
{
if (RB_TYPE_P(obj2, T_STRING) &&
if (CLASS_OF(obj2) == rb_cString &&
BASIC_OP_UNREDEFINED_P(BOP_MATCH, STRING_REDEFINED_OP_FLAG)) {
val = rb_reg_match(obj1, obj2);
}

13
test/ruby/test_string.rb
View file

@ -2219,6 +2219,19 @@ class TestString < Test::Unit::TestCase
assert_equal("foo", "" =~ //)
RUBY
end
class Bug9581 < String
def =~ re; :foo end
end
def test_regexp_match_subclass
s = Bug9581.new("abc")
r = /abc/
assert_equal(:foo, s =~ r)
assert_equal(:foo, s.send(:=~, r))
assert_equal(:foo, s.send(:=~, /abc/))
assert_equal(:foo, s =~ /abc/, "should not use optimized instruction")
end
end
class TestString2 < TestString