June 2009 - macruby-changes - lists.macosforge.org

[1904] MacRuby/branches/experimental/hash.c
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1904 http://trac.macosforge.org/projects/ruby/changeset/1904 Author: lsansonetti(a)apple.com Date: 2009-06-19 22:06:56 -0700 (Fri, 19 Jun 2009) Log Message: ----------- Hash#[]: accelerate the call to #default in case the given key is not found Modified Paths: -------------- MacRuby/branches/experimental/hash.c Modified: MacRuby/branches/experimental/hash.c =================================================================== --- MacRuby/branches/experimental/hash.c 2009-06-20 04:49:53 UTC (rev 1903) +++ MacRuby/branches/experimental/hash.c 2009-06-20 05:06:56 UTC (rev 1904) @@ -37,8 +37,11 @@ VALUE rb_cNSMutableHash; static VALUE envtbl; -static ID id_hash, id_yield, id_default; +static ID id_hash, id_yield; +static void *defaultCache = NULL; +static SEL selDefault = 0; + VALUE rb_hash(VALUE obj) { @@ -469,9 +472,10 @@ { VALUE val; - if (!CFDictionaryGetValueIfPresent((CFDictionaryRef)hash, (const void *)RB2OC(key), + if (!CFDictionaryGetValueIfPresent((CFDictionaryRef)hash, + (const void *)RB2OC(key), (const void **)&val)) { - return rb_funcall(hash, id_default, 1, key); + return rb_vm_call_with_cache(defaultCache, hash, selDefault, 0, NULL); } val = OC2RB(val); return val; @@ -2479,9 +2483,11 @@ void Init_Hash(void) { + selDefault = sel_registerName("default"); + defaultCache = rb_vm_get_call_cache(selDefault); + id_hash = rb_intern("hash"); id_yield = rb_intern("yield"); - id_default = rb_intern("default"); rb_cCFHash = (VALUE)objc_getClass("NSCFDictionary"); #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060

1 0

[1903] MacRuby/branches/experimental/vm.cpp
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1903 http://trac.macosforge.org/projects/ruby/changeset/1903 Author: lsansonetti(a)apple.com Date: 2009-06-19 21:49:53 -0700 (Fri, 19 Jun 2009) Log Message: ----------- undef_method: now works for >0 arity selectors Modified Paths: -------------- MacRuby/branches/experimental/vm.cpp Modified: MacRuby/branches/experimental/vm.cpp =================================================================== --- MacRuby/branches/experimental/vm.cpp 2009-06-20 04:49:25 UTC (rev 1902) +++ MacRuby/branches/experimental/vm.cpp 2009-06-20 04:49:53 UTC (rev 1903) @@ -1714,15 +1714,17 @@ rb_vm_undef_method(Class klass, const char *name, bool must_exist) { rb_vm_method_node_t *node = NULL; - SEL sel = sel_registerName(name); - if (!rb_vm_lookup_method((Class)klass, sel, NULL, &node)) { + if (!rb_vm_lookup_method2((Class)klass, rb_intern(name), NULL, NULL, + &node)) { if (must_exist) { rb_raise(rb_eNameError, "undefined method `%s' for %s `%s'", - name, TYPE(klass) == T_MODULE ? "module" : "class", - name); + name, + TYPE(klass) == T_MODULE ? "module" : "class", + rb_class2name((VALUE)klass)); } assert(name[strlen(name) - 1] != ':'); + SEL sel = sel_registerName(name); class_replaceMethod((Class)klass, sel, NULL, "@@:"); }

1 0

[1902] MacRuby/branches/experimental/string.c
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1902 http://trac.macosforge.org/projects/ruby/changeset/1902 Author: lsansonetti(a)apple.com Date: 2009-06-19 21:49:25 -0700 (Fri, 19 Jun 2009) Log Message: ----------- Symbol#include? should not exist Modified Paths: -------------- MacRuby/branches/experimental/string.c Modified: MacRuby/branches/experimental/string.c =================================================================== --- MacRuby/branches/experimental/string.c 2009-06-20 04:49:10 UTC (rev 1901) +++ MacRuby/branches/experimental/string.c 2009-06-20 04:49:25 UTC (rev 1902) @@ -5646,6 +5646,7 @@ rb_objc_define_method(rb_cSymbol, "to_sym", sym_to_sym, 0); rb_undef_method(rb_cSymbol, "to_str"); + rb_undef_method(rb_cSymbol, "include?"); install_symbol_primitives();

1 0

