[macruby-changes] [565] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 565
          http://trac.macosforge.org/projects/ruby/changeset/565
Author:   lsansonetti at apple.com
Date:     2008-09-06 15:49:30 -0700 (Sat, 06 Sep 2008)
Log Message:
-----------
misc fixes

Modified Paths:
--------------
    MacRuby/trunk/array.c
    MacRuby/trunk/enum.c
    MacRuby/trunk/load.c
    MacRuby/trunk/parse.y

Modified: MacRuby/trunk/array.c
===================================================================
--- MacRuby/trunk/array.c	2008-09-06 07:27:17 UTC (rev 564)
+++ MacRuby/trunk/array.c	2008-09-06 22:49:30 UTC (rev 565)
@@ -3144,9 +3144,6 @@
     long i,j;
     long resultlen = 1;
 
-    RBASIC(t0)->klass = 0;
-    RBASIC(t1)->klass = 0;
-
     /* initialize the arrays of arrays */
     arrays[0] = ary;
     for (i = 1; i < n; i++) arrays[i] = to_ary(argv[i-1]);

Modified: MacRuby/trunk/enum.c
===================================================================
--- MacRuby/trunk/enum.c	2008-09-06 07:27:17 UTC (rev 564)
+++ MacRuby/trunk/enum.c	2008-09-06 22:49:30 UTC (rev 565)
@@ -1792,7 +1792,9 @@
         if (n <= 0) return Qnil;
     }
     ary = rb_ary_new();
+#if !WITH_OBJC
     RBASIC(ary)->klass = 0;
+#endif
     rb_block_call(obj, id_each, 0, 0, cycle_i, ary);
     len = RARRAY_LEN(ary);
     if (len == 0) return Qnil;

Modified: MacRuby/trunk/load.c
===================================================================
--- MacRuby/trunk/load.c	2008-09-06 07:27:17 UTC (rev 564)
+++ MacRuby/trunk/load.c	2008-09-06 22:49:30 UTC (rev 565)
@@ -352,7 +352,8 @@
     if (!loading_tbl || !st_lookup(loading_tbl, (st_data_t)ftptr, &data)) {
 	/* loading ruby library should be serialized. */
 	if (!loading_tbl) {
-	    GET_VM()->loading_table = loading_tbl = st_init_strtable();
+	    loading_tbl = st_init_strtable();
+	    GC_WB(&GET_VM()->loading_table, loading_tbl);
 	}
 	/* partial state */
 	ftptr = ruby_strdup(ftptr);

Modified: MacRuby/trunk/parse.y
===================================================================
--- MacRuby/trunk/parse.y	2008-09-06 07:27:17 UTC (rev 564)
+++ MacRuby/trunk/parse.y	2008-09-06 22:49:30 UTC (rev 565)
@@ -9837,7 +9837,7 @@
 {
     struct parser_params *p = parser_new();
 
-    return Data_Wrap_Struct(0, parser_mark, parser_free, p);
+    return Data_Wrap_Struct(rb_cData, parser_mark, parser_free, p);
 }
 
 /*
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080906/ba9f8e1e/attachment.html