[macruby-changes] [231] MacRuby/trunk

source_changes at macosforge.org source_changes at macosforge.org
Wed May 28 12:09:10 PDT 2008


Revision: 231
          http://trac.macosforge.org/projects/ruby/changeset/231
Author:   lsansonetti at apple.com
Date:     2008-05-28 12:09:09 -0700 (Wed, 28 May 2008)

Log Message:
-----------
fixed rb_str_resize() when used on bytestrings

Modified Paths:
--------------
    MacRuby/trunk/lib/rdoc/ri/driver.rb
    MacRuby/trunk/string.c

Modified: MacRuby/trunk/lib/rdoc/ri/driver.rb
===================================================================
--- MacRuby/trunk/lib/rdoc/ri/driver.rb	2008-05-28 07:51:41 UTC (rev 230)
+++ MacRuby/trunk/lib/rdoc/ri/driver.rb	2008-05-28 19:09:09 UTC (rev 231)
@@ -413,12 +413,9 @@
   end
 
   def write_cache(cache, path)
-    # FIXME the following code doesn't work in MR yet
-    #File.open path, "wb" do |cache_file|
-    #  Marshal.dump cache, cache_file
-    #end
-    data = Marshal.dump cache
-    File.open path, 'wb' { |io| io.write data }
+    File.open path, "wb" do |cache_file|
+      Marshal.dump cache, cache_file
+    end
 
     cache
   end

Modified: MacRuby/trunk/string.c
===================================================================
--- MacRuby/trunk/string.c	2008-05-28 07:51:41 UTC (rev 230)
+++ MacRuby/trunk/string.c	2008-05-28 19:09:09 UTC (rev 231)
@@ -1773,7 +1773,7 @@
 
     rb_str_modify(str);
 #if WITH_OBJC
-    slen = CFStringGetLength((CFStringRef)str);
+    slen = RSTRING_CLEN(str);
     if (slen != len) {
 	void *cfdata;
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080528/c0d1dbd3/attachment.htm 


More information about the macruby-changes mailing list