[1901] MacRuby/branches/experimental/objc.m
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1901 http://trac.macosforge.org/projects/ruby/changeset/1901 Author: lsansonetti(a)apple.com Date: 2009-06-19 21:49:10 -0700 (Fri, 19 Jun 2009) Log Message: ----------- better warning Modified Paths: -------------- MacRuby/branches/experimental/objc.m Modified: MacRuby/branches/experimental/objc.m =================================================================== --- MacRuby/branches/experimental/objc.m 2009-06-20 03:52:51 UTC (rev 1900) +++ MacRuby/branches/experimental/objc.m 2009-06-20 04:49:10 UTC (rev 1901) @@ -509,8 +509,9 @@ if (!class_addMethod((Class)klass, sel_registerName(buf), (IMP)rb_objc_kvo_setter_imp, "v@:@")) { - rb_warn("can't register `%s' as an KVO setter (method `%s')", - mid_name, buf); + rb_warn("can't register `%s' as an KVO setter on class `%s' "\ + "(method `%s')", + mid_name, rb_class2name(klass), buf); } }

1 0

[1900] MacRuby/branches/experimental/spec/macruby/core/struct_spec.rb
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1900 http://trac.macosforge.org/projects/ruby/changeset/1900 Author: lsansonetti(a)apple.com Date: 2009-06-19 20:52:51 -0700 (Fri, 19 Jun 2009) Log Message: ----------- typo Modified Paths: -------------- MacRuby/branches/experimental/spec/macruby/core/struct_spec.rb Modified: MacRuby/branches/experimental/spec/macruby/core/struct_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/macruby/core/struct_spec.rb 2009-06-20 03:52:27 UTC (rev 1899) +++ MacRuby/branches/experimental/spec/macruby/core/struct_spec.rb 2009-06-20 03:52:51 UTC (rev 1900) @@ -213,7 +213,7 @@ NSRect.object_id.should == CGRect.object_id end - it "returns an Array based on its elements when #to_s is called" do + it "returns an Array based on its elements when #to_a is called" do p = NSPoint.new(1, 2) o = p.to_a o.class.should == Array

1 0

[1899] MacRuby/branches/experimental
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1899 http://trac.macosforge.org/projects/ruby/changeset/1899 Author: lsansonetti(a)apple.com Date: 2009-06-19 20:52:27 -0700 (Fri, 19 Jun 2009) Log Message: ----------- Boxed#to_a: implemented Modified Paths: -------------- MacRuby/branches/experimental/bridgesupport.cpp MacRuby/branches/experimental/spec/macruby/core/struct_spec.rb Modified: MacRuby/branches/experimental/bridgesupport.cpp =================================================================== --- MacRuby/branches/experimental/bridgesupport.cpp 2009-06-20 02:41:50 UTC (rev 1898) +++ MacRuby/branches/experimental/bridgesupport.cpp 2009-06-20 03:52:27 UTC (rev 1899) @@ -348,6 +348,7 @@ VALUE *rcv_data; Data_Get_Struct(rcv, VALUE, rcv_data); rb_vm_bs_boxed_t *bs_boxed = locate_bs_boxed(CLASS_OF(rcv), true); + for (unsigned i = 0; i < bs_boxed->as.s->fields_count; i++) { rb_str_cat2(str, " "); rb_str_cat2(str, bs_boxed->as.s->fields[i].name); @@ -361,6 +362,22 @@ } static VALUE +rb_vm_struct_to_a(VALUE rcv, SEL sel) +{ + VALUE ary = rb_ary_new(); + + VALUE *rcv_data; + Data_Get_Struct(rcv, VALUE, rcv_data); + rb_vm_bs_boxed_t *bs_boxed = locate_bs_boxed(CLASS_OF(rcv), true); + + for (unsigned i = 0; i < bs_boxed->as.s->fields_count; i++) { + rb_ary_push(ary, rcv_data[i]); + } + + return ary; +} + +static VALUE rb_vm_struct_dup(VALUE rcv, SEL sel) { VALUE klass = CLASS_OF(rcv); @@ -460,6 +477,8 @@ (void *)rb_vm_struct_dup, 0); rb_objc_define_method(boxed->klass, "inspect", (void *)rb_vm_struct_inspect, 0); + rb_objc_define_method(boxed->klass, "to_a", + (void *)rb_vm_struct_to_a, 0); } else { // Opaque methods. Modified: MacRuby/branches/experimental/spec/macruby/core/struct_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/macruby/core/struct_spec.rb 2009-06-20 02:41:50 UTC (rev 1898) +++ MacRuby/branches/experimental/spec/macruby/core/struct_spec.rb 2009-06-20 03:52:27 UTC (rev 1899) @@ -212,4 +212,17 @@ NSSize.object_id.should == CGSize.object_id NSRect.object_id.should == CGRect.object_id end + + it "returns an Array based on its elements when #to_s is called" do + p = NSPoint.new(1, 2) + o = p.to_a + o.class.should == Array + o.should == [1, 2] + + r = NSRect.new(NSPoint.new(1, 2), NSSize.new(3, 4)) + o = r.to_a + o.class.should == Array + o.should == [NSPoint.new(1, 2), NSSize.new(3, 4)] + o.map { |x| x.to_a }.flatten.should == [1, 2, 3, 4] + end end

