April 2008 - macruby-changes - lists.macosforge.org

[131] MacRuby/trunk/array.c
by source_changes＠macosforge.org 05 Apr '08

05 Apr '08

Revision: 131 http://trac.macosforge.org/projects/ruby/changeset/131 Author: lsansonetti(a)apple.com Date: 2008-04-04 17:53:57 -0700 (Fri, 04 Apr 2008) Log Message: ----------- faster #rindex, #uniq Modified Paths: -------------- MacRuby/trunk/array.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2008-04-04 20:59:58 UTC (rev 130) +++ MacRuby/trunk/array.c 2008-04-05 00:53:57 UTC (rev 131) @@ -516,11 +516,8 @@ rb_raise(rb_eArgError, "negative array size"); } #if WITH_OBJC - { - int i; - for (i = 0; i < argc; i++) - rb_ary_insert(ary, i, argv[i]); - } + CFArrayReplaceValues((CFMutableArrayRef)ary, CFRangeMake(0, 0), + (const void **)argv, argc); #else RARRAY(ary)->ptr = ALLOC_N(VALUE, argc); RARRAY(ary)->aux.capa = argc; @@ -1246,6 +1243,12 @@ } } else { +#if WITH_OBJC + i = CFArrayGetLastIndexOfValue((CFArrayRef)ary, CFRangeMake(0, n), + (const void *)val); + if (i != -1) + return LONG2NUM(i); +#else while (i--) { if (rb_equal(RARRAY_AT(ary, i), val)) return LONG2NUM(i); @@ -1253,6 +1256,7 @@ i = n; } } +#endif } return Qnil; } @@ -2623,6 +2627,12 @@ for (i=beg; i<end; i++) { rb_ary_store(ary, i, item); } +# if 0 + const void **vals = (const void **)alloca(sizeof(void *) * (end - beg)); + for (i=beg; i<end; i++) { vals[i] = (const void *)item; } + CFArrayReplaceValues((CFMutableArrayRef)ary, CFRangeMake(beg, end), + vals, end); +# endif #else p = RARRAY_PTR(ary) + beg; pend = p + len; @@ -3167,6 +3177,7 @@ rb_ary_uniq_bang(VALUE ary) { #if WITH_OBJC +# if 0 long i, n; bool changed; @@ -3189,6 +3200,32 @@ } if (!changed) return Qnil; +# else + VALUE hash; + long i, n, n_orig; + bool changed; + + rb_ary_modify(ary); + hash = ary_make_hash(ary, 0); + n_orig = n = RARRAY_LEN(ary); + if (RARRAY_LEN(ary) == RHASH_SIZE(hash)) + return Qnil; + for (i = 0, changed = false; i < n; i++) { + VALUE e; + + e = RARRAY_AT(ary, i); + if (CFDictionaryContainsKey((CFDictionaryRef)hash, (const void *)e)) { + CFDictionaryRemoveValue((CFMutableDictionaryRef)hash, + (const void *)e); + } + else { + CFArrayRemoveValueAtIndex((CFMutableArrayRef)ary, i); + n--; + } + } + if (n != n_orig) + return Qnil; +# endif #else VALUE hash, v, vv; long i, j;

1 0

[130] MacRuby/trunk/array.c
by source_changes＠macosforge.org 04 Apr '08

04 Apr '08

Revision: 130 http://trac.macosforge.org/projects/ruby/changeset/130 Author: lsansonetti(a)apple.com Date: 2008-04-04 13:59:58 -0700 (Fri, 04 Apr 2008) Log Message: ----------- faster Array#index Modified Paths: -------------- MacRuby/trunk/array.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2008-04-02 00:47:10 UTC (rev 129) +++ MacRuby/trunk/array.c 2008-04-04 20:59:58 UTC (rev 130) @@ -1184,21 +1184,30 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary) { VALUE val; - long i; + long n, i; + n = RARRAY_LEN(ary); if (rb_scan_args(argc, argv, "01", &val) == 0) { RETURN_ENUMERATOR(ary, 0, 0); - for (i=0; i<RARRAY_LEN(ary); i++) { + for (i=0; i<n; i++) { if (RTEST(rb_yield(RARRAY_AT(ary, i)))) { return LONG2NUM(i); } } } else { - for (i=0; i<RARRAY_LEN(ary); i++) { +#if WITH_OBJC + CFIndex idx; + idx = CFArrayGetFirstIndexOfValue((CFArrayRef)ary, CFRangeMake(0, n), + (const void *)val); + if (idx != -1) + return LONG2NUM(idx); +#else + for (i=0; i<n; i++) { if (rb_equal(RARRAY_AT(ary, i), val)) return LONG2NUM(i); } +#endif } return Qnil; }

