[macruby-changes] [150] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 150
          http://trac.macosforge.org/projects/ruby/changeset/150
Author:   lsansonetti at apple.com
Date:     2008-04-17 20:47:40 -0700 (Thu, 17 Apr 2008)

Log Message:
-----------
fixing #dup, #clone, implementing freeze/taint state

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

Modified: MacRuby/trunk/object.c
===================================================================
--- MacRuby/trunk/object.c	2008-04-18 02:02:26 UTC (rev 149)
+++ MacRuby/trunk/object.c	2008-04-18 03:47:40 UTC (rev 150)
@@ -168,6 +168,10 @@
 	    if (rb_hash_tainted(obj)) 
 		rb_hash_taint(dest);
 	}
+	else if (type == T_STRING) {
+	    if (rb_str_tainted(obj)) 
+		rb_str_taint(dest);
+	}
 	goto call_init_copy;
     }
 #endif
@@ -254,6 +258,8 @@
 	    return rb_ary_clone(obj);
 	if (type == T_HASH)
 	    return rb_hash_clone(obj);
+	if (type == T_STRING)
+	    return rb_str_clone(obj);
         clone = rb_obj_alloc(rb_obj_class(obj));
         init_copy(clone, obj);
 	return clone;
@@ -675,6 +681,18 @@
 VALUE
 rb_obj_tainted(VALUE obj)
 {
+#if WITH_OBJC
+    if (rb_objc_is_non_native(obj)) {
+	int type = TYPE(obj);
+	if (type == T_ARRAY)
+	    return rb_ary_tainted(obj);
+	if (type == T_HASH)
+	    return rb_hash_tainted(obj);
+	if (type == T_STRING)
+	    return rb_str_tainted(obj);
+	return Qfalse;
+    }
+#endif
     if (OBJ_TAINTED(obj))
 	return Qtrue;
     return Qfalse;
@@ -802,8 +820,16 @@
 rb_obj_frozen_p(VALUE obj)
 {
 #if WITH_OBJC
-    if (rb_objc_is_non_native(obj))
+    if (rb_objc_is_non_native(obj)) {
+	int type = TYPE(obj);
+	if (type == T_ARRAY)
+	    return rb_ary_frozen_p(obj);
+	if (type == T_HASH)
+	    return rb_hash_frozen(obj);
+	if (type == T_STRING)
+	    return rb_str_frozen(obj);
 	return Qfalse;
+    }
 #endif
     if (OBJ_FROZEN(obj)) return Qtrue;
     if (SPECIAL_CONST_P(obj)) {

Modified: MacRuby/trunk/string.c
===================================================================
--- MacRuby/trunk/string.c	2008-04-18 02:02:26 UTC (rev 149)
+++ MacRuby/trunk/string.c	2008-04-18 03:47:40 UTC (rev 150)
@@ -99,6 +99,8 @@
 
 struct rb_objc_str_struct {
     void *cfdata;
+    bool tainted;
+    bool frozen;
 };
 
 /* This variable will always stay NULL, we only use its address. */
@@ -124,6 +126,20 @@
     return s;
 }
 
+static void
+rb_objc_str_copy_struct(VALUE old, VALUE new)
+{
+    struct rb_objc_str_struct *s;
+
+    s = rb_objc_str_get_struct(old);
+    if (s != NULL) {
+	struct rb_objc_str_struct *n;
+
+	n = rb_objc_str_get_struct2(new);
+	memcpy(n, s, sizeof(struct rb_objc_str_struct));
+    }
+}
+
 static void *
 rb_str_cfdata(VALUE str)
 {
@@ -1550,20 +1566,58 @@
 #endif
 }
 
+#if WITH_OBJC
 VALUE
 rb_str_freeze(VALUE str)
 {
-#if WITH_OBJC
-    /* TODO */
+    rb_objc_str_get_struct2(str)->frozen = true;
+    return str;
+}
+
+VALUE
+rb_str_frozen(VALUE str)
+{
+    struct rb_objc_str_struct *s;
+    s = rb_objc_str_get_struct(str);
+    return s != NULL && s->frozen ? Qtrue : Qfalse;
+}
+
+VALUE
+rb_str_taint(VALUE str)
+{
+    rb_objc_str_get_struct2(str)->tainted = true;
+    return str;
+}
+
+VALUE
+rb_str_tainted(VALUE str)
+{
+    struct rb_objc_str_struct *s;
+    s = rb_objc_str_get_struct(str);
+    return s != NULL && s->tainted ? Qtrue : Qfalse;
+}
+
+VALUE
+rb_str_clone(VALUE str)
+{
+    VALUE dup = rb_str_dup(str);
+    rb_objc_str_copy_struct(str, dup);
+    return dup;
+}
 #else
+
+VALUE
+rb_str_freeze(VALUE str)
+{
     if (STR_ASSOC_P(str)) {
 	VALUE ary = RSTRING(str)->as.heap.aux.shared;
 	OBJ_FREEZE(ary);
     }
     return rb_obj_freeze(str);
-#endif
 }
 
+#endif
+
 VALUE
 rb_str_dup_frozen(VALUE str)
 {
@@ -3559,6 +3613,8 @@
 	rb_str_modify(str);
 #if WITH_OBJC
 	rb_str_splice(str, BEG(0), END(0) - BEG(0), repl);
+	if (rb_obj_tainted(repl))
+	    rb_str_taint(str);
 #else
 	rb_enc_associate(str, enc);
 	if (OBJ_TAINTED(repl)) tainted = 1;
@@ -3832,6 +3888,8 @@
 #if WITH_OBJC
     rb_str_modify(str);
     CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)str2);
+    if (rb_str_tainted(str2) == Qtrue)
+	rb_str_taint(str);
 #else
     StringValue(str2);
     len = RSTRING_LEN(str2);
@@ -4157,7 +4215,7 @@
 rb_str_to_s(VALUE str)
 {
 #if WITH_OBJC
-    if (rb_objc_str_is_pure(str)) {
+    if (rb_obj_is_kind_of(str, rb_cString) == Qfalse) {
 #else
     if (rb_obj_class(str) != rb_cString) {
 #endif
@@ -7632,7 +7690,10 @@
         rb_objc_import_class((Class)objc_getClass("NSMutableString"));
     FL_UNSET(rb_cStringRuby, RCLASS_OBJC_IMPORTED);
     rb_const_set(rb_cObject, rb_intern("String"), rb_cStringRuby);
-    /* TODO implement freeze/taint */
+    rb_define_method(rb_cString, "taint", rb_str_taint, 0);
+    rb_define_method(rb_cString, "tainted?", rb_str_tainted, 0);
+    rb_define_method(rb_cString, "freeze", rb_str_freeze, 0);
+    rb_define_method(rb_cString, "frozen?", rb_str_frozen, 0);
 #else
     rb_cString  = rb_define_class("String", rb_cObject);
 #endif

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080417/5debd038/attachment-0001.html