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

[409] MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb
by source_changes＠macosforge.org 05 Aug '08

05 Aug '08

Revision: 409 http://trac.macosforge.org/projects/ruby/changeset/409 Author: rich(a)infoether.com Date: 2008-08-04 18:51:04 -0700 (Mon, 04 Aug 2008) Log Message: ----------- calc float value Modified Paths: -------------- MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb Modified: MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb 2008-08-05 01:35:38 UTC (rev 408) +++ MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb 2008-08-05 01:51:04 UTC (rev 409) @@ -97,7 +97,7 @@ end def sqrt - value.text = Math.sqrt(value.to_f).to_s + value.text = Math.sqrt(float_value).to_s end def clear

1 0

[408] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 05 Aug '08

05 Aug '08

Revision: 408 http://trac.macosforge.org/projects/ruby/changeset/408 Author: lsansonetti(a)apple.com Date: 2008-08-04 18:35:38 -0700 (Mon, 04 Aug 2008) Log Message: ----------- wip Modified Paths: -------------- MacRuby/branches/lrz_unstable/class.c MacRuby/branches/lrz_unstable/objc.m MacRuby/branches/lrz_unstable/proc.c Modified: MacRuby/branches/lrz_unstable/class.c =================================================================== --- MacRuby/branches/lrz_unstable/class.c 2008-08-05 00:36:41 UTC (rev 407) +++ MacRuby/branches/lrz_unstable/class.c 2008-08-05 01:35:38 UTC (rev 408) @@ -666,6 +666,20 @@ * Outer.included_modules #=> [Mixin] */ +static void +rb_mod_included_modules_nosuper(VALUE mod, VALUE ary) +{ + VALUE inc_mods = rb_ivar_get(mod, idIncludedModules); + if (inc_mods != Qnil) { + int i, count = RARRAY_LEN(inc_mods); + for (i = 0; i < count; i++) { + VALUE imod = RARRAY_AT(inc_mods, i); + rb_ary_push(ary, imod); + rb_ary_concat(ary, rb_mod_included_modules(imod)); + } + } +} + VALUE rb_mod_included_modules(VALUE mod) { @@ -673,15 +687,7 @@ #if WITH_OBJC for (p = mod; p; p = RCLASS_SUPER(p)) { - VALUE inc_mods = rb_ivar_get(p, idIncludedModules); - if (inc_mods != Qnil) { - int i, count = RARRAY_LEN(inc_mods); - for (i = 0; i < count; i++) { - VALUE imod = RARRAY_AT(inc_mods, i); - rb_ary_push(ary, imod); - rb_ary_concat(ary, rb_mod_included_modules(imod)); - } - } + rb_mod_included_modules_nosuper(p, ary); if (RCLASS_MODULE(p)) break; } @@ -748,6 +754,8 @@ * Math.ancestors #=> [Math] */ +static void rb_mod_included_modules_nosuper(VALUE, VALUE); + VALUE rb_mod_ancestors(VALUE mod) { @@ -756,7 +764,7 @@ #if WITH_OBJC for (p = mod; p; p = RCLASS_SUPER(p)) { rb_ary_push(ary, p); - rb_ary_concat(ary, rb_mod_included_modules(p)); + rb_mod_included_modules_nosuper(p, ary); if (RCLASS_MODULE(p)) break; } Modified: MacRuby/branches/lrz_unstable/objc.m =================================================================== --- MacRuby/branches/lrz_unstable/objc.m 2008-08-05 00:36:41 UTC (rev 407) +++ MacRuby/branches/lrz_unstable/objc.m 2008-08-05 01:35:38 UTC (rev 408) @@ -1254,7 +1254,7 @@ Method method; char type[128]; long i, argc; - VALUE *argv; + VALUE *argv, klass; NODE *body, *node; rcv = (*(id **)args)[0]; @@ -1278,14 +1278,15 @@ rrcv = rcv == NULL ? Qnil : (VALUE)rcv; mid = rb_intern((const char *)sel); + klass = CLASS_OF(rrcv); - DLOG("RCALL", "[%p %s] node=%p argc=%ld", (void *)rrcv, (char *)sel, body, argc); + DLOG("RCALL", "%c[<%s %p> %s] node=%p", class_isMetaClass((Class)klass) ? '+' : '-', class_getName((Class)klass), (void *)rrcv, (char *)sel, body); VALUE rb_vm_call(rb_thread_t * th, VALUE klass, VALUE recv, VALUE id, ID oid, int argc, const VALUE *argv, const NODE *body, int nosuper); - ret = rb_vm_call(GET_THREAD(), CLASS_OF(rrcv), rrcv, mid, Qnil, + ret = rb_vm_call(GET_THREAD(), klass, rrcv, mid, Qnil, argc, argv, node, 0); method_getReturnType(method, type, sizeof type); Modified: MacRuby/branches/lrz_unstable/proc.c =================================================================== --- MacRuby/branches/lrz_unstable/proc.c 2008-08-05 00:36:41 UTC (rev 407) +++ MacRuby/branches/lrz_unstable/proc.c 2008-08-05 01:35:38 UTC (rev 408) @@ -770,7 +770,9 @@ data->body = body; data->rclass = rclass; data->oid = oid; +#if !WITH_OBJC OBJ_INFECT(method, klass); +#endif return method; } @@ -877,7 +879,9 @@ data->body = orig->body; data->rclass = orig->rclass; data->oid = orig->oid; +#if !WITH_OBJC OBJ_INFECT(method, obj); +#endif return method; }

1 0

[407] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 05 Aug '08

