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

[439] MacRuby/trunk
by source_changes＠macosforge.org 14 Aug '08

14 Aug '08

Revision: 439 http://trac.macosforge.org/projects/ruby/changeset/439 Author: rich(a)infoether.com Date: 2008-08-14 14:27:19 -0700 (Thu, 14 Aug 2008) Log Message: ----------- template files for hotcocoa Added Paths: ----------- MacRuby/trunk/data/ MacRuby/trunk/data/hotcocoa_template/ MacRuby/trunk/data/hotcocoa_template/Rakefile MacRuby/trunk/data/hotcocoa_template/config/ MacRuby/trunk/data/hotcocoa_template/config/build.yml MacRuby/trunk/data/hotcocoa_template/lib/ MacRuby/trunk/data/hotcocoa_template/lib/application.rb MacRuby/trunk/data/hotcocoa_template/lib/menu.rb Added: MacRuby/trunk/data/hotcocoa_template/Rakefile =================================================================== --- MacRuby/trunk/data/hotcocoa_template/Rakefile (rev 0) +++ MacRuby/trunk/data/hotcocoa_template/Rakefile 2008-08-14 21:27:19 UTC (rev 439) @@ -0,0 +1,18 @@ +task :default => [:run] + +task :build do + require 'hotcocoa/application_builder' + ApplicationBuilder.build :file => "config/build.yml" +end + +task :run => [:build] do + require 'yaml' + app_name = YAML.load(File.read("config/build.yml"))[:name] + `open "#{app_name}.app"` +end + +task :clean do + require 'yaml' + app_name = YAML.load(File.read("config/build.yml"))[:name] + `rm -rf "#{app_name}.app"` +end Added: MacRuby/trunk/data/hotcocoa_template/config/build.yml =================================================================== --- MacRuby/trunk/data/hotcocoa_template/config/build.yml (rev 0) +++ MacRuby/trunk/data/hotcocoa_template/config/build.yml 2008-08-14 21:27:19 UTC (rev 439) @@ -0,0 +1,4 @@ +:name: __APPLICATION_NAME__ +:load: lib/application.rb +:sources: + - lib/**/*.rb Added: MacRuby/trunk/data/hotcocoa_template/lib/application.rb =================================================================== --- MacRuby/trunk/data/hotcocoa_template/lib/application.rb (rev 0) +++ MacRuby/trunk/data/hotcocoa_template/lib/application.rb 2008-08-14 21:27:19 UTC (rev 439) @@ -0,0 +1,12 @@ +require 'hotcocoa' + +include HotCocoa + +# Replace the following code with your own hotcocoa code + +application :name => "__APPLICATION_NAME__" do |app| + window :frame => [100, 100, 500, 500], :title => "__APPLICATION_NAME__" do |win| + win << label(:text => "Hello from HotCocoa", :layout => {:start => false}) + win.will_close { exit } + end +end \ No newline at end of file Added: MacRuby/trunk/data/hotcocoa_template/lib/menu.rb =================================================================== --- MacRuby/trunk/data/hotcocoa_template/lib/menu.rb (rev 0) +++ MacRuby/trunk/data/hotcocoa_template/lib/menu.rb 2008-08-14 21:27:19 UTC (rev 439) @@ -0,0 +1,32 @@ +module HotCocoa + def application_menu(app) + menu :main do |main| + main.submenu :apple do |apple| + apple.item :about, :title => "About #{app.name}", :target => app, :action => "orderFrontStandardAboutPanel:" + apple.separator + apple.item :preferences, :key => "," + apple.separator + apple.submenu :services + apple.separator + apple.item :hide, :title => "Hide #{app.name}", :key => "h", :target => app, :action => "hide:" + apple.item :hide_others, :title => "Hide Others", :key => "h", :modifiers => [:command, :alt], :target => app, :action => "hideOtherApplications:" + apple.item :show_all, :title => "Show All", :target => app, :action => "unhideAllApplications:" + apple.separator + apple.item :quit, :title => "Quit #{app.name}", :key => "q", :target => app, :action => "terminate:" + end + main.submenu :file do |file| + file.item :new, :key => "n" + file.item :open, :key => "o" + end + main.submenu :window do |win| + win.item :minimize, :key => "m" + win.item :zoom + win.separator + win.item :bring_all_to_front, :title => "Bring All to Front", :key => "o" + end + main.submenu :help do |help| + help.item :help, :title => "#{app.name} Help" + end + end + end +end \ No newline at end of file

1 0

[438] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 14 Aug '08

14 Aug '08

