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

merge revision(s) 49675:

Browse source 
* re.c (match_aref): RMatch::regexp is Qnil after matching by a
	  string since r45451.  [ruby-core:68209] [Bug #10877]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-02-22 12:20:57 +00:00
parent 23cf2750d1
commit 1750670084
4 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Feb 22 21:20:37 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* re.c (match_aref): RMatch::regexp is Qnil after matching by a
string since r45451. [ruby-core:68209] [Bug #10877]
Sun Feb 22 17:11:25 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in (probes.stamp): rebuild dtrace dependent objects

5
re.c
View file

@ -1787,7 +1787,7 @@ name_to_backref_error(VALUE name)
static VALUE
match_aref(int argc, VALUE *argv, VALUE match)
{
VALUE idx, rest;
VALUE idx, rest, re;
match_check(match);
rb_scan_args(argc, argv, "11", &idx, &rest);
@ -1808,7 +1808,8 @@ match_aref(int argc, VALUE *argv, VALUE match)
/* fall through */
case T_STRING:
p = StringValuePtr(idx);
if (!rb_enc_compatible(RREGEXP(RMATCH(match)->regexp)->src, idx) ||
re = RMATCH(match)->regexp;
if (NIL_P(re) || !rb_enc_compatible(RREGEXP(re)->src, idx) ||
(num = name_to_backref_number(RMATCH_REGS(match), RMATCH(match)->regexp,
p, p + RSTRING_LEN(idx))) < 1) {
name_to_backref_error(idx);

13
test/ruby/test_regexp.rb
View file

@ -545,6 +545,19 @@ class TestRegexp < Test::Unit::TestCase
assert_equal("foo", $&)
end
def test_match_without_regexp
bug10877 = '[ruby-core:68209] [Bug #10877]'
"abc".sub("a", "")
assert_raise_with_message(IndexError, /foo/, bug10877) {$~["foo"]}
key = "\u{3042}"
[Encoding::UTF_8, Encoding::Shift_JIS, Encoding::EUC_JP].each do |enc|
idx = key.encode(enc)
EnvUtil.with_default_external(enc) do
assert_raise_with_message(IndexError, /#{idx}/, bug10877) {$~[idx]}
end
end
end
def test_last_match
/(...)(...)(...)(...)?/.match("foobarbaz")
assert_equal("foobarbaz", Regexp.last_match(0))

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2015-02-22"
#define RUBY_PATCHLEVEL 76
#define RUBY_PATCHLEVEL 77
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2