1 0

[129] MacRuby/trunk/test/ruby/test_hash.rb
by source_changes＠macosforge.org 02 Apr '08

02 Apr '08

Revision: 129 http://trac.macosforge.org/projects/ruby/changeset/129 Author: lsansonetti(a)apple.com Date: 2008-04-01 17:47:10 -0700 (Tue, 01 Apr 2008) Log Message: ----------- hashes are not direct instance of Hash anymore Modified Paths: -------------- MacRuby/trunk/test/ruby/test_hash.rb Modified: MacRuby/trunk/test/ruby/test_hash.rb =================================================================== --- MacRuby/trunk/test/ruby/test_hash.rb 2008-04-02 00:16:16 UTC (rev 128) +++ MacRuby/trunk/test/ruby/test_hash.rb 2008-04-02 00:47:10 UTC (rev 129) @@ -105,12 +105,12 @@ def test_s_new h = @cls.new - assert_instance_of(@cls, h) + assert_kind_of(@cls, h) assert_nil(h.default) assert_nil(h['spurious']) h = @cls.new('default') - assert_instance_of(@cls, h) + assert_kind_of(@cls, h) assert_equal('default', h.default) assert_equal('default', h['spurious'])

1 0

[128] MacRuby/trunk/array.c
by source_changes＠macosforge.org 02 Apr '08

02 Apr '08

Revision: 128 http://trac.macosforge.org/projects/ruby/changeset/128 Author: lsansonetti(a)apple.com Date: 2008-04-01 17:16:16 -0700 (Tue, 01 Apr 2008) Log Message: ----------- fixing last known Array regressions Modified Paths: -------------- MacRuby/trunk/array.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2008-04-01 02:23:04 UTC (rev 127) +++ MacRuby/trunk/array.c 2008-04-02 00:16:16 UTC (rev 128) @@ -614,32 +614,41 @@ FL_SET(val, ELTS_SHARED); return val; } +#endif static VALUE -ary_shared_first(int argc, VALUE *argv, VALUE ary, int last) +ary_shared_first(int argc, VALUE *argv, VALUE ary, int last, bool remove) { VALUE nv, result; long n; long offset = 0; + long ary_len; rb_scan_args(argc, argv, "1", &nv); n = NUM2LONG(nv); - if (n > RARRAY_LEN(ary)) { - n = RARRAY_LEN(ary); + ary_len = RARRAY_LEN(ary); + if (n > ary_len) { + n = ary_len; } else if (n < 0) { rb_raise(rb_eArgError, "negative array size"); } if (last) { - offset = RARRAY_LEN(ary) - n; + offset = ary_len - n; } +#if WITH_OBJC + result = rb_ary_new(); + CFArrayAppendArray((CFMutableArrayRef)result, (CFArrayRef)ary, CFRangeMake(offset, n)); + if (remove) + CFArrayReplaceValues((CFMutableArrayRef)ary, CFRangeMake(offset, n), NULL, 0); +#else result = ary_shared_array(rb_cArray, ary); RARRAY(result)->ptr += offset; RARRAY(result)->len = n; +#endif return result; } -#endif /* * call-seq: @@ -735,10 +744,8 @@ } rb_ary_modify_check(ary); -#if WITH_OBJC - rb_notimplement(); /* TODO */ -#else - result = ary_shared_first(argc, argv, ary, Qtrue); + result = ary_shared_first(argc, argv, ary, Qtrue, true); +#if !WITH_OBJC RARRAY(ary)->len -= RARRAY_LEN(result); #endif return result; @@ -801,10 +808,8 @@ } rb_ary_modify_check(ary); -#if WITH_OBJC - rb_notimplement(); -#else - result = ary_shared_first(argc, argv, ary, Qfalse); + result = ary_shared_first(argc, argv, ary, Qfalse, true); +#if !WITH_OBJC n = RARRAY_LEN(result); if (ARY_SHARED_P(ary)) { RARRAY(ary)->ptr += n; @@ -1082,11 +1087,7 @@ return RARRAY_AT(ary, 0); } else { -#if WITH_OBJC - rb_notimplement(); -#else - return ary_shared_first(argc, argv, ary, Qfalse); -#endif + return ary_shared_first(argc, argv, ary, Qfalse, false); } } @@ -1112,11 +1113,7 @@ return RARRAY_AT(ary, n - 1); } else { -#if WITH_OBJC - rb_notimplement(); -#else - return ary_shared_first(argc, argv, ary, Qtrue); -#endif + return ary_shared_first(argc, argv, ary, Qtrue, false); } }