05 Aug '08

Revision: 407 http://trac.macosforge.org/projects/ruby/changeset/407 Author: lsansonetti(a)apple.com Date: 2008-08-04 17:36:41 -0700 (Mon, 04 Aug 2008) Log Message: ----------- wip Modified Paths: -------------- MacRuby/branches/lrz_unstable/array.c MacRuby/branches/lrz_unstable/compile.c MacRuby/branches/lrz_unstable/hash.c MacRuby/branches/lrz_unstable/id.c MacRuby/branches/lrz_unstable/id.h MacRuby/branches/lrz_unstable/numeric.c MacRuby/branches/lrz_unstable/object.c MacRuby/branches/lrz_unstable/string.c MacRuby/branches/lrz_unstable/vm_method.c Modified: MacRuby/branches/lrz_unstable/array.c =================================================================== --- MacRuby/branches/lrz_unstable/array.c 2008-08-04 21:45:36 UTC (rev 406) +++ MacRuby/branches/lrz_unstable/array.c 2008-08-05 00:36:41 UTC (rev 407) @@ -4243,5 +4243,10 @@ rb_define_method(rb_cArray, "drop", rb_ary_drop, 1); rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0); +#if WITH_OBJC + /* to return a mutable copy */ + rb_define_method(rb_cArray, "dup", rb_ary_dup, 0); +#endif + id_cmp = rb_intern("<=>"); } Modified: MacRuby/branches/lrz_unstable/compile.c =================================================================== --- MacRuby/branches/lrz_unstable/compile.c 2008-08-04 21:45:36 UTC (rev 406) +++ MacRuby/branches/lrz_unstable/compile.c 2008-08-05 00:36:41 UTC (rev 407) @@ -918,10 +918,10 @@ MEMCPY(iseq->arg_opt_table, RARRAY_PTR(labels), VALUE, i); #endif for (j = 0; j < i; j++) { - iseq->arg_opt_table[j] &= ~1; #if WITH_OBJC iseq->arg_opt_table[j] = OC2RB(iseq->arg_opt_table[j]); #endif + iseq->arg_opt_table[j] &= ~1; } } else { Modified: MacRuby/branches/lrz_unstable/hash.c =================================================================== --- MacRuby/branches/lrz_unstable/hash.c 2008-08-04 21:45:36 UTC (rev 406) +++ MacRuby/branches/lrz_unstable/hash.c 2008-08-05 00:36:41 UTC (rev 407) @@ -311,6 +311,14 @@ } VALUE +rb_hash_dup(VALUE rcv) +{ + VALUE dup = (VALUE)CFDictionaryCreateMutableCopy(NULL, 0, (CFDictionaryRef)rcv); + CFMakeCollectable((CFTypeRef)dup); + return dup; +} + +VALUE rb_hash_new(void) { #if WITH_OBJC @@ -1918,7 +1926,7 @@ static VALUE rb_hash_merge(VALUE hash1, VALUE hash2) { - return rb_hash_update(rb_obj_dup(hash1), hash2); + return rb_hash_update(rb_hash_dup(hash1), hash2); } static int @@ -3035,6 +3043,8 @@ #if WITH_OBJC /* required because Hash.new can accept a block */ rb_define_singleton_method(rb_cHash, "new", rb_class_new_instance, -1); + /* to return a mutable copy */ + rb_define_method(rb_cHash, "dup", rb_hash_dup, 0); #else rb_define_alloc_func(rb_cHash, hash_alloc); #endif Modified: MacRuby/branches/lrz_unstable/id.c =================================================================== --- MacRuby/branches/lrz_unstable/id.c 2008-08-04 21:45:36 UTC (rev 406) +++ MacRuby/branches/lrz_unstable/id.c 2008-08-05 00:36:41 UTC (rev 407) @@ -59,6 +59,7 @@ selSucc = sel_registerName("succ"); selNot = sel_registerName("!"); selInit = sel_registerName("init"); + selCopy = sel_registerName("copy"); #endif idAREF = rb_intern("[]"); Modified: MacRuby/branches/lrz_unstable/id.h =================================================================== --- MacRuby/branches/lrz_unstable/id.h 2008-08-04 21:45:36 UTC (rev 406) +++ MacRuby/branches/lrz_unstable/id.h 2008-08-05 00:36:41 UTC (rev 407) @@ -71,6 +71,7 @@ extern SEL selSucc; extern SEL selNot; extern SEL selInit; +extern SEL selCopy; extern ID idIncludedModules; extern ID idIncludedInClasses; #endif Modified: MacRuby/branches/lrz_unstable/numeric.c =================================================================== --- MacRuby/branches/lrz_unstable/numeric.c 2008-08-04 21:45:36 UTC (rev 406) +++ MacRuby/branches/lrz_unstable/numeric.c 2008-08-05 00:36:41 UTC (rev 407) @@ -3216,8 +3216,9 @@ #if WITH_OBJC rb_cCFNumber = (VALUE)objc_getClass("NSCFNumber"); rb_cNumeric = rb_define_class("Numeric", (VALUE)objc_getClass("NSNumber")); - // We need to redefine #class because otherwise NSObject#class will return NSCFNumber for all numeric types. + /* overriding NSObject methods */ rb_define_method(rb_cNumeric, "class", rb_obj_class, 0); + rb_define_method(rb_cNumeric, "dup", rb_obj_dup, 0); #else rb_cNumeric = rb_define_class("Numeric", rb_cObject); #endif Modified: MacRuby/branches/lrz_unstable/object.c =================================================================== --- MacRuby/branches/lrz_unstable/object.c 2008-08-04 21:45:36 UTC (rev 406) +++ MacRuby/branches/lrz_unstable/object.c 2008-08-05 00:36:41 UTC (rev 407) @@ -15,6 +15,7 @@ #include "ruby/st.h" #include "ruby/util.h" #include "debug.h" +#include "id.h" #include <stdio.h> #include <errno.h> #include <ctype.h> @@ -352,7 +353,7 @@ { VALUE dup; - if (rb_special_const_p(obj)) { + if (rb_special_const_p(obj) || TYPE(obj) == T_SYMBOL) { rb_raise(rb_eTypeError, "can't dup %s", rb_obj_classname(obj)); } dup = rb_obj_alloc(rb_obj_class(obj)); @@ -361,6 +362,14 @@ return dup; } +#if WITH_OBJC +static VALUE +rb_nsobj_dup(VALUE obj) +{ + return (VALUE)objc_msgSend((id)obj, selCopy); +} +#endif + /* :nodoc: */ VALUE rb_obj_init_copy(VALUE obj, VALUE orig) @@ -2640,9 +2649,18 @@ // #class is already defined in NSObject rb_define_method(rb_mKernel, "class", rb_obj_class, 0); #endif + +#if WITH_OBJC + rb_define_method(rb_cObject, "clone", rb_obj_clone, 0); + rb_define_method(rb_cObject, "dup", rb_obj_dup, 0); + rb_define_method(rb_cObject, "copy", rb_obj_dup, 0); + rb_define_method(rb_cObject, "initialize_copy", rb_obj_init_copy, 1); + rb_define_method(rb_cNSObject, "dup", rb_nsobj_dup, 0); +#else rb_define_method(rb_mKernel, "clone", rb_obj_clone, 0); rb_define_method(rb_mKernel, "dup", rb_obj_dup, 0); rb_define_method(rb_mKernel, "initialize_copy", rb_obj_init_copy, 1); +#endif rb_define_method(rb_mKernel, "taint", rb_obj_taint, 0); rb_define_method(rb_mKernel, "tainted?", rb_obj_tainted, 0); Modified: MacRuby/branches/lrz_unstable/string.c =================================================================== --- MacRuby/branches/lrz_unstable/string.c 2008-08-04 21:45:36 UTC (rev 406) +++ MacRuby/branches/lrz_unstable/string.c 2008-08-05 00:36:41 UTC (rev 407) @@ -891,15 +891,22 @@ VALUE rb_str_dup(VALUE str) { +#if WITH_OBJC + VALUE dup; + void *data; + + dup = (VALUE)CFStringCreateMutableCopy(NULL, 0, (CFStringRef)str); + + data = rb_str_cfdata2(str); + if (data != NULL) + rb_str_cfdata_set(dup, data); + + CFMakeCollectable((CFTypeRef)dup); +#else VALUE dup = str_alloc(rb_obj_class(str)); rb_str_replace(dup, str); -#if WITH_OBJC - { - void *data = rb_str_cfdata2(str); - if (data != NULL) - rb_str_cfdata_set(dup, data); - } #endif + return dup; } @@ -8714,6 +8721,9 @@ #if WITH_OBJC rb_define_method(rb_cString, "transform", rb_str_transform, 1); rb_define_method(rb_cString, "transform!", rb_str_transform_bang, 1); + + /* to return a mutable copy */ + rb_define_method(rb_cString, "dup", rb_str_dup, 0); #endif id_to_s = rb_intern("to_s"); @@ -8723,6 +8733,7 @@ rb_define_variable("$-F", &rb_fs); #if WITH_OBJC // rb_cSymbol is defined in parse.y because it's needed early + rb_set_class_path(rb_cSymbol, rb_cObject, "Symbol"); #else rb_cSymbol = rb_define_class("Symbol", rb_cObject); rb_include_module(rb_cSymbol, rb_mComparable); @@ -8735,6 +8746,7 @@ rb_define_method(rb_cSymbol, "inspect", sym_inspect, 0); #if WITH_OBJC rb_define_method(rb_cSymbol, "description", sym_inspect, 0); + rb_define_method(rb_cSymbol, "dup", rb_obj_dup, 0); #endif rb_define_method(rb_cSymbol, "to_proc", sym_to_proc, 0); rb_define_method(rb_cSymbol, "to_s", rb_sym_to_s, 0); Modified: MacRuby/branches/lrz_unstable/vm_method.c =================================================================== --- MacRuby/branches/lrz_unstable/vm_method.c 2008-08-04 21:45:36 UTC (rev 406) +++ MacRuby/branches/lrz_unstable/vm_method.c 2008-08-05 00:36:41 UTC (rev 407) @@ -437,12 +437,25 @@ origin = rb_method_node(RCLASS_SUPER(klass), name) == fbody ? RCLASS_SUPER(klass) : klass; } + if (fbody == NULL) { + rb_print_undef(klass, name, 0); + } + if (fbody->nd_noex != noex) { + if (nd_type(fbody->nd_body) == NODE_CFUNC) { + rb_vm_check_redefinition_opt_method(fbody); + } + if (klass == origin) { + fbody->nd_noex = noex; + } + else { + rb_add_method(klass, name, NEW_ZSUPER(), noex); + } + } #else fbody = search_method(klass, name, &origin); if (!fbody && TYPE(klass) == T_MODULE) { fbody = search_method(rb_cObject, name, &origin); } -#endif if (!fbody || !fbody->nd_body) { rb_print_undef(klass, name, 0); } @@ -457,6 +470,7 @@ rb_add_method(klass, name, NEW_ZSUPER(), noex); } } +#endif } int

