nagachika	2015-09-30 03:42:34 +0900 (Wed, 30 Sep 2015)

  New Revision: 51986

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51986

  Log:
    merge revision(s) 51685,51821: [Backport #11488]
    
    * 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.
    
    * test/ruby/test_m17n.rb (test_include?, test_index): add tests by

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/re.c
    branches/ruby_2_2/test/ruby/test_m17n.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/re.c
===================================================================
--- ruby_2_2/re.c	(revision 51985)
+++ ruby_2_2/re.c	(revision 51986)
@@ -227,7 +227,7 @@ rb_memsearch_wchar(const unsigned char * https://github.com/ruby/ruby/blob/trunk/ruby_2_2/re.c#L227
     const unsigned char *x = xs, x0 = *xs, *y = ys;
     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)
 	    return y - ys;
     }
@@ -240,7 +240,7 @@ rb_memsearch_qchar(const unsigned char * https://github.com/ruby/ruby/blob/trunk/ruby_2_2/re.c#L240
     const unsigned char *x = xs, x0 = *xs, *y = ys;
     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)
 	    return y - ys;
     }
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 51985)
+++ ruby_2_2/ChangeLog	(revision 51986)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Sep 30 03:34:25 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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?, test_index): add tests by
+	  Tom Stuart.
+
 Wed Sep 30 03:24:29 2015  NARUSE, Yui  <naruse@r...>
 
 	* thread_pthread.c (reserve_stack): ensure the memory is really
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 51985)
+++ ruby_2_2/version.h	(revision 51986)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
 #define RUBY_RELEASE_DATE "2015-09-30"
-#define RUBY_PATCHLEVEL 176
+#define RUBY_PATCHLEVEL 177
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 9
Index: ruby_2_2/test/ruby/test_m17n.rb
===================================================================
--- ruby_2_2/test/ruby/test_m17n.rb	(revision 51985)
+++ ruby_2_2/test/ruby/test_m17n.rb	(revision 51986)
@@ -1066,6 +1066,10 @@ class TestM17N < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_m17n.rb#L1066
     assert_equal(false, e("\xa1\xa2\xa3\xa4").include?(e("\xa3")))
     s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4")
     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
 
   def test_index
@@ -1075,6 +1079,10 @@ class TestM17N < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_m17n.rb#L1079
     assert_nil(e("\xa1\xa2\xa3\xa4").rindex(e("\xa3")))
     s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4")
     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
 
   def test_next

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r51685,51821


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/