Revision: 438 http://trac.macosforge.org/projects/ruby/changeset/438 Author: lsansonetti(a)apple.com Date: 2008-08-14 01:26:54 -0700 (Thu, 14 Aug 2008) Log Message: ----------- wip Modified Paths: -------------- MacRuby/branches/lrz_unstable/class.c MacRuby/branches/lrz_unstable/variable.c Modified: MacRuby/branches/lrz_unstable/class.c =================================================================== --- MacRuby/branches/lrz_unstable/class.c 2008-08-14 06:57:42 UTC (rev 437) +++ MacRuby/branches/lrz_unstable/class.c 2008-08-14 08:26:54 UTC (rev 438) @@ -929,6 +929,7 @@ SEL sel; char *sel_name, *p; VALUE sym; + ID mid; method = methods[i]; @@ -945,13 +946,28 @@ p = strchr(sel_name, ':'); if (p != NULL && strchr(p + 1, ':') == NULL) { size_t len = strlen(sel_name); - p = alloca(len); - strncpy(p, sel_name, len); - p[len - 1] = '\0'; - sel_name = p; + char buf[100]; + + assert(len < sizeof(buf)); + + if (len > 4 && sel_name[0] == 's' && sel_name[1] == 'e' + && sel_name[2] == 't' && isupper(sel_name[3])) { + snprintf(buf, sizeof buf, "%s", &sel_name[3]); + buf[len - 4] = '='; + buf[0] = tolower(buf[0]); + } + else { + strncpy(buf, sel_name, len); + buf[len - 1] = '\0'; + } + + mid = rb_intern(buf); } + else { + mid = rb_intern(sel_name); + } - sym = ID2SYM(rb_intern(sel_name)); + sym = ID2SYM(mid); if (rb_ary_includes(ary, sym) == Qfalse) rb_ary_push(ary, sym); Modified: MacRuby/branches/lrz_unstable/variable.c =================================================================== --- MacRuby/branches/lrz_unstable/variable.c 2008-08-14 06:57:42 UTC (rev 437) +++ MacRuby/branches/lrz_unstable/variable.c 2008-08-14 08:26:54 UTC (rev 438) @@ -1355,13 +1355,17 @@ if (new_ivar) { if (len + 1 == RB_IVAR_ARY_MAX) { CFMutableDictionaryRef tbl; - tbl = CFDictionaryCreateMutable(NULL, 0, NULL, &rb_cfdictionary_value_cb); + tbl = CFDictionaryCreateMutable(NULL, 0, NULL, + &rb_cfdictionary_value_cb); - for (i = 0; i < len; i++) + for (i = 0; i < len; i++) CFDictionarySetValue(tbl, (const void *)ROBJECT(obj)->ivars.as.ary[i].name, (const void *)ROBJECT(obj)->ivars.as.ary[i].value); + CFDictionarySetValue(tbl, (const void *)id, + (const void *)val); + xfree(ROBJECT(obj)->ivars.as.ary); GC_WB(&ROBJECT(obj)->ivars.as.tbl, tbl); CFMakeCollectable(tbl); @@ -1383,7 +1387,8 @@ } case RB_IVAR_TBL: - CFDictionarySetValue(ROBJECT(obj)->ivars.as.tbl, (const void *)id, (const void *)val); + CFDictionarySetValue(ROBJECT(obj)->ivars.as.tbl, + (const void *)id, (const void *)val); break; } #else

1 0

[437] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 14 Aug '08

14 Aug '08

Revision: 437 http://trac.macosforge.org/projects/ruby/changeset/437 Author: lsansonetti(a)apple.com Date: 2008-08-13 23:57:42 -0700 (Wed, 13 Aug 2008) Log Message: ----------- wip Modified Paths: -------------- MacRuby/branches/lrz_unstable/ext/extmk.rb MacRuby/branches/lrz_unstable/objc.m MacRuby/branches/lrz_unstable/vm_method.c Modified: MacRuby/branches/lrz_unstable/ext/extmk.rb =================================================================== --- MacRuby/branches/lrz_unstable/ext/extmk.rb 2008-08-14 02:14:01 UTC (rev 436) +++ MacRuby/branches/lrz_unstable/ext/extmk.rb 2008-08-14 06:57:42 UTC (rev 437) @@ -85,7 +85,6 @@ end def extmake(target) -GC.start print "#{$message} #{target}\n" $stdout.flush if $force_static or $static_ext[target] @@ -431,8 +430,6 @@ FileUtils::makedirs('ext') Dir::chdir('ext') -GC.start - hdrdir = $hdrdir $hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include" exts.each do |d| Modified: MacRuby/branches/lrz_unstable/objc.m =================================================================== --- MacRuby/branches/lrz_unstable/objc.m 2008-08-14 02:14:01 UTC (rev 436) +++ MacRuby/branches/lrz_unstable/objc.m 2008-08-14 06:57:42 UTC (rev 437) @@ -1166,7 +1166,14 @@ } len = strlen(name_str); if (name_str[len - 1] != ':') { - snprintf(buf, sizeof buf, "%s:", name_str); + if (name_str[len - 1] == '=' && isalpha(name_str[len - 2])) { + snprintf(buf, sizeof buf, "set%s", name_str); + buf[3] = toupper(buf[3]); + buf[len + 2] = ':'; + } + else { + snprintf(buf, sizeof buf, "%s:", name_str); + } name_sel = sel_registerName(buf); } } Modified: MacRuby/branches/lrz_unstable/vm_method.c =================================================================== --- MacRuby/branches/lrz_unstable/vm_method.c 2008-08-14 02:14:01 UTC (rev 436) +++ MacRuby/branches/lrz_unstable/vm_method.c 2008-08-14 06:57:42 UTC (rev 437) @@ -325,7 +325,14 @@ } else { char buf[100]; - snprintf(buf, sizeof buf, "%s:", id_str); + if (id_str[slen - 1] == '=' && isalpha(id_str[slen - 2])) { + snprintf(buf, sizeof buf, "set%s", id_str); + buf[3] = toupper(buf[3]); + buf[slen + 2] = ':'; + } + else { + snprintf(buf, sizeof buf, "%s:", id_str); + } return rb_method_node(klass, rb_intern(buf)); } }