1 0

[406] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 04 Aug '08

04 Aug '08

Revision: 406 http://trac.macosforge.org/projects/ruby/changeset/406 Author: lsansonetti(a)apple.com Date: 2008-08-04 14:45:36 -0700 (Mon, 04 Aug 2008) Log Message: ----------- wip Modified Paths: -------------- MacRuby/branches/lrz_unstable/class.c MacRuby/branches/lrz_unstable/hash.c MacRuby/branches/lrz_unstable/include/ruby/node.h MacRuby/branches/lrz_unstable/include/ruby/ruby.h MacRuby/branches/lrz_unstable/objc.m MacRuby/branches/lrz_unstable/object.c MacRuby/branches/lrz_unstable/sample/test.rb MacRuby/branches/lrz_unstable/vm_eval.c MacRuby/branches/lrz_unstable/vm_insnhelper.c Modified: MacRuby/branches/lrz_unstable/class.c =================================================================== --- MacRuby/branches/lrz_unstable/class.c 2008-08-04 05:38:19 UTC (rev 405) +++ MacRuby/branches/lrz_unstable/class.c 2008-08-04 21:45:36 UTC (rev 406) @@ -566,6 +566,8 @@ rb_include_module(VALUE klass, VALUE module) { #if WITH_OBJC + Method *methods; + unsigned int i, methods_count; VALUE ary; rb_frozen_class_p(klass); @@ -580,6 +582,8 @@ ary = rb_ary_new(); rb_ivar_set(klass, idIncludedModules, ary); } + if (rb_ary_includes(ary, module)) + return; rb_ary_insert(ary, 0, module); ary = rb_ivar_get(module, idIncludedInClasses); @@ -591,9 +595,6 @@ DLOG("INCM", "%s <- %s", class_getName((Class)klass), class_getName((Class)module)); - Method *methods; - unsigned int i, methods_count; - methods = class_copyMethodList((Class)module, &methods_count); for (i = 0; i < methods_count; i++) { Method method = methods[i]; @@ -668,23 +669,29 @@ VALUE rb_mod_included_modules(VALUE mod) { - VALUE ary = rb_ary_new(); - VALUE p; + VALUE p, ary = rb_ary_new(); - for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) { #if WITH_OBJC + for (p = mod; p; p = RCLASS_SUPER(p)) { VALUE inc_mods = rb_ivar_get(p, idIncludedModules); if (inc_mods != Qnil) { int i, count = RARRAY_LEN(inc_mods); - for (i = 0; i < count; i++) - rb_ary_push(ary, RARRAY_AT(inc_mods, i)); + for (i = 0; i < count; i++) { + VALUE imod = RARRAY_AT(inc_mods, i); + rb_ary_push(ary, imod); + rb_ary_concat(ary, rb_mod_included_modules(imod)); + } } + if (RCLASS_MODULE(p)) + break; + } #else + for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) { if (BUILTIN_TYPE(p) == T_ICLASS) { rb_ary_push(ary, RBASIC(p)->klass); } + } #endif - } return ary; } @@ -745,19 +752,16 @@ rb_mod_ancestors(VALUE mod) { VALUE p, ary = rb_ary_new(); - + +#if WITH_OBJC for (p = mod; p; p = RCLASS_SUPER(p)) { -#if WITH_OBJC - VALUE inc_mods; - rb_ary_push(ary, p); - inc_mods = rb_ivar_get(p, idIncludedModules); - if (inc_mods != Qnil) { - int i, count; - for (i = 0, count = RARRAY_LEN(inc_mods); i < count; i++) - rb_ary_push(ary, RARRAY_AT(inc_mods, i)); - } + rb_ary_concat(ary, rb_mod_included_modules(p)); + if (RCLASS_MODULE(p)) + break; + } #else + for (p = mod; p; p = RCLASS_SUPER(p)) { if (RCLASS_SINGLETON(p)) continue; if (BUILTIN_TYPE(p) == T_ICLASS) { @@ -766,8 +770,8 @@ else { rb_ary_push(ary, p); } + } #endif - } return ary; } Modified: MacRuby/branches/lrz_unstable/hash.c =================================================================== --- MacRuby/branches/lrz_unstable/hash.c 2008-08-04 05:38:19 UTC (rev 405) +++ MacRuby/branches/lrz_unstable/hash.c 2008-08-04 21:45:36 UTC (rev 406) @@ -3032,7 +3032,10 @@ rb_include_module(rb_cHash, rb_mEnumerable); -#if !WITH_OBJC +#if WITH_OBJC + /* required because Hash.new can accept a block */ + rb_define_singleton_method(rb_cHash, "new", rb_class_new_instance, -1); +#else rb_define_alloc_func(rb_cHash, hash_alloc); #endif rb_define_singleton_method(rb_cHash, "[]", rb_hash_s_create, -1); Modified: MacRuby/branches/lrz_unstable/include/ruby/node.h =================================================================== --- MacRuby/branches/lrz_unstable/include/ruby/node.h 2008-08-04 05:38:19 UTC (rev 405) +++ MacRuby/branches/lrz_unstable/include/ruby/node.h 2008-08-04 21:45:36 UTC (rev 406) @@ -509,6 +509,7 @@ #if WITH_OBJC void rb_objc_register_ruby_method(VALUE, ID, NODE *); NODE *rb_objc_method_node(VALUE, ID, IMP *, SEL *); +NODE *rb_objc_method_node2(VALUE, SEL, IMP *); #endif NODE *rb_node_newnode(enum node_type,VALUE,VALUE,VALUE); Modified: MacRuby/branches/lrz_unstable/include/ruby/ruby.h =================================================================== --- MacRuby/branches/lrz_unstable/include/ruby/ruby.h 2008-08-04 05:38:19 UTC (rev 405) +++ MacRuby/branches/lrz_unstable/include/ruby/ruby.h 2008-08-04 21:45:36 UTC (rev 406) @@ -1203,15 +1203,15 @@ if (k == (Class)rb_cSymbol) return T_SYMBOL; if (k == (Class)rb_cCFString || (RCLASS_VERSION(k) & RCLASS_IS_STRING_SUBCLASS) - == RCLASS_IS_STRING_SUBCLASS) + == RCLASS_IS_STRING_SUBCLASS) return T_STRING; if (k == (Class)rb_cCFArray || (RCLASS_VERSION(k) & RCLASS_IS_ARRAY_SUBCLASS) - == RCLASS_IS_ARRAY_SUBCLASS) + == RCLASS_IS_ARRAY_SUBCLASS) return T_ARRAY; if (k == (Class)rb_cCFHash || (RCLASS_VERSION(k) & RCLASS_IS_HASH_SUBCLASS) - == RCLASS_IS_HASH_SUBCLASS) + == RCLASS_IS_HASH_SUBCLASS) return T_HASH; if (NATIVE(obj)) return T_NATIVE; } Modified: MacRuby/branches/lrz_unstable/objc.m =================================================================== --- MacRuby/branches/lrz_unstable/objc.m 2008-08-04 05:38:19 UTC (rev 405) +++ MacRuby/branches/lrz_unstable/objc.m 2008-08-04 21:45:36 UTC (rev 406) @@ -1020,7 +1020,7 @@ char buf[128]; void *imp; - DLOG("OCALL", "[<%s %p> %s]", class_getName((Class)klass), (void *)ocrcv, (char *)ctx->selector); + DLOG("OCALL", "%c[<%s %p> %s]", class_isMetaClass(klass) ? '+' : '-', class_getName(klass), (void *)ocrcv, (char *)ctx->selector); count = method_getNumberOfArguments(ctx->method); assert(count >= 2); Modified: MacRuby/branches/lrz_unstable/object.c =================================================================== --- MacRuby/branches/lrz_unstable/object.c 2008-08-04 05:38:19 UTC (rev 405) +++ MacRuby/branches/lrz_unstable/object.c 2008-08-04 21:45:36 UTC (rev 406) @@ -1329,9 +1329,7 @@ VALUE rb_class_inherited_p(VALUE mod, VALUE arg) { -#if !WITH_OBJC VALUE start = mod; -#endif if (mod == arg) return Qtrue; switch (TYPE(arg)) { @@ -1341,7 +1339,18 @@ default: rb_raise(rb_eTypeError, "compared with non class/module"); } -#if WITH_OBJC // TODO +#if WITH_OBJC + while (mod) { + if (mod == arg) + return Qtrue; + mod = RCLASS_SUPER(mod); + } + /* not mod < arg; check if mod > arg */ + while (arg) { + if (arg == start) + return Qfalse; + arg = RCLASS_SUPER(arg); + } #else while (mod) { if (RCLASS_M_TBL(mod) == RCLASS_M_TBL(arg)) Modified: MacRuby/branches/lrz_unstable/sample/test.rb =================================================================== --- MacRuby/branches/lrz_unstable/sample/test.rb 2008-08-04 05:38:19 UTC (rev 405) +++ MacRuby/branches/lrz_unstable/sample/test.rb 2008-08-04 21:45:36 UTC (rev 406) @@ -1910,8 +1910,8 @@ test_ok([TEST1,TEST2,TEST3,TEST4] == [1,2,6,8]) -test_ok((String <=> Object) == -1) -test_ok((Object <=> String) == 1) +test_ok((String <=> NSObject) == -1) +test_ok((NSObject <=> String) == 1) test_ok((Array <=> String) == nil) test_check "clone" Modified: MacRuby/branches/lrz_unstable/vm_eval.c =================================================================== --- MacRuby/branches/lrz_unstable/vm_eval.c 2008-08-04 05:38:19 UTC (rev 405) +++ MacRuby/branches/lrz_unstable/vm_eval.c 2008-08-04 21:45:36 UTC (rev 406) @@ -210,7 +210,7 @@ if (imp != NULL && method == NULL) return rb_objc_call(recv, sel, argc, (VALUE *)argv); - DLOG("RCALL", "[<%s %p> %s] node=%p", class_getName((Class)klass), (void *)recv, (char *)sel, method); + DLOG("RCALL", "%c[<%s %p> %s] node=%p", class_isMetaClass((Class)klass) ? '+' : '-', class_getName((Class)klass), (void *)recv, (char *)sel, method); if (method == NULL) { int missing_scope = scope == 2 ? NOEX_VCALL : scope == 3 ? NOEX_SUPER : NOEX_VCALL; Modified: MacRuby/branches/lrz_unstable/vm_insnhelper.c =================================================================== --- MacRuby/branches/lrz_unstable/vm_insnhelper.c 2008-08-04 05:38:19 UTC (rev 405) +++ MacRuby/branches/lrz_unstable/vm_insnhelper.c 2008-08-04 21:45:36 UTC (rev 406) @@ -531,13 +531,10 @@ else { #endif - NODE *rb_objc_method_node2(VALUE mod, SEL sel, IMP *pimp); + mn = sel == 0 + ? rb_objc_method_node(klass, id, &imp, &sel) + : rb_objc_method_node2(klass, sel, &imp); - if (sel == 0) - mn = rb_objc_method_node(klass, id, &imp, &sel); - else - mn = rb_objc_method_node2(klass, sel, &imp); - if (flag & VM_CALL_SEND_BIT) { vm_send_optimize(cfp, (NODE **)&mn, (rb_num_t *)&flag, (rb_num_t *)&num, (ID *)&id, klass); } @@ -571,7 +568,7 @@ return val; } - DLOG("RCALL", "[<%s %p> %s] node=%p", class_getName((Class)klass), (void *)recv, (char *)sel, mn); + DLOG("RCALL", "%c[<%s %p> %s] node=%p", class_isMetaClass((Class)klass) ? '+' : '-', class_getName((Class)klass), (void *)recv, (char *)sel, mn); #endif start_method_dispatch:

