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

* string.c (rb_str_new4): handle tail shared string.

Browse Source 
(ruby-bugs-ja:PR#370)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3164 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2002-12-17 18:20:46 +00:00
parent 49fc21f31e
commit f4b8bbb143
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Dec 18 02:27:34 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* string.c (rb_str_new4): handle tail shared string.
(ruby-bugs-ja:PR#370)
Tue Dec 17 21:08:29 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> Tue Dec 17 21:08:29 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* node.h (NODE_ATTRASGN): new node, assignment to attribute. * node.h (NODE_ATTRASGN): new node, assignment to attribute.

33
string.c
View File

@ -137,6 +137,21 @@ rb_str_new3(str)
return str_new3(rb_obj_class(str), str); return str_new3(rb_obj_class(str), str);
} }
static VALUE
str_new4(klass, str)
VALUE klass, str;
{
VALUE str2 = rb_obj_alloc(klass);
RSTRING(str2)->len = RSTRING(str)->len;
RSTRING(str2)->ptr = RSTRING(str)->ptr;
RSTRING(str)->aux.shared = str2;
FL_SET(str, ELTS_SHARED);
OBJ_INFECT(str2, str);
return str2;
}
VALUE VALUE
rb_str_new4(orig) rb_str_new4(orig)
VALUE orig; VALUE orig;
@ -145,20 +160,20 @@ rb_str_new4(orig)
klass = rb_obj_class(orig); klass = rb_obj_class(orig);
if (FL_TEST(orig, ELTS_SHARED)) { if (FL_TEST(orig, ELTS_SHARED)) {
str = str_new3(klass, RSTRING(orig)->aux.shared); long ofs;
str = RSTRING(orig)->aux.shared;
ofs = RSTRING(str)->len - RSTRING(orig)->len;
str = str_new3(klass, str);
RSTRING(str)->ptr += ofs;
RSTRING(str)->len -= ofs;
} }
else if (FL_TEST(orig, STR_ASSOC)) { else if (FL_TEST(orig, STR_ASSOC)) {
str = str_new(klass, RSTRING(orig)->ptr, RSTRING(orig)->len); str = str_new(klass, RSTRING(orig)->ptr, RSTRING(orig)->len);
OBJ_INFECT(str, orig);
} }
else { else {
str = rb_obj_alloc(klass); str = str_new4(klass, orig);
RSTRING(str)->len = RSTRING(orig)->len;
RSTRING(str)->ptr = RSTRING(orig)->ptr;
RSTRING(orig)->aux.shared = str;
FL_SET(orig, ELTS_SHARED);
} }
OBJ_INFECT(str, orig);
OBJ_FREEZE(str); OBJ_FREEZE(str);
return str; return str;
} }
@ -477,7 +492,7 @@ rb_str_substr(str, beg, len)
if (len > sizeof(struct RString)/2 && if (len > sizeof(struct RString)/2 &&
beg + len == RSTRING(str)->len && beg + len == RSTRING(str)->len &&
!FL_TEST(str, STR_ASSOC)) { !FL_TEST(str, STR_ASSOC)) {
if (!FL_TEST(str, ELTS_SHARED)) str = rb_str_new4(str); if (!FL_TEST(str, ELTS_SHARED)) str = str_new4(CLASS_OF(str), str);
str2 = rb_str_new3(str); str2 = rb_str_new3(str);
RSTRING(str2)->ptr += beg; RSTRING(str2)->ptr += beg;
RSTRING(str2)->len = len; RSTRING(str2)->len = len;