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

* re.c (rb_reg_regsub): returns the given string itself if nothing

Browse Source 
changed.

* string.c (rb_str_sub_bang): keeps code-range as possible.

* string.c (str_gsub): adjusts code-range.  [ruby-core:14566]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-12-29 13:44:32 +00:00
parent 1b0ba5931d
commit 5ee7f4b0b5
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Sat Dec 29 22:44:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* re.c (rb_reg_regsub): returns the given string itself if nothing
changed.
* string.c (rb_str_sub_bang): keeps code-range as possible.
* string.c (str_gsub): adjusts code-range. [ruby-core:14566]
Sat Dec 29 21:54:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Dec 29 21:54:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (clean, distclean, realclean): should include clean-enc * common.mk (clean, distclean, realclean): should include clean-enc

5
re.c
View File

@ -2856,13 +2856,10 @@ rb_reg_regsub(VALUE str, VALUE src, struct re_registers *regs, VALUE regexp)
} }
} }
if (!val) return str;
if (p < e) { if (p < e) {
if (!val) {
val = rb_str_buf_new(e-p);
}
rb_str_buf_cat(val, p, e-p); rb_str_buf_cat(val, p, e-p);
} }
if (!val) return str;
rb_enc_associate(val, enc); rb_enc_associate(val, enc);
return val; return val;

15
string.c
View File

@ -2425,6 +2425,7 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str)
pat = get_pat(argv[0], 1); pat = get_pat(argv[0], 1);
if (rb_reg_search(pat, str, 0, 0) >= 0) { if (rb_reg_search(pat, str, 0, 0) >= 0) {
rb_encoding *enc; rb_encoding *enc;
int cr = ENC_CODERANGE(str);
match = rb_backref_get(); match = rb_backref_get();
regs = RMATCH(match)->regs; regs = RMATCH(match)->regs;
@ -2446,6 +2447,10 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str)
rb_str_modify(str); rb_str_modify(str);
rb_enc_associate(str, enc); rb_enc_associate(str, enc);
if (OBJ_TAINTED(repl)) tainted = 1; if (OBJ_TAINTED(repl)) tainted = 1;
if (ENC_CODERANGE_UNKNOWN < cr && cr < ENC_CODERANGE_BROKEN) {
int cr2 = ENC_CODERANGE(repl);
if (cr2 == ENC_CODERANGE_UNKNOWN || cr2 > cr) cr = cr2;
}
plen = END(0) - BEG(0); plen = END(0) - BEG(0);
if (RSTRING_LEN(repl) > plen) { if (RSTRING_LEN(repl) > plen) {
RESIZE_CAPA(str, RSTRING_LEN(str) + RSTRING_LEN(repl) - plen); RESIZE_CAPA(str, RSTRING_LEN(str) + RSTRING_LEN(repl) - plen);
@ -2459,6 +2464,7 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str)
RSTRING_PTR(repl), RSTRING_LEN(repl)); RSTRING_PTR(repl), RSTRING_LEN(repl));
STR_SET_LEN(str, RSTRING_LEN(str) + RSTRING_LEN(repl) - plen); STR_SET_LEN(str, RSTRING_LEN(str) + RSTRING_LEN(repl) - plen);
RSTRING_PTR(str)[RSTRING_LEN(str)] = '\0'; RSTRING_PTR(str)[RSTRING_LEN(str)] = '\0';
ENC_CODERANGE_SET(str, cr);
if (tainted) OBJ_TAINT(str); if (tainted) OBJ_TAINT(str);
return str; return str;
@ -2516,7 +2522,7 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
int iter = 0; int iter = 0;
char *buf, *bp, *sp, *cp; char *buf, *bp, *sp, *cp;
int tainted = 0; int tainted = 0;
rb_encoding *enc; int cr;
switch (argc) { switch (argc) {
case 1: case 1:
@ -2533,7 +2539,6 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
} }
pat = get_pat(argv[0], 1); pat = get_pat(argv[0], 1);
enc = rb_enc_get(pat);
offset=0; n=0; offset=0; n=0;
beg = rb_reg_search(pat, str, 0, 0); beg = rb_reg_search(pat, str, 0, 0);
if (beg < 0) { if (beg < 0) {
@ -2547,6 +2552,7 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
bp = buf; bp = buf;
sp = cp = RSTRING_PTR(str); sp = cp = RSTRING_PTR(str);
slen = RSTRING_LEN(str); slen = RSTRING_LEN(str);
cr = ENC_CODERANGE(str);
rb_str_locktmp(dest); rb_str_locktmp(dest);
do { do {
@ -2573,6 +2579,10 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
} }
rb_enc_associate(str, enc); rb_enc_associate(str, enc);
if (OBJ_TAINTED(val)) tainted = 1; if (OBJ_TAINTED(val)) tainted = 1;
if (ENC_CODERANGE_UNKNOWN < cr && cr < ENC_CODERANGE_BROKEN) {
int cr2 = ENC_CODERANGE(val);
if (cr2 == ENC_CODERANGE_UNKNOWN || cr2 > cr) cr = cr2;
}
len = (bp - buf) + (beg - offset) + RSTRING_LEN(val) + 3; len = (bp - buf) + (beg - offset) + RSTRING_LEN(val) + 3;
if (blen < len) { if (blen < len) {
while (blen < len) blen *= 2; while (blen < len) blen *= 2;
@ -2636,6 +2646,7 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
} }
STR_SET_LEN(str, bp - buf); STR_SET_LEN(str, bp - buf);
ENC_CODERANGE_SET(str, cr);
if (tainted) OBJ_TAINT(str); if (tainted) OBJ_TAINT(str);
return str; return str;
} }