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

* string.c (rb_str_chomp_bang): now works on UTF-16.

Browse source 
* string.c (tr_setup_table): negation should work on non ASCII
  compatible strings as well.

* string.c (rb_str_split_m): awk split should work on non ASCII
  compatible strings as well.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-02-29 13:33:26 +00:00
parent daa622aed0
commit 2d97d3ddac
4 changed files with 86 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Fri Feb 29 20:25:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_chomp_bang): now works on UTF-16.
* string.c (tr_setup_table): negation should work on non ASCII
compatible strings as well.
* string.c (rb_str_split_m): awk split should work on non ASCII
compatible strings as well.
Fri Feb 29 18:08:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Fri Feb 29 18:08:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* time.c (time_strftime): format should be ascii compatible. * time.c (time_strftime): format should be ascii compatible.

87
string.c
View file

@ -4453,9 +4453,20 @@ tr_setup_table(VALUE str, char stable[256], int first,
tr.p = RSTRING_PTR(str); tr.pend = tr.p + RSTRING_LEN(str); tr.p = RSTRING_PTR(str); tr.pend = tr.p + RSTRING_LEN(str);
tr.gen = tr.now = tr.max = 0; tr.gen = tr.now = tr.max = 0;
if (RSTRING_LEN(str) > 1 && RSTRING_PTR(str)[0] == '^') { if (RSTRING_LEN(str) > 1) {
cflag = 1; if (rb_enc_asciicompat(enc)) {
tr.p++; if (RSTRING_PTR(str)[0] == '^') {
cflag = 1;
tr.p++;
}
}
else {
c = rb_enc_codepoint(RSTRING_PTR(str), RSTRING_END(str), enc);
if (c == '^') {
cflag = 1;
tr.p+=rb_enc_codelen(c, enc);
}
}
} }
if (first) { if (first) {
for (i=0; i<256; i++) { for (i=0; i<256; i++) {
@ -4838,11 +4849,21 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str)
} }
else { else {
fs_set: fs_set:
if (TYPE(spat) == T_STRING && RSTRING_LEN(spat) == 1) { if (TYPE(spat) == T_STRING) {
if (RSTRING_PTR(spat)[0] == ' ') { rb_encoding *enc2 = STR_ENC_GET(spat);
awk_split = Qtrue;
if (rb_enc_mbminlen(enc2) == 1) {
if (RSTRING_LEN(spat) == 1 && RSTRING_PTR(spat)[0] == ' '){
awk_split = Qtrue;
}
} }
else { else {
if (str_strlen(spat, enc2) == 1 &&
rb_enc_codepoint(RSTRING_PTR(spat), RSTRING_END(spat), enc2) == ' ') {
awk_split = Qtrue;
}
}
if (!awk_split) {
spat = rb_reg_regcomp(rb_reg_quote(spat)); spat = rb_reg_regcomp(rb_reg_quote(spat));
} }
} }
@ -5266,27 +5287,49 @@ rb_str_chomp_bang(int argc, VALUE *argv, VALUE str)
char *p, *pp, *e; char *p, *pp, *e;
long len, rslen; long len, rslen;
len = RSTRING_LEN(str);
if (len == 0) return Qnil;
p = RSTRING_PTR(str);
e = p + len;
if (rb_scan_args(argc, argv, "01", &rs) == 0) { if (rb_scan_args(argc, argv, "01", &rs) == 0) {
len = RSTRING_LEN(str);
if (len == 0) return Qnil;
p = RSTRING_PTR(str);
rs = rb_rs; rs = rb_rs;
if (rs == rb_default_rs) { if (rs == rb_default_rs) {
smart_chomp: smart_chomp:
rb_enc_check(str, rs);
rb_str_modify(str); rb_str_modify(str);
if (RSTRING_PTR(str)[len-1] == '\n') { enc = rb_enc_get(str);
STR_DEC_LEN(str); if (rb_enc_mbminlen(enc) > 1) {
if (RSTRING_LEN(str) > 0 && len = str_strlen(str, enc);
RSTRING_PTR(str)[RSTRING_LEN(str)-1] == '\r') { pp = rb_enc_nth(p, e, len-1, enc);
STR_DEC_LEN(str); if (rb_enc_is_newline(pp, e, enc)) {
e = pp;
len--;
} }
} if (len > 0) {
else if (RSTRING_PTR(str)[len-1] == '\r') { p = rb_enc_nth(p, e, len-1, enc);
STR_DEC_LEN(str); if (rb_enc_codepoint(p, e, enc) == '\r') {
pp = e = p;
}
}
if (e == RSTRING_END(str)) {
return Qnil;
}
len = pp - RSTRING_PTR(str);
STR_SET_LEN(str, len);
} }
else { else {
return Qnil; if (RSTRING_PTR(str)[len-1] == '\n') {
STR_DEC_LEN(str);
if (RSTRING_LEN(str) > 0 &&
RSTRING_PTR(str)[RSTRING_LEN(str)-1] == '\r') {
STR_DEC_LEN(str);
}
}
else if (RSTRING_PTR(str)[len-1] == '\r') {
STR_DEC_LEN(str);
}
else {
return Qnil;
}
} }
RSTRING_PTR(str)[RSTRING_LEN(str)] = '\0'; RSTRING_PTR(str)[RSTRING_LEN(str)] = '\0';
return str; return str;
@ -5294,10 +5337,6 @@ 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);
enc = rb_enc_check(str, rs);
len = RSTRING_LEN(str);
if (len == 0) return Qnil;
p = RSTRING_PTR(str);
rslen = RSTRING_LEN(rs); rslen = RSTRING_LEN(rs);
if (rslen == 0) { if (rslen == 0) {
while (len>0 && p[len-1] == '\n') { while (len>0 && p[len-1] == '\n') {
@ -5321,8 +5360,8 @@ rb_str_chomp_bang(int argc, VALUE *argv, VALUE str)
if (is_broken_string(rs)) { if (is_broken_string(rs)) {
return Qnil; return Qnil;
} }
e = p + len;
pp = e - rslen; pp = e - rslen;
enc = rb_enc_check(str, rs);
if (p[len-1] == newline && if (p[len-1] == newline &&
(rslen <= 1 || (rslen <= 1 ||
memcmp(RSTRING_PTR(rs), pp, rslen) == 0)) { memcmp(RSTRING_PTR(rs), pp, rslen) == 0)) {

12
test/ruby/test_string.rb
View file

@ -280,6 +280,7 @@ class TestString < Test::Unit::TestCase
def test_chomp def test_chomp
assert_equal(S("hello"), S("hello").chomp("\n")) assert_equal(S("hello"), S("hello").chomp("\n"))
assert_equal(S("hello"), S("hello\n").chomp("\n")) assert_equal(S("hello"), S("hello\n").chomp("\n"))
save = $/
$/ = "\n" $/ = "\n"
@ -289,7 +290,7 @@ class TestString < Test::Unit::TestCase
$/ = "!" $/ = "!"
assert_equal(S("hello"), S("hello").chomp) assert_equal(S("hello"), S("hello").chomp)
assert_equal(S("hello"), S("hello!").chomp) assert_equal(S("hello"), S("hello!").chomp)
$/ = "\n" $/ = save
end end
def test_chomp! def test_chomp!
@ -302,6 +303,7 @@ class TestString < Test::Unit::TestCase
a = S("hello\n") a = S("hello\n")
a.chomp!(S("\n")) a.chomp!(S("\n"))
assert_equal(S("hello"), a) assert_equal(S("hello"), a)
save = $/
$/ = "\n" $/ = "\n"
a = S("hello") a = S("hello")
@ -321,7 +323,7 @@ class TestString < Test::Unit::TestCase
a.chomp! a.chomp!
assert_equal(S("hello"), a) assert_equal(S("hello"), a)
$/ = "\n" $/ = save
a = S("hello\n") a = S("hello\n")
b = a.dup b = a.dup
@ -474,6 +476,7 @@ class TestString < Test::Unit::TestCase
end end
def test_each def test_each
save = $/
$/ = "\n" $/ = "\n"
res=[] res=[]
S("hello\nworld").lines.each {|x| res << x} S("hello\nworld").lines.each {|x| res << x}
@ -490,7 +493,7 @@ class TestString < Test::Unit::TestCase
S("hello!world").lines.each {|x| res << x} S("hello!world").lines.each {|x| res << x}
assert_equal(S("hello!"), res[0]) assert_equal(S("hello!"), res[0])
assert_equal(S("world"), res[1]) assert_equal(S("world"), res[1])
$/ = "\n" $/ = save
end end
def test_each_byte def test_each_byte
@ -502,6 +505,7 @@ class TestString < Test::Unit::TestCase
end end
def test_each_line def test_each_line
save = $/
$/ = "\n" $/ = "\n"
res=[] res=[]
S("hello\nworld").lines.each {|x| res << x} S("hello\nworld").lines.each {|x| res << x}
@ -520,7 +524,7 @@ class TestString < Test::Unit::TestCase
assert_equal(S("hello!"), res[0]) assert_equal(S("hello!"), res[0])
assert_equal(S("world"), res[1]) assert_equal(S("world"), res[1])
$/ = "\n" $/ = save
end end
def test_empty? def test_empty?

8
test/ruby/test_utf16.rb
View file

@ -232,9 +232,11 @@ EOT
def test_chomp def test_chomp
s = "\1\n".force_encoding("utf-16be") s = "\1\n".force_encoding("utf-16be")
assert_raise(ArgumentError, "#{encdump s}.chomp") { assert_equal(s, s.chomp, "#{encdump s}.chomp")
s.chomp s = "\0\n".force_encoding("utf-16be")
} assert_equal("", s.chomp, "#{encdump s}.chomp")
s = "\0\r\0\n".force_encoding("utf-16be")
assert_equal("", s.chomp, "#{encdump s}.chomp")
end end
def test_succ def test_succ