1 0

[127] MacRuby/trunk/object.c
by source_changes＠macosforge.org 01 Apr '08

01 Apr '08

Revision: 127 http://trac.macosforge.org/projects/ruby/changeset/127 Author: lsansonetti(a)apple.com Date: 2008-03-31 19:23:04 -0700 (Mon, 31 Mar 2008) Log Message: ----------- fix rb_obj_freeze so that arrays and hashes can be frozen Modified Paths: -------------- MacRuby/trunk/object.c Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2008-04-01 02:18:42 UTC (rev 126) +++ MacRuby/trunk/object.c 2008-04-01 02:23:04 UTC (rev 127) @@ -758,9 +758,16 @@ rb_obj_freeze(VALUE obj) { #if WITH_OBJC - if (rb_objc_is_non_native(obj)) - rb_raise(rb_eRuntimeError, "can't freeze pure objc object `%s'", - RSTRING_PTR(rb_inspect(obj))); + if (rb_objc_is_non_native(obj)) { + int type = TYPE(obj); + if (type == T_ARRAY) + rb_ary_freeze(obj); + else if (type == T_HASH) + rb_hash_freeze(obj); + else + rb_raise(rb_eRuntimeError, "can't freeze pure objc object `%s'", + RSTRING_PTR(rb_inspect(obj))); + } #endif if (!OBJ_FROZEN(obj)) { if (rb_safe_level() >= 4 && !OBJ_TAINTED(obj)) {

1 0

[126] MacRuby/trunk
by source_changes＠macosforge.org 01 Apr '08

01 Apr '08

Revision: 126 http://trac.macosforge.org/projects/ruby/changeset/126 Author: lsansonetti(a)apple.com Date: 2008-03-31 19:18:42 -0700 (Mon, 31 Mar 2008) Log Message: ----------- fixing Hash#{clone,dup} Modified Paths: -------------- MacRuby/trunk/hash.c MacRuby/trunk/object.c Modified: MacRuby/trunk/hash.c =================================================================== --- MacRuby/trunk/hash.c 2008-04-01 00:29:16 UTC (rev 125) +++ MacRuby/trunk/hash.c 2008-04-01 02:18:42 UTC (rev 126) @@ -347,17 +347,18 @@ s->has_proc_default = has_proc_default; } -VALUE -rb_hash_clone(VALUE hash) +static void +rb_objc_ary_copy_struct(VALUE old, VALUE new) { -#if 0 // TODO - VALUE klass, dup; - long n; + struct rb_objc_hash_struct *s; - klass = rb_obj_class(ary); - dup = hash_alloc(klass); -#endif - return Qnil; + s = rb_objc_hash_get_struct(old); + if (s != NULL) { + struct rb_objc_hash_struct *n; + + n = rb_objc_hash_get_struct2(new); + memcpy(n, s, sizeof(struct rb_objc_hash_struct)); + } } #endif @@ -405,6 +406,23 @@ #endif } +#if WITH_OBJC +static VALUE rb_hash_replace(VALUE, VALUE); + +VALUE +rb_hash_clone(VALUE hash) +{ + VALUE klass, dup; + long n; + + klass = rb_obj_class(hash); + dup = hash_alloc(klass); + rb_hash_replace(dup, hash); + rb_objc_ary_copy_struct(hash, dup); + return dup; +} +#endif + static void rb_hash_modify_check(VALUE hash) { Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2008-04-01 00:29:16 UTC (rev 125) +++ MacRuby/trunk/object.c 2008-04-01 02:18:42 UTC (rev 126) @@ -160,10 +160,14 @@ #if WITH_OBJC if (rb_objc_is_non_native(obj)) { int type = TYPE(obj); - if (type == T_ARRAY) - if (rb_ary_tainted(obj)) rb_ary_taint(dest); - else if (type == T_HASH) - if (rb_hash_tainted(obj)) rb_hash_taint(dest); + if (type == T_ARRAY) { + if (rb_ary_tainted(obj)) + rb_ary_taint(dest); + } + else if (type == T_HASH) { + if (rb_hash_tainted(obj)) + rb_hash_taint(dest); + } goto call_init_copy; } #endif

