[macruby-changes] [2280] MacRuby/trunk/io.c

source_changes at macosforge.org source_changes at macosforge.org
Tue Aug 11 12:02:58 PDT 2009


Revision: 2280
          http://trac.macosforge.org/projects/ruby/changeset/2280
Author:   lsansonetti at apple.com
Date:     2009-08-11 12:02:56 -0700 (Tue, 11 Aug 2009)
Log Message:
-----------
adding missing write barriers in argf

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

Modified: MacRuby/trunk/io.c
===================================================================
--- MacRuby/trunk/io.c	2009-08-11 18:47:26 UTC (rev 2279)
+++ MacRuby/trunk/io.c	2009-08-11 19:02:56 UTC (rev 2280)
@@ -3127,11 +3127,11 @@
 	ARGF.next_p = 0;
 retry:  
 	if (RARRAY_LEN(ARGF.argv) > 0) {
-	    ARGF.filename = rb_ary_shift(ARGF.argv);
+	    GC_WB(&ARGF.filename, rb_ary_shift(ARGF.argv));
 	    fn = StringValueCStr(ARGF.filename);
 	    if (strlen(fn) == 1 && fn[0] == '-') {
 		// - means read from standard input, obviously.
-		ARGF.current_file = rb_stdin;
+		GC_WB(&ARGF.current_file, rb_stdin);
 		if (ARGF.inplace) {
 		    rb_warn("Can't do inplace edit for stdio; skipping");
 		    goto retry;
@@ -3177,7 +3177,7 @@
 		    }
 		    rb_stdout = prep_io(fw, FMODE_WRITABLE, rb_cFile, true);
 		}
-		ARGF.current_file = prep_io(fr, FMODE_READABLE, rb_cFile, true);
+		GC_WB(&ARGF.current_file, prep_io(fr, FMODE_READABLE, rb_cFile, true));
 	    }
 #if 0 // TODO once we get encodings sorted out.
 	    if (ARGF.encs.enc) {
@@ -3194,8 +3194,8 @@
 	}
     }
     else if (ARGF.next_p == -1) {
-	ARGF.current_file = rb_stdin;
-	ARGF.filename = rb_str_new2("-");
+	GC_WB(&ARGF.current_file, rb_stdin);
+	GC_WB(&ARGF.filename, rb_str_new2("-"));
     }
     return Qtrue;
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090811/77b9a0b9/attachment.html>


More information about the macruby-changes mailing list