1 0

[436] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 14 Aug '08

14 Aug '08

Revision: 436 http://trac.macosforge.org/projects/ruby/changeset/436 Author: lsansonetti(a)apple.com Date: 2008-08-13 19:14:01 -0700 (Wed, 13 Aug 2008) Log Message: ----------- wip Modified Paths: -------------- MacRuby/branches/lrz_unstable/array.c MacRuby/branches/lrz_unstable/objc.m MacRuby/branches/lrz_unstable/object.c Modified: MacRuby/branches/lrz_unstable/array.c =================================================================== --- MacRuby/branches/lrz_unstable/array.c 2008-08-13 23:13:19 UTC (rev 435) +++ MacRuby/branches/lrz_unstable/array.c 2008-08-14 02:14:01 UTC (rev 436) @@ -2099,19 +2099,23 @@ rb_ary_delete(VALUE ary, VALUE item) { #if WITH_OBJC - long n, i; + long k, n, i; CFRange r; + const void *ocitem; rb_ary_modify(ary); - r = CFRangeMake(0, RARRAY_LEN(ary)); - n = 0; - while ((i = CFArrayGetFirstIndexOfValue((CFArrayRef)ary, r, - (const void *)RB2OC(item))) != -1) { + ocitem = (const void *)RB2OC(item); + n = RARRAY_LEN(ary); + r = CFRangeMake(0, n); + k = 0; + while ((i = CFArrayGetFirstIndexOfValue((CFArrayRef)ary, r, ocitem)) != -1) { CFArrayRemoveValueAtIndex((CFMutableArrayRef)ary, i); - n++; + r.location = i; + r.length = --n - i; + k++; } - if (n == 0) { + if (k == 0) { if (rb_block_given_p()) { return rb_yield(item); } Modified: MacRuby/branches/lrz_unstable/objc.m =================================================================== --- MacRuby/branches/lrz_unstable/objc.m 2008-08-13 23:13:19 UTC (rev 435) +++ MacRuby/branches/lrz_unstable/objc.m 2008-08-14 02:14:01 UTC (rev 436) @@ -1007,10 +1007,15 @@ char buf[128]; id ocrcv; - /* XXX because Hash.new can accept a block */ + /* XXX very special exceptions! */ if (recv == rb_cNSMutableHash && sel == @selector(new)) { + /* because Hash.new can accept a block */ return rb_class_new_instance(0, NULL, recv); } + else if (RCLASS_META(klass) && sel == @selector(class)) { + /* because +[NSObject class] returns self */ + return rb_cClass; + } ocrcv = RB2OC(recv); Modified: MacRuby/branches/lrz_unstable/object.c =================================================================== --- MacRuby/branches/lrz_unstable/object.c 2008-08-13 23:13:19 UTC (rev 435) +++ MacRuby/branches/lrz_unstable/object.c 2008-08-14 02:14:01 UTC (rev 436) @@ -133,6 +133,8 @@ #if WITH_OBJC if (cl == 0) return 0; + if (RCLASS_META(cl)) + return rb_cClass; while (RCLASS_SINGLETON(cl)) { cl = RCLASS_SUPER(cl); }

1 0

