ruby-core

Hi,

In message "[Clenup?] rb_str_replace"
    on 02/08/29, Michal Rokos <m.rokos@sh.cvut.cz> writes:

|	condition FL_TEST(str2, ELTS_SHARED|STR_ASSOC) is allway true,
|	because FL_TEST(str2, ELTS_SHARED) is already true.
|
|	Is the cleanup really so easy? Or I'm missing something (as
|	usual :-))

Thank you for finding.  Probably we need this too.

|--- string.c	2002/08/28 08:05:23	1.115
|+++ string.c	2002/08/28 15:43:13
|@@ -1603,25 +1603,20 @@ rb_str_replace(str, str2)
|     if (str == str2) return str;
| 
|     StringValue(str2);
|     if (FL_TEST(str2, ELTS_SHARED)) {
| 	if (str_independent(str)) {
| 	    free(RSTRING(str)->ptr);
| 	}
| 	RSTRING(str)->len = RSTRING(str2)->len;
| 	RSTRING(str)->ptr = RSTRING(str2)->ptr;
|-	if (FL_TEST(str2, ELTS_SHARED|STR_ASSOC)) {
|-	    FL_SET(str, RBASIC(str2)->flags & (ELTS_SHARED|STR_ASSOC));
|-	    RSTRING(str)->aux.shared = RSTRING(str2)->aux.shared;
|-	}
|-	else {
|-	    RSTRING(str)->aux.capa = RSTRING(str2)->aux.capa;
|-	}
|+	FL_SET(str, RBASIC(str2)->flags & (ELTS_SHARED|STR_ASSOC));
|+	RSTRING(str)->aux.shared = RSTRING(str2)->aux.shared;
|     }
|     else {
| 	rb_str_modify(str);
| 	rb_str_resize(str, RSTRING(str2)->len);
| 	memcpy(RSTRING(str)->ptr, RSTRING(str2)->ptr, RSTRING(str2)->len);
+	if (FL_TEST(str2, STR_ASSOC)) {
+	    FL_SET(str, RBASIC(str2)->flags & (ELTS_SHARED|STR_ASSOC));
+	    RSTRING(str)->aux.shared = RSTRING(str2)->aux.shared;
+	}
|     }
| 
|     OBJ_INFECT(str, str2);
|     return str;
|-- 

							matz.

Thread

Prev Next

In This Thread

Prev Next

[#290] — Florian Frank <flori@...>

[#291] Kernel Thread implementation — Matthew Bloch <mattbee@...>

[#297] GC longjmp macros — Michal Rokos <m.rokos@...>

[#298] Is there a bug in Matrix or Complex? — Jim Freeze <jim@...>

[#308] Q: OSSL in std. distr? — Michal Rokos <m.rokos@...>

[#309] Progress on incremental GC? — "Timothy J. Wood" <tjw@...>

[#314] resolv.rb on 1.6.7 — Dave Thomas <Dave@...>

[#316] Embeding Ruby in C++ code. — Kostas Katsamakas <kmak@...>

[#318] C and Ruby... — Kostas Katsamakas <kmak@...>

[#321] Ruby module, Warn(ing) interface — Michal Rokos <m.rokos@...>

[#326] Implications of a #force_free method in Object? — Matthew Bloch <mattbee@...>

[#328] Int vs Long — Michal Rokos <m.rokos@...>

[#329] Int vs Long #2 — Michal Rokos <m.rokos@...>

[#337] Int vs Long (2nd part) — Michal Rokos <m.rokos@...>

[#340] Int vs Long #3 — Michal Rokos <m.rokos@...>

[#345] Bug in gc.c or misunderstanding on my part? — "Timothy J. Wood" <tjw@...>

[#349] Array#select — Michal Rokos <m.rokos@...>

[#353] File (struct stat handling) — Michal Rokos <m.rokos@...>

[#355] Array and .*ALLOC.* changes — Michal Rokos <m.rokos@...>

[#358] node.h for eval.c — Michal Rokos <m.rokos@...>

[#363] Ruby embedding limitations — "Timothy J. Wood" <tjw@...>

[#367] RE: Welcome to our (ruby-core ML) You are added automatically — Girish Sharangpani <girishs@...>

[#372] rb_class_path — Michal Rokos <m.rokos@...>

[#376] Virtual host and port number in CGI — Raymond Blum <raymond@...>

[#382] Port match to new dup, clone framework — Michal Rokos <m.rokos@...>

[#387] rb_str_replace — Michal Rokos <m.rokos@...>

[#392] io.c read_all — Michal Rokos <m.rokos@...>

[#393] in dln.c — Michal Rokos <m.rokos@...>

[#394] in file.c — Michal Rokos <m.rokos@...>

[#395] CVS version and win32 naming — "Rich Kilmer" <rich@...>

Re: [Clenup?] rb_str_replace

Thread

In This Thread

[#355] Array and .ALLOC. changes — Michal Rokos <m.rokos@...>