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: fix wchar match at EOS

Browse source 
* re.c (rb_memsearch_wchar, rb_memsearch_qchar): test matching
  till the end of string.  [ruby-core:70592] [Bug #11488]
* test/ruby/test_m17n.rb (test_include?, tet_index): add tests by
  Tom Stuart.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-08-26 01:52:04 +00:00
parent e2803efc3d
commit 5ce4bfc9d2
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Wed Aug 26 10:52:02 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* re.c (rb_memsearch_wchar, rb_memsearch_qchar): test matching
till the end of string. [ruby-core:70592] [Bug #11488]
* test/ruby/test_m17n.rb (test_include?, tet_index): add tests by
Tom Stuart.
Wed Aug 26 09:26:00 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Aug 26 09:26:00 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* id_table.c (list_table_extend, hash_table_extend): remove C99 * id_table.c (list_table_extend, hash_table_extend): remove C99

4
re.c
View file

@ -227,7 +227,7 @@ rb_memsearch_wchar(const unsigned char *xs, long m, const unsigned char *ys, lon
const unsigned char *x = xs, x0 = *xs, *y = ys; const unsigned char *x = xs, x0 = *xs, *y = ys;
enum {char_size = 2}; enum {char_size = 2};
for (n -= m; n > 0; n -= char_size, y += char_size) { for (n -= m; n >= 0; n -= char_size, y += char_size) {
if (x0 == *y && memcmp(x+1, y+1, m-1) == 0) if (x0 == *y && memcmp(x+1, y+1, m-1) == 0)
return y - ys; return y - ys;
} }
@ -240,7 +240,7 @@ rb_memsearch_qchar(const unsigned char *xs, long m, const unsigned char *ys, lon
const unsigned char *x = xs, x0 = *xs, *y = ys; const unsigned char *x = xs, x0 = *xs, *y = ys;
enum {char_size = 4}; enum {char_size = 4};
for (n -= m; n > 0; n -= char_size, y += char_size) { for (n -= m; n >= 0; n -= char_size, y += char_size) {
if (x0 == *y && memcmp(x+1, y+1, m-1) == 0) if (x0 == *y && memcmp(x+1, y+1, m-1) == 0)
return y - ys; return y - ys;
} }

8
test/ruby/test_m17n.rb
View file

@ -1066,6 +1066,10 @@ class TestM17N < Test::Unit::TestCase
assert_equal(false, e("\xa1\xa2\xa3\xa4").include?(e("\xa3"))) assert_equal(false, e("\xa1\xa2\xa3\xa4").include?(e("\xa3")))
s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4") s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4")
assert_equal(false, s.include?(e("\xb0\xa3"))) assert_equal(false, s.include?(e("\xb0\xa3")))
bug11488 = '[ruby-core:70592] [Bug #11488]'
each_encoding("abcdef", "def") do |str, substr|
assert_equal(true, str.include?(substr), bug11488)
end
end end
def test_index def test_index
@ -1075,6 +1079,10 @@ class TestM17N < Test::Unit::TestCase
assert_nil(e("\xa1\xa2\xa3\xa4").rindex(e("\xa3"))) assert_nil(e("\xa1\xa2\xa3\xa4").rindex(e("\xa3")))
s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4") s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4")
assert_raise(Encoding::CompatibilityError){s.rindex(a("\xb1\xa3"))} assert_raise(Encoding::CompatibilityError){s.rindex(a("\xb1\xa3"))}
bug11488 = '[ruby-core:70592] [Bug #11488]'
each_encoding("abcdef", "def") do |str, substr|
assert_equal(3, str.index(substr), bug11488)
end
end end
def test_next def test_next