[435] MacRuby/branches/lrz_unstable/objc.m
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 435 http://trac.macosforge.org/projects/ruby/changeset/435 Author: lsansonetti(a)apple.com Date: 2008-08-13 16:13:19 -0700 (Wed, 13 Aug 2008) Log Message: ----------- faster BS constant loading Modified Paths: -------------- MacRuby/branches/lrz_unstable/objc.m Modified: MacRuby/branches/lrz_unstable/objc.m =================================================================== --- MacRuby/branches/lrz_unstable/objc.m 2008-08-13 22:31:54 UTC (rev 434) +++ MacRuby/branches/lrz_unstable/objc.m 2008-08-13 23:13:19 UTC (rev 435) @@ -2067,16 +2067,23 @@ bs_parse_cb(const char *path, bs_element_type_t type, void *value, void *ctx) { bool do_not_free = false; + CFMutableDictionaryRef rb_cObject_dict; + + rb_cObject_dict = rb_class_ivar_dict(rb_cObject); + assert(rb_cObject_dict != NULL); + switch (type) { case BS_ELEMENT_ENUM: { bs_element_enum_t *bs_enum = (bs_element_enum_t *)value; ID name = generate_const_name(bs_enum->name); - if (!rb_const_defined(rb_cObject, name)) { + if (!CFDictionaryGetValueIfPresent( + (CFDictionaryRef)rb_cObject_dict, (const void *)name, NULL)) { VALUE val = strchr(bs_enum->value, '.') != NULL ? rb_float_new(rb_cstr_to_dbl(bs_enum->value, 1)) : rb_cstr_to_inum(bs_enum->value, 10, 1); - rb_const_set(rb_cObject, name, val); + CFDictionarySetValue(rb_cObject_dict, (const void *)name, + (const void *)val); } else { rb_warning("bs: enum `%s' already defined", rb_id2name(name)); @@ -2088,9 +2095,11 @@ { bs_element_constant_t *bs_const = (bs_element_constant_t *)value; ID name = generate_const_name(bs_const->name); - if (!rb_const_defined(rb_cObject, name)) { + if (!CFDictionaryGetValueIfPresent( + (CFDictionaryRef)rb_cObject_dict, (const void *)name, NULL)) { st_insert(bs_constants, (st_data_t)name, (st_data_t)bs_const); - rb_const_set(rb_cObject, name, bs_const_magic_cookie); + CFDictionarySetValue(rb_cObject_dict, (const void *)name, + (const void *)bs_const_magic_cookie); do_not_free = true; } else { @@ -2105,7 +2114,8 @@ bs_element_string_constant_t *bs_strconst = (bs_element_string_constant_t *)value; ID name = generate_const_name(bs_strconst->name); - if (!rb_const_defined(rb_cObject, name)) { + if (!CFDictionaryGetValueIfPresent( + (CFDictionaryRef)rb_cObject_dict, (const void *)name, NULL)) { VALUE val; if (bs_strconst->nsstring) { CFStringRef string; @@ -2116,7 +2126,8 @@ else { val = rb_str_new2(bs_strconst->value); } - rb_const_set(rb_cObject, name, val); + CFDictionarySetValue(rb_cObject_dict, (const void *)name, + (const void *)val); } else { rb_warning("bs: string constant `%s' already defined", @@ -2144,11 +2155,17 @@ bs_element_function_alias_t *bs_func_alias = (bs_element_function_alias_t *)value; bs_element_function_t *bs_func_original; - if (st_lookup(bs_functions, (st_data_t)rb_intern(bs_func_alias->original), (st_data_t *)&bs_func_original)) { - st_insert(bs_functions, (st_data_t)rb_intern(bs_func_alias->name), (st_data_t)bs_func_original); + if (st_lookup(bs_functions, + (st_data_t)rb_intern(bs_func_alias->original), + (st_data_t *)&bs_func_original)) { + st_insert(bs_functions, + (st_data_t)rb_intern(bs_func_alias->name), + (st_data_t)bs_func_original); } else { - rb_raise(rb_eRuntimeError, "cannot alias '%s' to '%s' because it doesn't exist", bs_func_alias->name, bs_func_alias->original); + rb_raise(rb_eRuntimeError, + "cannot alias '%s' to '%s' because it doesn't exist", + bs_func_alias->name, bs_func_alias->original); } break; }

1 0