1 0

[1898] MacRuby/branches/experimental/bin/ruby_select
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1898 http://trac.macosforge.org/projects/ruby/changeset/1898 Author: lsansonetti(a)apple.com Date: 2009-06-19 19:41:50 -0700 (Fri, 19 Jun 2009) Log Message: ----------- don't use system because it's still broken on 0.5 Modified Paths: -------------- MacRuby/branches/experimental/bin/ruby_select Modified: MacRuby/branches/experimental/bin/ruby_select =================================================================== --- MacRuby/branches/experimental/bin/ruby_select 2009-06-20 02:29:48 UTC (rev 1897) +++ MacRuby/branches/experimental/bin/ruby_select 2009-06-20 02:41:50 UTC (rev 1898) @@ -25,4 +25,4 @@ line = "#{path}/usr/bin/macruby" ARGV.each { |x| line << ' \'' << x << '\' ' } -system(line) +puts `#{line}`

1 0

[1897] MacRuby/branches/experimental/bin/ruby_select
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1897 http://trac.macosforge.org/projects/ruby/changeset/1897 Author: lsansonetti(a)apple.com Date: 2009-06-19 19:29:48 -0700 (Fri, 19 Jun 2009) Log Message: ----------- added macruby_select(1) tool Added Paths: ----------- MacRuby/branches/experimental/bin/ruby_select Added: MacRuby/branches/experimental/bin/ruby_select =================================================================== --- MacRuby/branches/experimental/bin/ruby_select (rev 0) +++ MacRuby/branches/experimental/bin/ruby_select 2009-06-20 02:29:48 UTC (rev 1897) @@ -0,0 +1,28 @@ +#!/usr/bin/ruby + +MACRUBY_FRAMEWORK = '/Library/Frameworks/MacRuby.framework' + +unless File.exist?(MACRUBY_FRAMEWORK) + $stderr.puts "Can't locate '#{MACRUBY_FRAMEWORK}'." + exit 1 +end + +versions = Dir.glob(File.join(MACRUBY_FRAMEWORK, 'Versions/*')) + +if ARGV.empty? + $stderr.puts "Usage: $ macruby_select [version] [ruby args ...]" + $stderr.puts "Example: $ macruby_select 0.4 -e 'p 42'" + $stderr.puts "Versions: #{versions.map{|x|File.basename(x)}.join(', ')}" + exit 1 +end + +vers = ARGV.shift +path = versions.find { |x| File.basename(x) == vers } +if path.nil? + $stderr.puts "Given version '#{vers}' cannot be found." + exit 1 +end + +line = "#{path}/usr/bin/macruby" +ARGV.each { |x| line << ' \'' << x << '\' ' } +system(line) Property changes on: MacRuby/branches/experimental/bin/ruby_select ___________________________________________________________________ Added: svn:executable + *

1 0

[1896] MacRuby/branches/experimental
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1896 http://trac.macosforge.org/projects/ruby/changeset/1896 Author: lsansonetti(a)apple.com Date: 2009-06-19 19:22:44 -0700 (Fri, 19 Jun 2009) Log Message: ----------- also allow an Array of objects as a Pointer arg Modified Paths: -------------- MacRuby/branches/experimental/bridgesupport.cpp MacRuby/branches/experimental/compiler.cpp Modified: MacRuby/branches/experimental/bridgesupport.cpp =================================================================== --- MacRuby/branches/experimental/bridgesupport.cpp 2009-06-20 00:57:44 UTC (rev 1895) +++ MacRuby/branches/experimental/bridgesupport.cpp 2009-06-20 02:22:44 UTC (rev 1896) @@ -537,14 +537,33 @@ return Data_Wrap_Struct(rb_cPointer, NULL, NULL, ptr); } -static VALUE rb_pointer_assign(VALUE rcv, SEL sel, VALUE val); +static VALUE rb_pointer_aset(VALUE rcv, SEL sel, VALUE idx, VALUE val); VALUE rb_pointer_new2(const char *type_str, VALUE rval) { - VALUE p = rb_pointer_new(type_str, - xmalloc(GET_VM()->get_sizeof(type_str))); - rb_pointer_assign(p, 0, rval); + VALUE p; + + if (TYPE(rval) == T_ARRAY) { + const int len = RARRAY_LEN(rval); + if (len == 0) { + rb_raise(rb_eArgError, + "can't convert an empty array to a `%s' pointer", + type_str); + } + p = rb_pointer_new(type_str, + xmalloc(GET_VM()->get_sizeof(type_str) * len)); + int i; + for (i = 0; i < len; i++) { + rb_pointer_aset(p, 0, INT2FIX(i), RARRAY_AT(rval, i)); + } + } + else { + p = rb_pointer_new(type_str, + xmalloc(GET_VM()->get_sizeof(type_str))); + rb_pointer_aset(p, 0, INT2FIX(0), rval); + } + return p; } Modified: MacRuby/branches/experimental/compiler.cpp =================================================================== --- MacRuby/branches/experimental/compiler.cpp 2009-06-20 00:57:44 UTC (rev 1895) +++ MacRuby/branches/experimental/compiler.cpp 2009-06-20 02:22:44 UTC (rev 1896) @@ -4605,9 +4605,10 @@ *cptr = NULL; } else { - if (rb_boxed_is_type(CLASS_OF(rval), type + 1)) { - // A convenience helper so that the user can pass a Boxed object - // instead of a Pointer to the object. + if (TYPE(rval) == T_ARRAY + || rb_boxed_is_type(CLASS_OF(rval), type + 1)) { + // A convenience helper so that the user can pass a Boxed or an + // Array object instead of a Pointer to the object. rval = rb_pointer_new2(type + 1, rval); } *cptr = rb_pointer_get_data(rval, type);

