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

* string.c (rb_str_append): performance improvement.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-01-11 07:55:23 +00:00
parent 0ada40e2b1
commit 1267156698
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Jan 11 16:55:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_append): performance improvement.
Fri Jan 11 12:35:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jan 11 12:35:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: moved broken syscall checks from process.c etc. * configure.in: moved broken syscall checks from process.c etc.

12
string.c
View File

@ -1194,25 +1194,25 @@ rb_str_append(VALUE str, VALUE str2)
int cr, cr2; int cr, cr2;
StringValue(str2); StringValue(str2);
if (RSTRING_LEN(str2) > 0) {
if (STR_ASSOC_P(str)) {
long len = RSTRING_LEN(str)+RSTRING_LEN(str2);
enc = rb_enc_check(str, str2); enc = rb_enc_check(str, str2);
cr = ENC_CODERANGE(str); cr = ENC_CODERANGE(str);
if ((cr2 = ENC_CODERANGE(str2)) > cr) cr = cr2; if ((cr2 = ENC_CODERANGE(str2)) > cr) cr = cr2;
rb_str_modify(str); rb_str_modify(str);
if (RSTRING_LEN(str2) > 0) {
if (STR_ASSOC_P(str)) {
long len = RSTRING_LEN(str)+RSTRING_LEN(str2);
REALLOC_N(RSTRING(str)->as.heap.ptr, char, len+1); REALLOC_N(RSTRING(str)->as.heap.ptr, char, len+1);
memcpy(RSTRING(str)->as.heap.ptr + RSTRING(str)->as.heap.len, memcpy(RSTRING(str)->as.heap.ptr + RSTRING(str)->as.heap.len,
RSTRING_PTR(str2), RSTRING_LEN(str2)+1); RSTRING_PTR(str2), RSTRING_LEN(str2)+1);
RSTRING(str)->as.heap.len = len; RSTRING(str)->as.heap.len = len;
rb_enc_associate(str, enc);
ENC_CODERANGE_SET(str, cr);
} }
else { else {
rb_str_buf_append(str, str2); return rb_str_buf_append(str, str2);
} }
} }
OBJ_INFECT(str, str2); OBJ_INFECT(str, str2);
rb_enc_associate(str, enc);
ENC_CODERANGE_SET(str, cr);
return str; return str;
} }