[434] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 434 http://trac.macosforge.org/projects/ruby/changeset/434 Author: lsansonetti(a)apple.com Date: 2008-08-13 15:31:54 -0700 (Wed, 13 Aug 2008) Log Message: ----------- wip Modified Paths: -------------- MacRuby/branches/lrz_unstable/array.c MacRuby/branches/lrz_unstable/hash.c MacRuby/branches/lrz_unstable/io.c MacRuby/branches/lrz_unstable/string.c MacRuby/branches/lrz_unstable/vm_insnhelper.c Modified: MacRuby/branches/lrz_unstable/array.c =================================================================== --- MacRuby/branches/lrz_unstable/array.c 2008-08-13 22:31:28 UTC (rev 433) +++ MacRuby/branches/lrz_unstable/array.c 2008-08-13 22:31:54 UTC (rev 434) @@ -1538,34 +1538,35 @@ return Qfalse; } -#if WITH_OBJC -static inline VALUE -rb_ary_dup2(VALUE ary) -{ - CFMutableArrayRef dup; - - dup = CFArrayCreateMutableCopy(NULL, 0, (CFArrayRef)ary); - CFMakeCollectable(dup); - - return (VALUE)dup; -} -#endif - VALUE rb_ary_dup(VALUE ary) { #if WITH_OBJC - VALUE dup = rb_ary_dup2(ary); + VALUE dup; + + dup = (VALUE)CFArrayCreateMutableCopy(NULL, 0, (CFArrayRef)ary); + if (OBJ_TAINTED(ary)) + OBJ_TAINT(dup); + + CFMakeCollectable((CFTypeRef)dup); #else VALUE dup = rb_ary_new2(RARRAY_LEN(ary)); MEMCPY(RARRAY_PTR(dup), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary)); RARRAY(dup)->len = RARRAY_LEN(ary); - #endif return dup; } +static VALUE +rb_ary_clone(VALUE ary) +{ + VALUE clone = rb_ary_dup(ary); + if (OBJ_FROZEN(ary)) + OBJ_FREEZE(clone); + return clone; +} + extern VALUE rb_output_fs; static VALUE @@ -4244,8 +4245,9 @@ rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0); #if WITH_OBJC - /* to return a mutable copy */ + /* to return mutable copies */ rb_define_method(rb_cArray, "dup", rb_ary_dup, 0); + rb_define_method(rb_cArray, "clone", rb_ary_clone, 0); #endif id_cmp = rb_intern("<=>"); Modified: MacRuby/branches/lrz_unstable/hash.c =================================================================== --- MacRuby/branches/lrz_unstable/hash.c 2008-08-13 22:31:28 UTC (rev 433) +++ MacRuby/branches/lrz_unstable/hash.c 2008-08-13 22:31:54 UTC (rev 434) @@ -314,10 +314,21 @@ rb_hash_dup(VALUE rcv) { VALUE dup = (VALUE)CFDictionaryCreateMutableCopy(NULL, 0, (CFDictionaryRef)rcv); + if (OBJ_TAINTED(rcv)) + OBJ_TAINT(dup); CFMakeCollectable((CFTypeRef)dup); return dup; } +static VALUE +rb_hash_clone(VALUE rcv) +{ + VALUE clone = rb_hash_dup(rcv); + if (OBJ_FROZEN(rcv)) + OBJ_FREEZE(clone); + return clone; +} + VALUE rb_hash_new(void) { @@ -3041,8 +3052,9 @@ rb_include_module(rb_cHash, rb_mEnumerable); #if WITH_OBJC - /* to return a mutable copy */ + /* to return mutable copies */ rb_define_method(rb_cHash, "dup", rb_hash_dup, 0); + rb_define_method(rb_cHash, "clone", rb_hash_clone, 0); #else rb_define_alloc_func(rb_cHash, hash_alloc); #endif Modified: MacRuby/branches/lrz_unstable/io.c =================================================================== --- MacRuby/branches/lrz_unstable/io.c 2008-08-13 22:31:28 UTC (rev 433) +++ MacRuby/branches/lrz_unstable/io.c 2008-08-13 22:31:54 UTC (rev 434) @@ -3972,7 +3972,7 @@ write_fptr->fd = write_fd; write_fptr->mode = (modef & ~FMODE_READABLE)| FMODE_SYNC|FMODE_DUPLEX; fptr->mode &= ~FMODE_WRITABLE; - fptr->tied_io_for_writing = write_port; + GC_WB(&fptr->tied_io_for_writing, write_port); rb_ivar_set(port, rb_intern("@tied_io_for_writing"), write_port); } @@ -4589,7 +4589,7 @@ write_io = GetWriteIO(io); if (io != write_io) { write_io = rb_obj_dup(write_io); - fptr->tied_io_for_writing = write_io; + GC_WB(&fptr->tied_io_for_writing, write_io); rb_ivar_set(dest, rb_intern("@tied_io_for_writing"), write_io); } Modified: MacRuby/branches/lrz_unstable/string.c =================================================================== --- MacRuby/branches/lrz_unstable/string.c 2008-08-13 22:31:28 UTC (rev 433) +++ MacRuby/branches/lrz_unstable/string.c 2008-08-13 22:31:54 UTC (rev 434) @@ -901,6 +901,9 @@ if (data != NULL) rb_str_cfdata_set(dup, data); + if (OBJ_TAINTED(str)) + OBJ_TAINT(dup); + CFMakeCollectable((CFTypeRef)dup); #else VALUE dup = str_alloc(rb_obj_class(str)); @@ -910,6 +913,14 @@ return dup; } +static VALUE +rb_str_clone(VALUE str) +{ + VALUE clone = rb_str_dup(str); + if (OBJ_FROZEN(str)) + OBJ_FREEZE(clone); + return clone; +} /* * call-seq: @@ -8723,8 +8734,9 @@ 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 */ + /* to return mutable copies */ rb_define_method(rb_cString, "dup", rb_str_dup, 0); + rb_define_method(rb_cString, "clone", rb_str_clone, 0); #endif id_to_s = rb_intern("to_s"); Modified: MacRuby/branches/lrz_unstable/vm_insnhelper.c =================================================================== --- MacRuby/branches/lrz_unstable/vm_insnhelper.c 2008-08-13 22:31:28 UTC (rev 433) +++ MacRuby/branches/lrz_unstable/vm_insnhelper.c 2008-08-13 22:31:54 UTC (rev 434) @@ -791,6 +791,24 @@ } } else { +#if WITH_OBJC + if (flag & VM_CALL_SUPER_BIT) { + VALUE k; + for (k = CLASS_OF(recv); k != 0; k = RCLASS_SUPER(k)) { + VALUE ary = rb_ivar_get(k, idIncludedModules); + if (ary != Qnil) { + int i, count = RARRAY_LEN(ary); + for (i = 0; i < count; i++) { + VALUE imod = RARRAY_AT(ary, i); + mn = rb_objc_method_node(imod, id, NULL, NULL); + if (mn != NULL) { + goto start_method_dispatch; + } + } + } + } + } +#endif /* method missing */ if (id == idMethodMissing) { rb_bug("method missing");

1 0