1 0

[405] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 04 Aug '08

04 Aug '08

Revision: 405 http://trac.macosforge.org/projects/ruby/changeset/405 Author: lsansonetti(a)apple.com Date: 2008-08-03 22:38:19 -0700 (Sun, 03 Aug 2008) Log Message: ----------- wip Modified Paths: -------------- MacRuby/branches/lrz_unstable/class.c MacRuby/branches/lrz_unstable/gc.c MacRuby/branches/lrz_unstable/include/ruby/ruby.h MacRuby/branches/lrz_unstable/sample/test.rb Modified: MacRuby/branches/lrz_unstable/class.c =================================================================== --- MacRuby/branches/lrz_unstable/class.c 2008-08-03 21:08:32 UTC (rev 404) +++ MacRuby/branches/lrz_unstable/class.c 2008-08-04 05:38:19 UTC (rev 405) @@ -35,14 +35,17 @@ do { if (ocsuper == (Class)rb_cArray) { rb_objc_install_array_primitives(ocklass); + RCLASS_SET_VERSION_FLAG(ocklass, RCLASS_IS_ARRAY_SUBCLASS); return true; } if (ocsuper == (Class)rb_cHash) { rb_objc_install_hash_primitives(ocklass); + RCLASS_SET_VERSION_FLAG(ocklass, RCLASS_IS_HASH_SUBCLASS); return true; } if (ocsuper == (Class)rb_cString) { rb_objc_install_string_primitives(ocklass); + RCLASS_SET_VERSION_FLAG(ocklass, RCLASS_IS_STRING_SUBCLASS); return true; } ocsuper = class_getSuperclass(ocsuper); Modified: MacRuby/branches/lrz_unstable/gc.c =================================================================== --- MacRuby/branches/lrz_unstable/gc.c 2008-08-03 21:08:32 UTC (rev 404) +++ MacRuby/branches/lrz_unstable/gc.c 2008-08-04 05:38:19 UTC (rev 405) @@ -2251,6 +2251,48 @@ int count; }; +static int +rb_objc_yield_classes(VALUE of) +{ + int i, count, rcount; + Class *buf; + + count = objc_getClassList(NULL, 0); + assert(count > 0); + + buf = (Class *)alloca(sizeof(Class) * count); + objc_getClassList(buf, count); + + for (i = rcount = 0; i < count; i++) { + Class sk, k = buf[i]; + bool nsobject_based; + + if (class_getName(k)[0] == '_') + continue; + + if (of == rb_cModule && !RCLASS_MODULE(k)) + continue; + + nsobject_based = false; + sk = k; + do { + sk = (Class)RCLASS_SUPER(sk); + if (sk == (Class)rb_cNSObject) { + nsobject_based = true; + break; + } + } + while (sk != NULL); + + if (nsobject_based) { + rb_yield((VALUE)k); + rcount++; + } + } + + return rcount; +} + static void rb_objc_recorder(task_t task, void *context, unsigned type_mask, vm_range_t *ranges, unsigned range_count) @@ -2266,48 +2308,29 @@ auto_zone_get_layout_type_no_lock(__auto_zone, (void *)r->address); if (type != AUTO_OBJECT_SCANNED && type != AUTO_OBJECT_UNSCANNED) continue; + if (*(Class *)r->address == NULL) + continue; if (ctx->class_of != 0) { -#if 0 - if (ctx->class_of == rb_cClass || ctx->class_of == rb_cModule) { - /* Class/Module are a special case. */ - if (NATIVE(r->address) - || FL_TEST(r->address, FL_SINGLETON)) - continue; - if (ctx->class_of == rb_cClass) { - /* Only match classes. */ - if (BUILTIN_TYPE(r->address) != T_CLASS) - continue; + bool ok = false; + for (c = *(Class *)r->address; c != NULL; + c = class_getSuperclass(c)) { + if (c ==(Class)ctx->class_of) { + ok = true; + break; } - else { - /* Match classes & modules. */ - if (BUILTIN_TYPE(r->address) != T_CLASS - && BUILTIN_TYPE(r->address) != T_MODULE) - continue; - } } - else -#endif - { - unsigned ok = 0; - for (c = *(Class *)r->address; c != NULL; - c = class_getSuperclass(c)) { - if (c ==(Class)ctx->class_of) { - ok = 1; - break; - } - } - if (!ok) - continue; - } + if (!ok) + continue; } - switch (BUILTIN_TYPE(r->address)) { + switch (TYPE(r->address)) { case T_NONE: - case T_ICLASS: case T_NODE: continue; + case T_ICLASS: case T_CLASS: - if (RCLASS_SINGLETON(r->address)) - continue; + case T_MODULE: + rb_bug("object %p of type %d should not be recorded", + (void *)r->address, TYPE(r->address)); case T_NATIVE: if (rb_objc_is_placeholder((void *)r->address)) continue; @@ -2408,11 +2431,20 @@ } RETURN_ENUMERATOR(os, 1, &of); #if WITH_OBJC - struct rb_objc_recorder_context ctx = {of, 0}; - (((malloc_zone_t *)__auto_zone)->introspect->enumerator)( + /* Class/Module are a special case, because they are not auto objects */ + int count = rb_objc_yield_classes(of); + + if (of != rb_cClass && of != rb_cModule) { + struct rb_objc_recorder_context ctx = {of, count}; + + (((malloc_zone_t *)__auto_zone)->introspect->enumerator)( mach_task_self(), (void *)&ctx, MALLOC_PTR_IN_USE_RANGE_TYPE, (vm_address_t)__auto_zone, NULL, rb_objc_recorder); - return INT2FIX(ctx.count); + + count = ctx.count; + } + + return INT2FIX(count); #else return os_obj_of(&rb_objspace, of); #endif Modified: MacRuby/branches/lrz_unstable/include/ruby/ruby.h =================================================================== --- MacRuby/branches/lrz_unstable/include/ruby/ruby.h 2008-08-03 21:08:32 UTC (rev 404) +++ MacRuby/branches/lrz_unstable/include/ruby/ruby.h 2008-08-04 05:38:19 UTC (rev 405) @@ -502,6 +502,9 @@ # define RCLASS_IS_SINGLETON 0x800 /* class represents a singleton/metaclass */ # define RCLASS_IS_FROZEN 0x1000 /* class is frozen */ # define RCLASS_IS_TAINTED 0x2000 /* class is tainted */ +# define RCLASS_IS_STRING_SUBCLASS 0x10000 /* class is a subclass of NSCFString */ +# define RCLASS_IS_ARRAY_SUBCLASS 0x20000 /* class is a subclass of NSCFArray */ +# define RCLASS_IS_HASH_SUBCLASS 0x40000 /* class is a subclass of NSCFDictionary */ # if __OBJC2__ # define RCLASS_VERSION(m) (class_getVersion((Class)m)) # define RCLASS_SET_VERSION_FLAG(m,f) (class_setVersion((Class)m, (RCLASS_VERSION(m) | f))) @@ -1198,9 +1201,18 @@ else return T_CLASS; } if (k == (Class)rb_cSymbol) return T_SYMBOL; - if (k == (Class)rb_cCFString) return T_STRING; - if (k == (Class)rb_cCFArray) return T_ARRAY; - if (k == (Class)rb_cCFHash) return T_HASH; + if (k == (Class)rb_cCFString + || (RCLASS_VERSION(k) & RCLASS_IS_STRING_SUBCLASS) + == RCLASS_IS_STRING_SUBCLASS) + return T_STRING; + if (k == (Class)rb_cCFArray + || (RCLASS_VERSION(k) & RCLASS_IS_ARRAY_SUBCLASS) + == RCLASS_IS_ARRAY_SUBCLASS) + return T_ARRAY; + if (k == (Class)rb_cCFHash + || (RCLASS_VERSION(k) & RCLASS_IS_HASH_SUBCLASS) + == RCLASS_IS_HASH_SUBCLASS) + return T_HASH; if (NATIVE(obj)) return T_NATIVE; } #endif Modified: MacRuby/branches/lrz_unstable/sample/test.rb =================================================================== --- MacRuby/branches/lrz_unstable/sample/test.rb 2008-08-03 21:08:32 UTC (rev 404) +++ MacRuby/branches/lrz_unstable/sample/test.rb 2008-08-04 05:38:19 UTC (rev 405) @@ -1879,7 +1879,6 @@ false end -=begin for script in Dir["#{dir}{lib,sample,ext,test}/**/*.rb"] unless valid_syntax? IO::read(script), script STDERR.puts script @@ -1887,7 +1886,6 @@ end end test_ok(!$bad) -=end test_check "const" TEST1 = 1

