[macruby-changes] [3784] MacRuby/trunk/string.c

[source_changes at macosforge.org]

Revision: 3784
          http://trac.macosforge.org/projects/ruby/changeset/3784
Author:   lsansonetti at apple.com
Date:     2010-03-17 01:59:02 -0700 (Wed, 17 Mar 2010)
Log Message:
-----------
str_concat_string() should not replace the receiver's encoding

Modified Paths:
--------------
    MacRuby/trunk/string.c

Modified: MacRuby/trunk/string.c
===================================================================
--- MacRuby/trunk/string.c	2010-03-17 01:59:40 UTC (rev 3783)
+++ MacRuby/trunk/string.c	2010-03-17 08:59:02 UTC (rev 3784)
@@ -831,10 +831,6 @@
     if (str->length_in_bytes == 0) {
 	return;
     }
-    if (self->length_in_bytes == 0) {
-	str_replace_with_string(self, str);
-	return;
-    }
 
     str_must_have_compatible_encoding(self, str);
     str_make_same_format(self, str);
@@ -5520,7 +5516,7 @@
 VALUE
 rb_str_new_fast(int argc, ...)
 {
-    VALUE str = (VALUE)str_alloc(rb_cRubyString);
+    VALUE str = rb_str_new(NULL, 0);
 
     if (argc > 0) {
 	va_list ar;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100317/5eb4f4b0/attachment-0001.html>