[433] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 433 http://trac.macosforge.org/projects/ruby/changeset/433 Author: lsansonetti(a)apple.com Date: 2008-08-13 15:31:28 -0700 (Wed, 13 Aug 2008) Log Message: ----------- more write barriers for the new GC Modified Paths: -------------- MacRuby/branches/lrz_unstable/bignum.c MacRuby/branches/lrz_unstable/re.c MacRuby/branches/lrz_unstable/st.c MacRuby/branches/lrz_unstable/string.c MacRuby/branches/lrz_unstable/vm.c Modified: MacRuby/branches/lrz_unstable/bignum.c =================================================================== --- MacRuby/branches/lrz_unstable/bignum.c 2008-08-13 08:30:59 UTC (rev 432) +++ MacRuby/branches/lrz_unstable/bignum.c 2008-08-13 22:31:28 UTC (rev 433) @@ -82,7 +82,7 @@ ds = ALLOC_N(BDIGIT, len); MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, RBIGNUM_EMBED_LEN_MAX); RBIGNUM(big)->as.heap.len = RBIGNUM_LEN(big); - RBIGNUM(big)->as.heap.digits = ds; + GC_WB(&RBIGNUM(big)->as.heap.digits, ds); RBASIC(big)->flags &= ~RBIGNUM_EMBED_FLAG; } } @@ -98,10 +98,11 @@ } else { if (RBIGNUM_LEN(big) == 0) { - RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len); + GC_WB(&RBIGNUM(big)->as.heap.digits, ALLOC_N(BDIGIT, len)); } else { REALLOC_N(RBIGNUM(big)->as.heap.digits, BDIGIT, len); + GC_WB(&RBIGNUM(big)->as.heap.digits, RBIGNUM(big)->as.heap.digits); } } } Modified: MacRuby/branches/lrz_unstable/re.c =================================================================== --- MacRuby/branches/lrz_unstable/re.c 2008-08-13 08:30:59 UTC (rev 432) +++ MacRuby/branches/lrz_unstable/re.c 2008-08-13 22:31:28 UTC (rev 433) @@ -1383,7 +1383,7 @@ if (!reverse) { range += RSTRING_LEN(str); } - MEMZERO(&regs, struct re_registers, 1); + MEMZERO(pregs, struct re_registers, 1); result = onig_search(RREGEXP(re)->ptr, (UChar*)cstr, ((UChar*)cstr + clen), Modified: MacRuby/branches/lrz_unstable/st.c =================================================================== --- MacRuby/branches/lrz_unstable/st.c 2008-08-13 08:30:59 UTC (rev 432) +++ MacRuby/branches/lrz_unstable/st.c 2008-08-13 22:31:28 UTC (rev 433) @@ -174,7 +174,7 @@ tbl->num_entries = 0; tbl->entries_packed = type == &type_numhash && size/2 <= MAX_PACKED_NUMHASH; tbl->num_bins = size; - tbl->bins = (st_table_entry **)Calloc(size, sizeof(st_table_entry*)); + GC_WB(&tbl->bins, (st_table_entry **)Calloc(size, sizeof(st_table_entry*))); tbl->head = 0; return tbl; @@ -473,8 +473,8 @@ } *new_table = *old_table; - new_table->bins = (st_table_entry**) - Calloc((unsigned)num_bins, sizeof(st_table_entry*)); + GC_WB(&new_table->bins, (st_table_entry**) + Calloc((unsigned)num_bins, sizeof(st_table_entry*))); if (new_table->bins == 0) { free(new_table); @@ -498,7 +498,7 @@ *entry = *ptr; hash_val = entry->hash % num_bins; entry->next = new_table->bins[hash_val]; - new_table->bins[hash_val] = entry; + GC_WB(&new_table->bins[hash_val], entry); entry->back = prev; *tail = prev = entry; tail = &entry->fore; Modified: MacRuby/branches/lrz_unstable/string.c =================================================================== --- MacRuby/branches/lrz_unstable/string.c 2008-08-13 08:30:59 UTC (rev 432) +++ MacRuby/branches/lrz_unstable/string.c 2008-08-13 22:31:28 UTC (rev 433) @@ -1359,6 +1359,7 @@ const char *cptr; data = (CFDataRef)rb_str_cfdata2(ptr); + cptr = NULL; if (data == NULL) { cptr = CFStringGetCStringPtr((CFStringRef)ptr, 0); if (cptr == NULL) { Modified: MacRuby/branches/lrz_unstable/vm.c =================================================================== --- MacRuby/branches/lrz_unstable/vm.c 2008-08-13 08:30:59 UTC (rev 432) +++ MacRuby/branches/lrz_unstable/vm.c 2008-08-13 22:31:28 UTC (rev 433) @@ -91,7 +91,7 @@ th->cfp->sp, block->lfp, iseq->local_size); if (cref) { - th->cfp->dfp[-1] = (VALUE)cref; + GC_WB(&th->cfp->dfp[-1], (VALUE)cref); } } @@ -246,8 +246,8 @@ env->env_size = local_size + 1 + 2; env->local_size = local_size; - env->env = ALLOC_N(VALUE, env->env_size); - env->prev_envval = penvval; + GC_WB(&env->env, ALLOC_N(VALUE, env->env_size)); + GC_WB(&env->prev_envval, penvval); for (i = 0; i <= local_size; i++) { env->env[i] = envptr[-local_size + i]; @@ -1725,11 +1725,12 @@ rb_iseq_t *iseq; /* create vm object */ - vm->self = Data_Wrap_Struct(rb_cVM, rb_vm_mark, vm_free, vm); + GC_WB(&vm->self, Data_Wrap_Struct(rb_cVM, rb_vm_mark, vm_free, vm)); /* create main thread */ - th_self = th->self = Data_Wrap_Struct(rb_cThread, rb_thread_mark, + th_self = Data_Wrap_Struct(rb_cThread, rb_thread_mark, thread_free, th); + GC_WB(&th->self, th_self); vm->main_thread = th; vm->running_thread = th; th->vm = vm; @@ -1737,10 +1738,11 @@ th->top_self = rb_vm_top_self(); rb_thread_set_current(th); - vm->living_threads = st_init_numtable(); + GC_WB(&vm->living_threads, st_init_numtable()); st_insert(vm->living_threads, th_self, (st_data_t) th->thread_id); rb_register_mark_object(iseqval); + rb_objc_retain((void *)iseqval); GetISeqPtr(iseqval, iseq); th->cfp->iseq = iseq; th->cfp->pc = iseq->iseq_encoded;