1 0

[404] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 03 Aug '08

03 Aug '08

Revision: 404 http://trac.macosforge.org/projects/ruby/changeset/404 Author: lsansonetti(a)apple.com Date: 2008-08-03 14:08:32 -0700 (Sun, 03 Aug 2008) Log Message: ----------- re-define alloc on primitive subclasses Modified Paths: -------------- MacRuby/branches/lrz_unstable/array.c MacRuby/branches/lrz_unstable/hash.c MacRuby/branches/lrz_unstable/string.c Modified: MacRuby/branches/lrz_unstable/array.c =================================================================== --- MacRuby/branches/lrz_unstable/array.c 2008-08-03 19:10:34 UTC (rev 403) +++ MacRuby/branches/lrz_unstable/array.c 2008-08-03 21:08:32 UTC (rev 404) @@ -4111,6 +4111,8 @@ class_addMethod(klass, sel_registerName("_cfindexOfObject:inRange:"), method_getImplementation(m), method_getTypeEncoding(m)); } + + rb_define_alloc_func((VALUE)klass, ary_alloc); #undef INSTALL_METHOD } Modified: MacRuby/branches/lrz_unstable/hash.c =================================================================== --- MacRuby/branches/lrz_unstable/hash.c 2008-08-03 19:10:34 UTC (rev 403) +++ MacRuby/branches/lrz_unstable/hash.c 2008-08-03 21:08:32 UTC (rev 404) @@ -3007,6 +3007,8 @@ INSTALL_METHOD("isEqual:", imp_rb_hash_isEqual); INSTALL_METHOD("containsObject:", imp_rb_hash_containsObject); + rb_define_alloc_func((VALUE)klass, hash_alloc); + #undef INSTALL_METHOD } #endif Modified: MacRuby/branches/lrz_unstable/string.c =================================================================== --- MacRuby/branches/lrz_unstable/string.c 2008-08-03 19:10:34 UTC (rev 403) +++ MacRuby/branches/lrz_unstable/string.c 2008-08-03 21:08:32 UTC (rev 404) @@ -8508,6 +8508,8 @@ INSTALL_METHOD("_fastestEncodingInCFStringEncoding", imp_rb_str_fastestEncodingInCFStringEncoding); INSTALL_METHOD("isEqual:", imp_rb_str_isEqual); + + rb_define_alloc_func((VALUE)klass, str_alloc); } static CFIndex

