ruby-changes:6459
From: nobu <ko1@a...>
Date: Wed, 9 Jul 2008 22:11:49 +0900 (JST)
Subject: [ruby-changes:6459] Ruby:r17975 (ruby_1_8): * string.c (rb_str_succ): reverted previous changes.
nobu 2008-07-09 22:11:39 +0900 (Wed, 09 Jul 2008) New Revision: 17975 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=17975 Log: * string.c (rb_str_succ): reverted previous changes. [ruby-dev:35389] Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/string.c Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 17974) +++ ruby_1_8/ChangeLog (revision 17975) @@ -1,3 +1,7 @@ +Wed Jul 9 22:11:37 2008 Nobuyoshi Nakada <nobu@r...> + + * string.c (rb_str_succ): reverted previous changes. [ruby-dev:35389] + Wed Jul 9 20:58:16 2008 Tanaka Akira <akr@f...> * array.c (rb_ary_fill): don't raise even if length is negative. Index: ruby_1_8/string.c =================================================================== --- ruby_1_8/string.c (revision 17974) +++ ruby_1_8/string.c (revision 17975) @@ -1401,7 +1401,7 @@ VALUE orig; { VALUE str; - char *sbeg, *s, *last_alnum = 0; + char *sbeg, *s; int c = -1; long n = 0; @@ -1413,15 +1413,6 @@ while (sbeg <= s) { if (ISALNUM(*s)) { - if (last_alnum && last_alnum > s + 1) { - if (ISALPHA(*last_alnum) ? ISDIGIT(*s) : - ISDIGIT(*last_alnum) ? ISALPHA(*s) : 0) { - s = last_alnum; - n = s - sbeg; - break; - } - } - last_alnum = s; if ((c = succ_char(s)) == 0) break; n = s - sbeg; } @@ -1434,9 +1425,8 @@ if ((*s += 1) != 0) break; s--; } - c = 0; } - if (s < sbeg || c > 0) { + if (s < sbeg) { RESIZE_CAPA(str, RSTRING(str)->len + 1); s = RSTRING(str)->ptr + n; memmove(s+1, s, RSTRING(str)->len - n); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/