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 (tr_trans): should squeeze properly. [ruby-dev:34587]

Browse source 
* string.c (tr_trans): had a bug in treating multi-byte character
  replacement. 

* string.c (rb_str_delete_bang): need not to do anything for empty
  strings. 

* test/ruby/test_m17n_comb.rb (TestM17NComb::test_str_delete): add
  test for empty receiver.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-05-07 16:15:45 +00:00
parent 10f263c10e
commit 60219a0aa3
4 changed files with 71 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
Thu May 8 01:10:03 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (tr_trans): should squeeze properly. [ruby-dev:34587]
* string.c (tr_trans): had a bug in treating multi-byte character
replacement.
* string.c (rb_str_delete_bang): need not to do anything for empty
strings.
* test/ruby/test_m17n_comb.rb (TestM17NComb::test_str_delete): add
test for empty receiver.
Wed May 7 20:19:18 2008 NAKAMURA Usaku <usa@ruby-lang.org> Wed May 7 20:19:18 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* ruby.c (process_options, ruby_set_argv): set encoding of rb_argv * ruby.c (process_options, ruby_set_argv): set encoding of rb_argv

92
string.c
View file

@ -4219,25 +4219,21 @@ static VALUE rb_str_delete_bang(int,VALUE*,VALUE);
static VALUE static VALUE
tr_trans(VALUE str, VALUE src, VALUE repl, int sflag) tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
{ {
SIGNED_VALUE trans[256]; int trans[256];
rb_encoding *enc, *e1, *e2; rb_encoding *enc, *e1, *e2;
struct tr trsrc, trrepl; struct tr trsrc, trrepl;
int cflag = 0; int cflag = 0;
int c, last = 0, modify = 0, i; int c, c0, last = 0, modify = 0, i, l;
char *s, *send; char *s, *send;
VALUE hash = 0; VALUE hash = 0;
StringValue(src); StringValue(src);
StringValue(repl); StringValue(repl);
if (RSTRING_LEN(str) == 0 || !RSTRING_PTR(str)) return Qnil; if (RSTRING_LEN(str) == 0 || !RSTRING_PTR(str)) return Qnil;
trsrc.p = RSTRING_PTR(src); trsrc.pend = trsrc.p + RSTRING_LEN(src);
if (RSTRING_LEN(src) >= 2 && RSTRING_PTR(src)[0] == '^') {
cflag++;
trsrc.p++;
}
if (RSTRING_LEN(repl) == 0) { if (RSTRING_LEN(repl) == 0) {
return rb_str_delete_bang(1, &src, str); return rb_str_delete_bang(1, &src, str);
} }
e1 = rb_enc_check(str, src); e1 = rb_enc_check(str, src);
e2 = rb_enc_check(str, repl); e2 = rb_enc_check(str, repl);
if (e1 == e2) { if (e1 == e2) {
@ -4246,6 +4242,11 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
else { else {
enc = rb_enc_check(src, repl); enc = rb_enc_check(src, repl);
} }
trsrc.p = RSTRING_PTR(src); trsrc.pend = trsrc.p + RSTRING_LEN(src);
if (RSTRING_LEN(str) > 1 && rb_enc_ascget(trsrc.p, trsrc.pend, &l, enc) == '^') {
cflag = 1;
trsrc.p += l;
}
trrepl.p = RSTRING_PTR(repl); trrepl.p = RSTRING_PTR(repl);
trrepl.pend = trrepl.p + RSTRING_LEN(repl); trrepl.pend = trrepl.p + RSTRING_LEN(repl);
trsrc.gen = trrepl.gen = 0; trsrc.gen = trrepl.gen = 0;
@ -4284,7 +4285,7 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
r = trnext(&trrepl, enc); r = trnext(&trrepl, enc);
if (r == -1) r = trrepl.now; if (r == -1) r = trrepl.now;
if (c < 256) { if (c < 256) {
trans[c] = INT2NUM(r); trans[c] = r;
} }
else { else {
if (!hash) hash = rb_hash_new(); if (!hash) hash = rb_hash_new();
@ -4299,35 +4300,37 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
int clen, tlen, max = RSTRING_LEN(str); int clen, tlen, max = RSTRING_LEN(str);
int offset, save = -1; int offset, save = -1;
char *buf = ALLOC_N(char, max), *t = buf; char *buf = ALLOC_N(char, max), *t = buf;
VALUE v;
if (cflag) tlen = rb_enc_codelen(last, enc);
while (s < send) { while (s < send) {
c = rb_enc_codepoint(s, send, enc); c0 = c = rb_enc_codepoint(s, send, enc);
tlen = clen = rb_enc_codelen(c, enc); tlen = clen = rb_enc_codelen(c, enc);
s += clen; s += clen;
if (c < 256) { if (c < 256) {
v = trans[c] >= 0 ? trans[c] : Qnil; c = trans[c];
}
else if (hash) {
VALUE tmp = rb_hash_lookup(hash, INT2NUM(c));
if (NIL_P(tmp)) {
if (cflag) c = last;
else c = -1;
}
else if (cflag) c = -1;
else c = NUM2INT(tmp);
} }
else { else {
v = hash ? rb_hash_aref(hash, INT2NUM(c)) : Qnil; c = -1;
} }
if (!NIL_P(v)) { if (c >= 0) {
if (!cflag) { if (save == c) continue;
c = NUM2INT(v); save = c;
if (save == c) continue; tlen = rb_enc_codelen(c, enc);
save = c; modify = 1;
tlen = rb_enc_codelen(c, enc);
modify = 1;
}
else {
save = c = last;
modify = 1;
}
} }
else { else {
save = -1; save = -1;
modify = 1;
c = c0;
} }
while (t - buf + tlen >= max) { while (t - buf + tlen >= max) {
offset = t - buf; offset = t - buf;
@ -4349,7 +4352,7 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
c = (unsigned char)*s; c = (unsigned char)*s;
if (trans[c] >= 0) { if (trans[c] >= 0) {
if (!cflag) { if (!cflag) {
c = FIX2INT(trans[c]); c = trans[c];
*s = c; *s = c;
modify = 1; modify = 1;
} }
@ -4367,27 +4370,32 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
char *buf = ALLOC_N(char, max), *t = buf; char *buf = ALLOC_N(char, max), *t = buf;
VALUE v; VALUE v;
if (cflag) tlen = rb_enc_codelen(last, enc);
while (s < send) { while (s < send) {
c = rb_enc_codepoint(s, send, enc); c0 = c = rb_enc_codepoint(s, send, enc);
tlen = clen = rb_enc_codelen(c, enc); tlen = clen = rb_enc_codelen(c, enc);
if (c < 256) { if (c < 256) {
v = trans[c] >= 0 ? trans[c] : Qnil; c = trans[c];
}
else if (hash) {
VALUE tmp = rb_hash_lookup(hash, INT2NUM(c));
if (NIL_P(tmp)) {
if (cflag) c = last;
else c = -1;
}
else if (cflag) c = -1;
else c = NUM2INT(tmp);
} }
else { else {
v = hash ? rb_hash_aref(hash, INT2NUM(c)) : Qnil; c = -1;
} }
if (!NIL_P(v)) { if (c >= 0) {
if (!cflag) { tlen = rb_enc_codelen(c, enc);
c = NUM2INT(v); modify = 1;
tlen = rb_enc_codelen(c, enc); }
modify = 1; else {
} modify = 1;
else { c = c0;
c = last;
modify = 1;
}
} }
while (t - buf + tlen >= max) { while (t - buf + tlen >= max) {
offset = t - buf; offset = t - buf;
@ -4548,8 +4556,10 @@ rb_str_delete_bang(int argc, VALUE *argv, VALUE str)
VALUE del = 0, nodel = 0; VALUE del = 0, nodel = 0;
int modify = 0; int modify = 0;
int i; int i;
int cr = ENC_CODERANGE(str); int cr;
if (RSTRING_LEN(str) == 0 || !RSTRING_PTR(str)) return Qnil;
cr = ENC_CODERANGE(str);
if (argc < 1) { if (argc < 1) {
rb_raise(rb_eArgError, "wrong number of arguments"); rb_raise(rb_eArgError, "wrong number of arguments");
} }

4
test/ruby/test_m17n_comb.rb
View file

@ -804,6 +804,10 @@ class TestM17NComb < Test::Unit::TestCase
def test_str_delete def test_str_delete
combination(STRINGS, STRINGS) {|s1, s2| combination(STRINGS, STRINGS) {|s1, s2|
if s1.empty?
assert_equal(s1, s1.delete(s2))
next
end
if !s1.valid_encoding? || !s2.valid_encoding? if !s1.valid_encoding? || !s2.valid_encoding?
assert_raise(ArgumentError) { s1.delete(s2) } assert_raise(ArgumentError) { s1.delete(s2) }
next next

6
version.h
View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2008-05-07" #define RUBY_RELEASE_DATE "2008-05-08"
#define RUBY_VERSION_CODE 190 #define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20080507 #define RUBY_RELEASE_CODE 20080508
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 5
#define RUBY_RELEASE_DAY 7 #define RUBY_RELEASE_DAY 8
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];