1 0

[403] MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb
by source_changes＠macosforge.org 03 Aug '08

03 Aug '08

Revision: 403 http://trac.macosforge.org/projects/ruby/changeset/403 Author: rich(a)infoether.com Date: 2008-08-03 12:10:34 -0700 (Sun, 03 Aug 2008) Log Message: ----------- refactor to make more pretty Modified Paths: -------------- MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb Modified: MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb 2008-08-03 18:52:02 UTC (rev 402) +++ MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb 2008-08-03 19:10:34 UTC (rev 403) @@ -19,19 +19,32 @@ def show application do |app| - window :frame => [100, 100, 220, 280], :title => "Calculator", :view => :nolayout, :style => [:titled, :closable, :miniturizable] do |win| - @value = text_field :frame => [10, 230, 200, 40], :text => "0", :font => font(:name => "Tahoma", :size => 22), :text_align => :right - win << value - @button_view = view :frame => [10, 10, 200, 240] - win << button_view - add_buttons - win.will_close { exit } - end + main_window << value + main_window << button_view + main_window.will_close { exit } end end private + def main_window(&block) + @main_window ||= window(:frame => [100, 100, 220, 280], :title => "Calculator", :view => :nolayout, :style => [:titled, :closable, :miniturizable], &block) + end + + def value + @value ||= text_field(:frame => [10, 230, 200, 40], :text => "0", :font => font(:name => "Tahoma", :size => 22), :text_align => :right) + end + + def button_view + @button_view || create_button_view + end + + def create_button_view + @button_view = view(:frame => [10, 10, 200, 240]) + add_buttons + @button_view + end + def add_buttons calc_button("CL", 0, 4) { clear } calc_button("SQR", 1, 4) { sqrt }

