[macruby-changes] [2279] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 2279
          http://trac.macosforge.org/projects/ruby/changeset/2279
Author:   pthomson at apple.com
Date:     2009-08-11 11:47:26 -0700 (Tue, 11 Aug 2009)
Log Message:
-----------
Fixed a bug in OBJ_UNTRUSTED and fixed some specs.

Modified Paths:
--------------
    MacRuby/trunk/array.c
    MacRuby/trunk/include/ruby/intern.h
    MacRuby/trunk/include/ruby/ruby.h

Removed Paths:
-------------
    MacRuby/trunk/spec/frozen/tags/macruby/core/array/clear_tags.txt
    MacRuby/trunk/spec/frozen/tags/macruby/core/array/compact_tags.txt

Modified: MacRuby/trunk/array.c
===================================================================
--- MacRuby/trunk/array.c	2009-08-11 18:16:11 UTC (rev 2278)
+++ MacRuby/trunk/array.c	2009-08-11 18:47:26 UTC (rev 2279)
@@ -1567,6 +1567,11 @@
     if (OBJ_TAINTED(ary)) {
 	OBJ_TAINT(dup);
     }
+	
+	if (OBJ_UNTRUSTED(ary))
+	{
+	OBJ_UNTRUST(dup);
+	}
 
     return dup;
 }

Modified: MacRuby/trunk/include/ruby/intern.h
===================================================================
--- MacRuby/trunk/include/ruby/intern.h	2009-08-11 18:16:11 UTC (rev 2278)
+++ MacRuby/trunk/include/ruby/intern.h	2009-08-11 18:47:26 UTC (rev 2279)
@@ -430,6 +430,9 @@
 VALUE rb_obj_taint(VALUE);
 VALUE rb_obj_tainted(VALUE);
 VALUE rb_obj_untaint(VALUE);
+VALUE rb_obj_trust(VALUE);
+VALUE rb_obj_untrust(VALUE);
+VALUE rb_obj_untrusted(VALUE);
 VALUE rb_obj_freeze(VALUE);
 VALUE rb_obj_frozen_p(VALUE);
 //VALUE rb_obj_id(VALUE);

Modified: MacRuby/trunk/include/ruby/ruby.h
===================================================================
--- MacRuby/trunk/include/ruby/ruby.h	2009-08-11 18:16:11 UTC (rev 2278)
+++ MacRuby/trunk/include/ruby/ruby.h	2009-08-11 18:47:26 UTC (rev 2279)
@@ -864,7 +864,7 @@
 #if WITH_OBJC
 # define OBJ_TAINTED(x) (int)(SPECIAL_CONST_P(x) || NATIVE(x) ? rb_obj_tainted((VALUE)x) == Qtrue : FL_TEST((x), FL_TAINT))
 # define OBJ_TAINT(x)   (rb_obj_taint((VALUE)x))
-# define OBJ_UNTRUSTED(x) (int)(SPECIAL_CONST_P(x) || NATIVE(x) ? rb_obj_tainted((VALUE)x) == Qtrue : FL_TEST((x), FL_TAINT)
+# define OBJ_UNTRUSTED(x) (int)(SPECIAL_CONST_P(x) || NATIVE(x) ? rb_obj_untrusted((VALUE)x) == Qtrue : FL_TEST((x), FL_UNTRUSTED))
 # define OBJ_UNTRUST(x)	(rb_obj_untrust((VALUE)x))
 #else
 # define OBJ_TAINTED(x) FL_TEST((x), FL_TAINT)

Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/array/clear_tags.txt
===================================================================
--- MacRuby/trunk/spec/frozen/tags/macruby/core/array/clear_tags.txt	2009-08-11 18:16:11 UTC (rev 2278)
+++ MacRuby/trunk/spec/frozen/tags/macruby/core/array/clear_tags.txt	2009-08-11 18:47:26 UTC (rev 2279)
@@ -1 +0,0 @@
-fails:Array#clear keeps untrusted status

Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/array/compact_tags.txt
===================================================================
--- MacRuby/trunk/spec/frozen/tags/macruby/core/array/compact_tags.txt	2009-08-11 18:16:11 UTC (rev 2278)
+++ MacRuby/trunk/spec/frozen/tags/macruby/core/array/compact_tags.txt	2009-08-11 18:47:26 UTC (rev 2279)
@@ -1,2 +0,0 @@
-fails:Array#compact keeps untrusted status even if all elements are removed
-fails:Array#compact! keeps untrusted status even if all elements are removed
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090811/78c1ea35/attachment-0001.html>