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

* re.c (rb_reg_initialize_m): fix wrong index for the lang

Browse Source 
option's value 'N'. reported by Masaya TARUI via IRC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-05-12 01:06:24 +00:00
parent 01cd3467fb
commit 0e586b35b8
3 changed files with 10 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 @@
Wed May 12 09:21:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
* re.c (rb_reg_initialize_m): fix wrong index for the lang
option's value 'N'. reported by Masaya TARUI via IRC.
Tue May 11 23:07:22 2010 Tanaka Akira <akr@fsij.org> Tue May 11 23:07:22 2010 Tanaka Akira <akr@fsij.org>
* ext/socket/extconf.rb: test IPPROTO_IP and IPPROTO_IPV6 constants. * ext/socket/extconf.rb: test IPPROTO_IP and IPPROTO_IPV6 constants.

2
re.c
View File

@ -2894,7 +2894,7 @@ rb_reg_initialize_m(int argc, VALUE *argv, VALUE self)
enc = 0; enc = 0;
if (argc == 3 && !NIL_P(argv[2])) { if (argc == 3 && !NIL_P(argv[2])) {
char *kcode = StringValuePtr(argv[2]); char *kcode = StringValuePtr(argv[2]);
if (kcode[0] == 'n' || kcode[1] == 'N') { if (kcode[0] == 'n' || kcode[0] == 'N') {
enc = rb_ascii8bit_encoding(); enc = rb_ascii8bit_encoding();
flags |= ARG_ENCODING_NONE; flags |= ARG_ENCODING_NONE;
} }

4
test/ruby/test_regexp.rb
View File

@ -286,6 +286,10 @@ class TestRegexp < Test::Unit::TestCase
assert_equal("bar", "foobarbaz"[Regexp.new("b..", nil, "n")]) assert_equal("bar", "foobarbaz"[Regexp.new("b..", nil, "n")])
assert_equal(//n, Regexp.new("", nil, "n")) assert_equal(//n, Regexp.new("", nil, "n"))
arg_encoding_none = 32 # ARG_ENCODING_NONE is implementation defined value
assert_equal(arg_encoding_none, Regexp.new("", nil, "n").options)
assert_equal(arg_encoding_none, Regexp.new("", nil, "N").options)
assert_raise(RegexpError) { Regexp.new(")(") } assert_raise(RegexpError) { Regexp.new(")(") }
end end