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

re.c: names encoding

Browse source 
* re.c (reg_names_iter): should consider encoding of regexp.
  [ruby-core:72185] [Bug #11825]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-12-17 00:46:07 +00:00
parent 70dea9ef28
commit e64d814101
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Dec 17 09:46:08 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* re.c (reg_names_iter): should consider encoding of regexp.
[ruby-core:72185] [Bug #11825]
Thu Dec 17 03:52:10 2015 Koichi Sasada <ko1@atdot.net>
* vm.c (vm_make_env_each): should not compare with Qfalse and FALSE.

2
re.c
View file

@ -757,7 +757,7 @@ reg_names_iter(const OnigUChar *name, const OnigUChar *name_end,
int back_num, int *back_refs, OnigRegex regex, void *arg)
{
VALUE ary = (VALUE)arg;
rb_ary_push(ary, rb_str_new((const char *)name, name_end-name));
rb_ary_push(ary, rb_enc_str_new((const char *)name, name_end-name, regex->enc));
return 0;
}

6
test/ruby/test_regexp.rb
View file

@ -119,13 +119,19 @@ class TestRegexp < Test::Unit::TestCase
assert_equal(nil, Regexp.last_match(1))
assert_equal(nil, Regexp.last_match(:foo))
bug11825_name = "\u{5b9d 77f3}"
bug11825_str = "\u{30eb 30d3 30fc}"
bug11825_re = /(?<#{bug11825_name}>)#{bug11825_str}/
assert_equal(["foo", "bar"], /(?<foo>.)(?<bar>.)/.names)
assert_equal(["foo"], /(?<foo>.)(?<foo>.)/.names)
assert_equal([], /(.)(.)/.names)
assert_equal([bug11825_name], bug11825_re.names)
assert_equal(["foo", "bar"], /(?<foo>.)(?<bar>.)/.match("ab").names)
assert_equal(["foo"], /(?<foo>.)(?<foo>.)/.match("ab").names)
assert_equal([], /(.)(.)/.match("ab").names)
assert_equal([bug11825_name], bug11825_re.match(bug11825_str).names)
assert_equal({"foo"=>[1], "bar"=>[2]},
/(?<foo>.)(?<bar>.)/.named_captures)