nobu	2012-03-16 20:06:27 +0900 (Fri, 16 Mar 2012)

  New Revision: 35069

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

  Log:
    * string.c (trnext): should advance char-wise.
      [ruby-core:43335][Bug #6156]

  Modified files:
    trunk/ChangeLog
    trunk/string.c
    trunk/test/ruby/test_string.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35068)
+++ ChangeLog	(revision 35069)
@@ -1,3 +1,8 @@
+Fri Mar 16 20:06:24 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (trnext): should advance char-wise.
+	  [ruby-core:43335][Bug #6156]
+
 Fri Mar 16 17:42:05 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (block_append_gen): fix unreachable warning line number.
Index: string.c
===================================================================
--- string.c	(revision 35068)
+++ string.c	(revision 35069)
@@ -4956,13 +4956,13 @@
     for (;;) {
 	if (!t->gen) {
 	    if (t->p == t->pend) return -1;
-	    if (t->p < t->pend - 1 && *t->p == '\\') {
-		t->p++;
+	    if (rb_enc_ascget(t->p, t->pend, &n, enc) == '\\') {
+		t->p += n;
 	    }
 	    t->now = rb_enc_codepoint_len(t->p, t->pend, &n, enc);
 	    t->p += n;
-	    if (t->p < t->pend - 1 && *t->p == '-') {
-		t->p++;
+	    if (rb_enc_ascget(t->p, t->pend, &n, enc) == '-') {
+		t->p += n;
 		if (t->p < t->pend) {
 		    unsigned int c = rb_enc_codepoint_len(t->p, t->pend, &n, enc);
 		    t->p += n;
Index: test/ruby/test_string.rb
===================================================================
--- test/ruby/test_string.rb	(revision 35068)
+++ test/ruby/test_string.rb	(revision 35069)
@@ -1500,6 +1500,10 @@
     assert_equal(true, "\u0101".tr("\u0101", "a").ascii_only?)
     assert_equal(true, "\u3041".tr("\u3041", "a").ascii_only?)
     assert_equal(false, "\u3041\u3042".tr("\u3041", "a").ascii_only?)
+
+    bug6156 = '[ruby-core:43335]'
+    str, range, star = %w[b a-z *].map{|s|s.encode("utf-16le")}
+    assert_equal(star, str.tr(range, star), bug6156)
   end
 
   def test_tr!

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