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

* string.c (str_sublen): adjust position if position is not at the

Browse Source 
head of a character.

* string.c (rb_str_chomp_bang): check if match start at the head
  of a character.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-12-19 14:15:05 +00:00
parent 474a88f041
commit 1c7f24d5b1
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Wed Dec 19 22:59:52 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (str_sublen): adjust position if position is not at the
head of a character.
* string.c (rb_str_chomp_bang): check if match start at the head
of a character.
Wed Dec 19 21:42:18 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Dec 19 21:42:18 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* re.c (rb_reg_regsub): should set checked encoding. * re.c (rb_reg_regsub): should set checked encoding.

23
string.c
View File

@ -776,10 +776,11 @@ str_sublen(VALUE str, long pos, rb_encoding *enc)
i = 0; i = 0;
while (p < e) { while (p < e) {
p += rb_enc_mbclen(p, e, enc); p += rb_enc_mbclen(p, RSTRING_END(str), enc);
i++; i++;
} }
return i; if (p == e) return i;
return i - 1;
} }
} }
@ -4462,9 +4463,10 @@ rb_str_chop(VALUE str)
static VALUE static VALUE
rb_str_chomp_bang(int argc, VALUE *argv, VALUE str) rb_str_chomp_bang(int argc, VALUE *argv, VALUE str)
{ {
rb_encoding *enc;
VALUE rs; VALUE rs;
int newline; int newline;
char *p; char *p, *pp, *e;
long len, rslen; long len, rslen;
if (rb_scan_args(argc, argv, "01", &rs) == 0) { if (rb_scan_args(argc, argv, "01", &rs) == 0) {
@ -4494,7 +4496,7 @@ rb_str_chomp_bang(int argc, VALUE *argv, VALUE str)
} }
if (NIL_P(rs)) return Qnil; if (NIL_P(rs)) return Qnil;
StringValue(rs); StringValue(rs);
rb_enc_check(str, rs); enc = rb_enc_check(str, rs);
len = RSTRING_LEN(str); len = RSTRING_LEN(str);
if (len == 0) return Qnil; if (len == 0) return Qnil;
p = RSTRING_PTR(str); p = RSTRING_PTR(str);
@ -4518,9 +4520,20 @@ rb_str_chomp_bang(int argc, VALUE *argv, VALUE str)
if (rslen == 1 && newline == '\n') if (rslen == 1 && newline == '\n')
goto smart_chomp; goto smart_chomp;
if (is_broken_string(rs)) {
return Qnil;
}
pp = p + len - rslen;
if (p[len-1] == newline && if (p[len-1] == newline &&
(rslen <= 1 || (rslen <= 1 ||
memcmp(RSTRING_PTR(rs), p+len-rslen, rslen) == 0)) { memcmp(RSTRING_PTR(rs), pp, rslen) == 0)) {
if (!isascii(*pp)) {
e = p+len;
while (p < pp) {
p += rb_enc_mbclen(p, e, enc);
}
if (p != pp) return Qnil;
}
rb_str_modify(str); rb_str_modify(str);
STR_SET_LEN(str, RSTRING_LEN(str) - rslen); STR_SET_LEN(str, RSTRING_LEN(str) - rslen);
RSTRING_PTR(str)[RSTRING_LEN(str)] = '\0'; RSTRING_PTR(str)[RSTRING_LEN(str)] = '\0';