1 0

[125] MacRuby/trunk
by source_changes＠macosforge.org 01 Apr '08

01 Apr '08

Revision: 125 http://trac.macosforge.org/projects/ruby/changeset/125 Author: lsansonetti(a)apple.com Date: 2008-03-31 17:29:16 -0700 (Mon, 31 Mar 2008) Log Message: ----------- fixing more Array regressions Modified Paths: -------------- MacRuby/trunk/array.c MacRuby/trunk/enumerator.c MacRuby/trunk/hash.c MacRuby/trunk/include/ruby/intern.h MacRuby/trunk/object.c MacRuby/trunk/test/ruby/test_array.rb Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2008-03-31 19:26:59 UTC (rev 124) +++ MacRuby/trunk/array.c 2008-04-01 00:29:16 UTC (rev 125) @@ -41,8 +41,10 @@ } #if WITH_OBJC +/* TODO optimize this */ struct rb_objc_ary_struct { bool frozen; + bool tainted; bool named_args; void *cptr; }; @@ -63,13 +65,29 @@ s = rb_objc_ary_get_struct(ary); if (s == NULL) { - s = xmalloc(sizeof(struct rb_objc_ary_struct)); - rb_objc_set_associative_ref((void *)ary, &rb_objc_ary_assoc_key, s); - s->frozen = false; - s->named_args = false; + s = xmalloc(sizeof(struct rb_objc_ary_struct)); + rb_objc_set_associative_ref((void *)ary, &rb_objc_ary_assoc_key, s); + s->frozen = false; + s->tainted = false; + s->named_args = false; + s->cptr = NULL; } return s; } + +static void +rb_objc_ary_copy_struct(VALUE old, VALUE new) +{ + struct rb_objc_ary_struct *s; + + s = rb_objc_ary_get_struct(old); + if (s != NULL) { + struct rb_objc_ary_struct *n; + + n = rb_objc_ary_get_struct2(new); + memcpy(n, s, sizeof(struct rb_objc_ary_struct)); + } +} #else #define ARY_SHARED_P(a) FL_TEST(a, ELTS_SHARED) @@ -129,6 +147,22 @@ #endif } +#if WITH_OBJC +VALUE +rb_ary_taint(VALUE ary) +{ + rb_objc_ary_get_struct2(ary)->tainted = true; + return ary; +} + +VALUE +rb_ary_tainted(VALUE ary) +{ + struct rb_objc_ary_struct *s = rb_objc_ary_get_struct(ary); + return s != NULL && s->tainted ? Qtrue : Qfalse; +} +#endif + /* * call-seq: * array.frozen? -> true or false @@ -273,9 +307,7 @@ ary = rb_ary_new2(n); if (n > 0 && elts) { #if WITH_OBJC - long i; - for (i = 0; i < n; i++) - rb_ary_insert(ary, i, elts[i]); + CFArrayReplaceValues((CFMutableArrayRef)ary, CFRangeMake(0, 0), (const void **)elts, n); #else MEMCPY(RARRAY_PTR(ary), elts, VALUE, n); RARRAY(ary)->len = n; @@ -1523,10 +1555,10 @@ return Qfalse; } -VALUE -rb_ary_dup(VALUE ary) +#if WITH_OBJC +static inline VALUE +rb_ary_dup2(VALUE ary) { -#if WITH_OBJC VALUE klass, dup; long n; @@ -1536,6 +1568,24 @@ if (n > 0) CFArrayAppendArray((CFMutableArrayRef)dup, (CFArrayRef)ary, CFRangeMake(0, n)); + return dup; +} + +VALUE +rb_ary_clone(VALUE ary) +{ + VALUE dup = rb_ary_dup2(ary); + rb_objc_ary_copy_struct(ary, dup); + return dup; +} +#endif + +VALUE +rb_ary_dup(VALUE ary) +{ +#if WITH_OBJC + VALUE dup = rb_ary_dup2(ary); + /* copy the named_args flag, but not other flags */ if (rb_ary_is_named_args(ary)) rb_ary_set_named_args(dup, true); #else @@ -3692,7 +3742,9 @@ volatile VALUE cc = rb_ary_new2(n); long lev = 0; +#if !WITH_OBJC RBASIC(cc)->klass = 0; +#endif MEMZERO(stack, long, n); stack[0] = -1; for (i = 0; i < nlen; i++) { @@ -3700,7 +3752,11 @@ for (lev++; lev < n; lev++) { rb_ary_store(cc, lev, RARRAY_AT(ary, stack[lev+1] = stack[lev]+1)); } +#if WITH_OBJC + rb_yield(rb_ary_dup(cc)); +#else rb_yield(cc); +#endif do { stack[lev--]++; } while (lev && (stack[lev+1]+n == len+lev+1)); @@ -3925,6 +3981,8 @@ FL_UNSET(rb_cArrayRuby, RCLASS_OBJC_IMPORTED); rb_const_set(rb_cObject, rb_intern("Array"), rb_cArrayRuby); rb_define_method(rb_cArray, "freeze", rb_ary_freeze, 0); + rb_define_method(rb_cArray, "taint", rb_ary_taint, 0); + rb_define_method(rb_cArray, "tainted?", rb_ary_tainted, 0); #else rb_cArray = rb_define_class("Array", rb_cObject); #endif Modified: MacRuby/trunk/enumerator.c =================================================================== --- MacRuby/trunk/enumerator.c 2008-03-31 19:26:59 UTC (rev 124) +++ MacRuby/trunk/enumerator.c 2008-04-01 00:29:16 UTC (rev 125) @@ -241,7 +241,7 @@ else { ptr->iter = enumerator_each_i; } - if (argc) ptr->args = rb_ary_new4(argc, argv); + if (argc) GC_WB(&ptr->args, rb_ary_new4(argc, argv)); ptr->fib = 0; ptr->dst = Qnil; ptr->no_next = Qfalse; Modified: MacRuby/trunk/hash.c =================================================================== --- MacRuby/trunk/hash.c 2008-03-31 19:26:59 UTC (rev 124) +++ MacRuby/trunk/hash.c 2008-04-01 00:29:16 UTC (rev 125) @@ -260,10 +260,12 @@ rb_objc_release(v); } +/* TODO optimize me */ struct rb_objc_hash_struct { VALUE ifnone; bool has_proc_default; bool frozen; + bool tainted; }; /* This variable will always stay NULL, we only use its address. */ @@ -287,6 +289,7 @@ s->ifnone = Qnil; s->has_proc_default = false; s->frozen = false; + s->tainted = false; } return s; } @@ -312,6 +315,27 @@ return s != NULL && s->frozen ? Qtrue : Qfalse; } +VALUE +rb_hash_taint(VALUE hash) +{ + struct rb_objc_hash_struct *s; + + s = rb_objc_hash_get_struct2(hash); + s->tainted = true; + + return hash; +} + +VALUE +rb_hash_tainted(VALUE hash) +{ + struct rb_objc_hash_struct *s; + + s = rb_objc_hash_get_struct(hash); + + return s != NULL && s->tainted ? Qtrue : Qfalse; +} + static void rb_objc_hash_set_struct(VALUE hash, VALUE ifnone, bool has_proc_default) { @@ -322,7 +346,20 @@ GC_WB(&s->ifnone, ifnone); s->has_proc_default = has_proc_default; } + +VALUE +rb_hash_clone(VALUE hash) +{ +#if 0 // TODO + VALUE klass, dup; + long n; + + klass = rb_obj_class(ary); + dup = hash_alloc(klass); #endif + return Qnil; +} +#endif static VALUE hash_alloc(VALUE klass) @@ -3046,6 +3083,8 @@ rb_const_set(rb_cObject, rb_intern("Hash"), rb_cHashRuby); rb_define_method(rb_cHash, "freeze", rb_hash_freeze, 0); rb_define_method(rb_cHash, "frozen?", rb_hash_frozen, 0); + rb_define_method(rb_cHash, "taint", rb_hash_taint, 0); + rb_define_method(rb_cHash, "tainted?", rb_hash_tainted, 0); #else rb_cHash = rb_define_class("Hash", rb_cObject); #endif Modified: MacRuby/trunk/include/ruby/intern.h =================================================================== --- MacRuby/trunk/include/ruby/intern.h 2008-03-31 19:26:59 UTC (rev 124) +++ MacRuby/trunk/include/ruby/intern.h 2008-04-01 00:29:16 UTC (rev 125) @@ -81,6 +81,7 @@ VALUE rb_ary_elt(VALUE, long); void rb_ary_set_named_args(VALUE, bool); bool rb_ary_is_named_args(VALUE); +VALUE rb_ary_clone(VALUE); #endif /* bignum.c */ VALUE rb_big_clone(VALUE); @@ -361,6 +362,9 @@ struct st_table *rb_hash_tbl(VALUE); int rb_path_check(const char*); int rb_env_path_tainted(void); +#if WITH_OBJC +VALUE rb_hash_clone(VALUE); +#endif /* io.c */ #define rb_defout rb_stdout RUBY_EXTERN VALUE rb_fs; Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2008-03-31 19:26:59 UTC (rev 124) +++ MacRuby/trunk/object.c 2008-04-01 00:29:16 UTC (rev 125) @@ -157,6 +157,16 @@ static void init_copy(VALUE dest, VALUE obj) { +#if WITH_OBJC + if (rb_objc_is_non_native(obj)) { + int type = TYPE(obj); + if (type == T_ARRAY) + if (rb_ary_tainted(obj)) rb_ary_taint(dest); + else if (type == T_HASH) + if (rb_hash_tainted(obj)) rb_hash_taint(dest); + goto call_init_copy; + } +#endif if (OBJ_FROZEN(dest)) { rb_raise(rb_eTypeError, "[bug] frozen object (%s) allocated", rb_obj_classname(dest)); } @@ -197,6 +207,7 @@ } break; } +call_init_copy: rb_funcall(dest, id_init_copy, 1, obj); } @@ -234,6 +245,11 @@ } #if WITH_OBJC if (rb_objc_is_non_native(obj)) { + int type = TYPE(obj); + if (type == T_ARRAY) + return rb_ary_clone(obj); + if (type == T_HASH) + return rb_hash_clone(obj); clone = rb_obj_alloc(rb_obj_class(obj)); init_copy(clone, obj); return clone; Modified: MacRuby/trunk/test/ruby/test_array.rb =================================================================== --- MacRuby/trunk/test/ruby/test_array.rb 2008-03-31 19:26:59 UTC (rev 124) +++ MacRuby/trunk/test/ruby/test_array.rb 2008-04-01 00:29:16 UTC (rev 125) @@ -182,14 +182,14 @@ def test_00_new a = @cls.new() - assert_instance_of(@cls, a) + assert_kind_of(@cls, a) assert_equal(0, a.length) assert_nil(a[0]) end def test_01_square_brackets a = @cls[ 5, 4, 3, 2, 1 ] - assert_instance_of(@cls, a) + assert_kind_of(@cls, a) assert_equal(5, a.length) 5.times { |i| assert_equal(5-i, a[i]) } assert_nil(a[6])

1 0