1 0

[432] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 432 http://trac.macosforge.org/projects/ruby/changeset/432 Author: lsansonetti(a)apple.com Date: 2008-08-13 01:30:59 -0700 (Wed, 13 Aug 2008) Log Message: ----------- wip Modified Paths: -------------- MacRuby/branches/lrz_unstable/lib/delegate.rb MacRuby/branches/lrz_unstable/objc.m Modified: MacRuby/branches/lrz_unstable/lib/delegate.rb =================================================================== --- MacRuby/branches/lrz_unstable/lib/delegate.rb 2008-08-13 06:05:57 UTC (rev 431) +++ MacRuby/branches/lrz_unstable/lib/delegate.rb 2008-08-13 08:30:59 UTC (rev 432) @@ -279,6 +279,7 @@ :clone, :dup, :marshal_dump, :marshal_load, :instance_eval, :instance_exec, :extend, ] + methods -= NSObject.methods klass.module_eval { include Delegator::MethodDelegation def __getobj__ # :nodoc: Modified: MacRuby/branches/lrz_unstable/objc.m =================================================================== --- MacRuby/branches/lrz_unstable/objc.m 2008-08-13 06:05:57 UTC (rev 431) +++ MacRuby/branches/lrz_unstable/objc.m 2008-08-13 08:30:59 UTC (rev 432) @@ -1142,17 +1142,26 @@ method = class_getInstanceMethod((Class)klass, def_sel); if (method == NULL) { - if (def_str[strlen(def_str) - 1] != ':') { - char buf[512]; - strlcpy(buf, def_str, sizeof buf); - strlcat(buf, ":", sizeof buf); + size_t len = strlen(def_str); + if (def_str[len - 1] != ':') { + char buf[100]; + + if (def_str[len - 1] == '=' && isalpha(def_str[len - 2])) { + snprintf(buf, sizeof buf, "set%s", def_str); + buf[3] = toupper(buf[3]); + buf[len + 2] = ':'; + } + else { + snprintf(buf, sizeof buf, "%s:", def_str); + } def_sel = sel_registerName(buf); method = class_getInstanceMethod((Class)klass, def_sel); - if (method == NULL) + if (method == NULL) { rb_print_undef(klass, def, 0); - if (name_str[strlen(name_str) - 1] != ':') { - strlcpy(buf, name_str, sizeof buf); - strlcat(buf, ":", sizeof buf); + } + len = strlen(name_str); + if (name_str[len - 1] != ':') { + snprintf(buf, sizeof buf, "%s:", name_str); name_sel = sel_registerName(buf); } }

1 0

[431] MacRuby/branches/lrz_unstable/lib/hotcocoa/mappings/button.rb
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 431 http://trac.macosforge.org/projects/ruby/changeset/431 Author: lsansonetti(a)apple.com Date: 2008-08-12 23:05:57 -0700 (Tue, 12 Aug 2008) Log Message: ----------- removing useless custom method, because there is already a similar constant definition above Modified Paths: -------------- MacRuby/branches/lrz_unstable/lib/hotcocoa/mappings/button.rb Modified: MacRuby/branches/lrz_unstable/lib/hotcocoa/mappings/button.rb =================================================================== --- MacRuby/branches/lrz_unstable/lib/hotcocoa/mappings/button.rb 2008-08-13 04:50:29 UTC (rev 430) +++ MacRuby/branches/lrz_unstable/lib/hotcocoa/mappings/button.rb 2008-08-13 06:05:57 UTC (rev 431) @@ -55,18 +55,6 @@ def type=(value) setButtonType(value) end - - def state=(value) - case value - when :on - value = NSOnState - when :off - value = NSOffState - when :mixed - value = NSMixedState - end - setState(value) - end def on? state == NSOnState

1 0

[430] MacRuby/branches/lrz_unstable
by source_changes＠macosforge.org 13 Aug '08

13 Aug '08