1 0

[402] MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb
by source_changes＠macosforge.org 03 Aug '08

03 Aug '08

Revision: 402 http://trac.macosforge.org/projects/ruby/changeset/402 Author: rich(a)infoether.com Date: 2008-08-03 11:52:02 -0700 (Sun, 03 Aug 2008) Log Message: ----------- fix attribution (tis Jon) Modified Paths: -------------- MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb Modified: MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb 2008-08-03 05:54:19 UTC (rev 401) +++ MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb 2008-08-03 18:52:02 UTC (rev 402) @@ -1,5 +1,5 @@ # -# Port of John Lipsky's weblog post: http://blog.elevenworks.com/?p=38 +# Port of Jon Lipsky's weblog post: http://blog.elevenworks.com/?p=38 # require 'hotcocoa'

1 0

[401] MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb
by source_changes＠macosforge.org 03 Aug '08

03 Aug '08

Revision: 401 http://trac.macosforge.org/projects/ruby/changeset/401 Author: rich(a)infoether.com Date: 2008-08-02 22:54:19 -0700 (Sat, 02 Aug 2008) Log Message: ----------- use floats Modified Paths: -------------- MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb Modified: MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb 2008-08-03 05:23:47 UTC (rev 400) +++ MacRuby/trunk/sample-macruby/HotCocoa/calculator.rb 2008-08-03 05:54:19 UTC (rev 401) @@ -84,7 +84,7 @@ end def sqrt - value.text = Math.sqrt(value.to_i).to_s + value.text = Math.sqrt(value.to_f).to_s end def clear