1 0

[1895] MacRuby/branches/experimental
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1895 http://trac.macosforge.org/projects/ruby/changeset/1895 Author: lsansonetti(a)apple.com Date: 2009-06-19 17:57:44 -0700 (Fri, 19 Jun 2009) Log Message: ----------- better version of last commit Modified Paths: -------------- MacRuby/branches/experimental/bridgesupport.cpp MacRuby/branches/experimental/bridgesupport.h MacRuby/branches/experimental/compiler.cpp Modified: MacRuby/branches/experimental/bridgesupport.cpp =================================================================== --- MacRuby/branches/experimental/bridgesupport.cpp 2009-06-20 00:47:41 UTC (rev 1894) +++ MacRuby/branches/experimental/bridgesupport.cpp 2009-06-20 00:57:44 UTC (rev 1895) @@ -537,11 +537,15 @@ return Data_Wrap_Struct(rb_cPointer, NULL, NULL, ptr); } +static VALUE rb_pointer_assign(VALUE rcv, SEL sel, VALUE val); + VALUE -rb_pointer_new2(const char *type_str) +rb_pointer_new2(const char *type_str, VALUE rval) { - return rb_pointer_new(type_str, + VALUE p = rb_pointer_new(type_str, xmalloc(GET_VM()->get_sizeof(type_str))); + rb_pointer_assign(p, 0, rval); + return p; } static VALUE @@ -612,7 +616,7 @@ static VALUE rb_pointer_assign(VALUE rcv, SEL sel, VALUE val) { - return rb_pointer_aset(rcv, 0, FIX2INT(0), val); + return rb_pointer_aset(rcv, 0, INT2FIX(0), val); } static VALUE Modified: MacRuby/branches/experimental/bridgesupport.h =================================================================== --- MacRuby/branches/experimental/bridgesupport.h 2009-06-20 00:47:41 UTC (rev 1894) +++ MacRuby/branches/experimental/bridgesupport.h 2009-06-20 00:57:44 UTC (rev 1895) @@ -26,7 +26,7 @@ } rb_vm_bs_boxed_t; VALUE rb_pointer_new(const char *type_str, void *val); -VALUE rb_pointer_new2(const char *type_str); +VALUE rb_pointer_new2(const char *type_str, VALUE val); void *rb_pointer_get_data(VALUE rcv, const char *type); bool rb_boxed_is_type(VALUE klass, const char *type); Modified: MacRuby/branches/experimental/compiler.cpp =================================================================== --- MacRuby/branches/experimental/compiler.cpp 2009-06-20 00:47:41 UTC (rev 1894) +++ MacRuby/branches/experimental/compiler.cpp 2009-06-20 00:57:44 UTC (rev 1895) @@ -4604,13 +4604,12 @@ if (NIL_P(rval)) { *cptr = NULL; } - else if (rb_boxed_is_type(CLASS_OF(rval), type + 1)) { - // A convenience helper so that the user can pass a Boxed object - // instead of a Pointer to the object. - VALUE ptr = rb_pointer_new2(type + 1); - *cptr = rb_pointer_get_data(ptr, type); - } else { + if (rb_boxed_is_type(CLASS_OF(rval), type + 1)) { + // A convenience helper so that the user can pass a Boxed object + // instead of a Pointer to the object. + rval = rb_pointer_new2(type + 1, rval); + } *cptr = rb_pointer_get_data(rval, type); } return *cptr;

1 0