Revision: 430 http://trac.macosforge.org/projects/ruby/changeset/430 Author: lsansonetti(a)apple.com Date: 2008-08-12 21:50:29 -0700 (Tue, 12 Aug 2008) Log Message: ----------- wip Modified Paths: -------------- MacRuby/branches/lrz_unstable/class.c MacRuby/branches/lrz_unstable/object.c MacRuby/branches/lrz_unstable/vm_eval.c MacRuby/branches/lrz_unstable/vm_method.c Modified: MacRuby/branches/lrz_unstable/class.c =================================================================== --- MacRuby/branches/lrz_unstable/class.c 2008-08-13 03:43:15 UTC (rev 429) +++ MacRuby/branches/lrz_unstable/class.c 2008-08-13 04:50:29 UTC (rev 430) @@ -307,7 +307,50 @@ { VALUE klass = RBASIC(obj)->klass; #if WITH_OBJC - return klass; + if (!RCLASS_SINGLETON(klass)) { + return klass; + } + else { + /* copy singleton(unnamed) class */ + VALUE clone = rb_objc_create_class(NULL, RCLASS_SUPER(klass)); + + CFMutableDictionaryRef ivar_dict = rb_class_ivar_dict(klass); + if (ivar_dict != NULL) { + CFMutableDictionaryRef cloned_ivar_dict; + + cloned_ivar_dict = CFDictionaryCreateMutableCopy(NULL, 0, (CFDictionaryRef)ivar_dict); + rb_class_ivar_set_dict(clone, cloned_ivar_dict); + CFMakeCollectable(cloned_ivar_dict); + } + + Method *methods; + unsigned i, methods_count; + methods = class_copyMethodList((Class)klass, &methods_count); + if (methods != NULL) { + for (i = 0; i < methods_count; i++) { + Method method = methods[i], method2; + method2 = class_getInstanceMethod((Class)clone, method_getName(method)); + if (method2 != class_getInstanceMethod((Class)RCLASS_SUPER(clone), method_getName(method))) { + method_setImplementation(method2, method_getImplementation(method)); + } + else { + assert(class_addMethod((Class)clone, + method_getName(method), + method_getImplementation(method), + method_getTypeEncoding(method))); + } + } + free(methods); + } + + rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone); + if (RCLASS_SUPER(clone) == rb_cNSObject) { + RCLASS_VERSION(clone) ^= RCLASS_IS_OBJECT_SUBCLASS; + } + RCLASS_SET_VERSION_FLAG(clone, RCLASS_IS_SINGLETON); + + return clone; + } #else if (!FL_TEST(klass, FL_SINGLETON)) return klass; Modified: MacRuby/branches/lrz_unstable/object.c =================================================================== --- MacRuby/branches/lrz_unstable/object.c 2008-08-13 03:43:15 UTC (rev 429) +++ MacRuby/branches/lrz_unstable/object.c 2008-08-13 04:50:29 UTC (rev 430) @@ -309,6 +309,7 @@ switch (TYPE(obj)) { case T_NATIVE: clone = rb_obj_alloc(rb_obj_class(obj)); + RBASIC(clone)->klass = rb_singleton_class_clone(obj); break; case T_CLASS: case T_MODULE: Modified: MacRuby/branches/lrz_unstable/vm_eval.c =================================================================== --- MacRuby/branches/lrz_unstable/vm_eval.c 2008-08-13 03:43:15 UTC (rev 429) +++ MacRuby/branches/lrz_unstable/vm_eval.c 2008-08-13 04:50:29 UTC (rev 430) @@ -199,12 +199,12 @@ if (argc > 0 && mid != ID_ALLOCATOR) { const char *mid_str; - char buf[512]; + char buf[100]; size_t len; mid_str = rb_id2name(mid); len = strlen(mid_str); - if (len > 1 && mid_str[len - 1] == '=' && isalpha(mid_str[len - 2])) { + if (argc == 1 && len > 1 && mid_str[len - 1] == '=' && isalpha(mid_str[len - 2])) { assert(len + 3 < sizeof(buf)); buf[0] = 's'; buf[1] = 'e'; @@ -213,11 +213,12 @@ strlcpy(&buf[4], &mid_str[1], len - 1); buf[len + 2] = ':'; buf[len + 3] = '\0'; + mid = rb_intern(buf); } else if (mid_str[len - 1] != ':') { snprintf(buf, sizeof buf, "%s:", mid_str); + mid = rb_intern(buf); } - mid = rb_intern(buf); } method = rb_objc_method_node(klass, mid, &imp, &sel); Modified: MacRuby/branches/lrz_unstable/vm_method.c =================================================================== --- MacRuby/branches/lrz_unstable/vm_method.c 2008-08-13 03:43:15 UTC (rev 429) +++ MacRuby/branches/lrz_unstable/vm_method.c 2008-08-13 04:50:29 UTC (rev 430) @@ -316,7 +316,7 @@ { #if WITH_OBJC NODE *node = rb_objc_method_node(klass, id, NULL, NULL); - if (node == NULL) { + if (node == NULL && id != ID_ALLOCATOR) { const char *id_str = rb_id2name(id); size_t slen = strlen(id_str);

1 0