1 0

[400] MacRuby/branches/lrz_unstable/array.c
by source_changes＠macosforge.org 03 Aug '08

03 Aug '08

Revision: 400 http://trac.macosforge.org/projects/ruby/changeset/400 Author: lsansonetti(a)apple.com Date: 2008-08-02 22:23:47 -0700 (Sat, 02 Aug 2008) Log Message: ----------- faster Array#count Modified Paths: -------------- MacRuby/branches/lrz_unstable/array.c Modified: MacRuby/branches/lrz_unstable/array.c =================================================================== --- MacRuby/branches/lrz_unstable/array.c 2008-08-03 05:23:25 UTC (rev 399) +++ MacRuby/branches/lrz_unstable/array.c 2008-08-03 05:23:47 UTC (rev 400) @@ -3351,17 +3351,14 @@ } else { VALUE obj; - long i, count = RARRAY_LEN(ary); + long count = RARRAY_LEN(ary); rb_scan_args(argc, argv, "1", &obj); if (rb_block_given_p()) { rb_warn("given block not used"); } #if WITH_OBJC - for (i = 0; i < count; i++) { - if (rb_equal(RARRAY_AT(ary, i), obj)) - n++; - } + n = CFArrayGetCountOfValue((CFArrayRef)ary, CFRangeMake(0, count), RB2OC(obj)); #else for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) { if (rb_equal(*p, obj)) n++;

1 0