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

[519] MacRuby/trunk/sample-macruby/HotCocoa/demo/lib/views/buttons.rb
by source_changes＠macosforge.org 29 Aug '08

29 Aug '08

Revision: 519 http://trac.macosforge.org/projects/ruby/changeset/519 Author: rich(a)infoether.com Date: 2008-08-29 13:25:24 -0700 (Fri, 29 Aug 2008) Log Message: ----------- default is to show the alert Modified Paths: -------------- MacRuby/trunk/sample-macruby/HotCocoa/demo/lib/views/buttons.rb Modified: MacRuby/trunk/sample-macruby/HotCocoa/demo/lib/views/buttons.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/demo/lib/views/buttons.rb 2008-08-29 20:25:11 UTC (rev 518) +++ MacRuby/trunk/sample-macruby/HotCocoa/demo/lib/views/buttons.rb 2008-08-29 20:25:24 UTC (rev 519) @@ -6,7 +6,7 @@ def self.create action = Proc.new { - alert(:message => "This is an alert!", :info => "This is a little more info!").show + alert :message => "This is an alert!", :info => "This is a little more info!" } layout_view :frame => [0, 0, 0, 0], :layout => {:expand => [:width, :height]} do |view|

1 0

[518] MacRuby/trunk/lib/hotcocoa/mappings/alert.rb
by source_changes＠macosforge.org 29 Aug '08

29 Aug '08

Revision: 518 http://trac.macosforge.org/projects/ruby/changeset/518 Author: rich(a)infoether.com Date: 2008-08-29 13:25:11 -0700 (Fri, 29 Aug 2008) Log Message: ----------- default to show Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/alert.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/alert.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/alert.rb 2008-08-29 20:16:54 UTC (rev 517) +++ MacRuby/trunk/lib/hotcocoa/mappings/alert.rb 2008-08-29 20:25:11 UTC (rev 518) @@ -1,10 +1,10 @@ HotCocoa::Mappings.map :alert => :NSAlert do - defaults :default => "OK", :alternate => nil, :other => nil, :info => nil + defaults :default => "OK", :alternate => nil, :other => nil, :info => nil, :show => true def alloc_with_options(options) if options[:message] - NSAlert.alertWithMessageText options.delete(:message), + alert = NSAlert.alertWithMessageText options.delete(:message), defaultButton:options.delete(:default), alternateButton:options.delete(:alternate), otherButton:options.delete(:other), @@ -13,9 +13,11 @@ end custom_methods do + def show runModal end + end end

1 0

[517] MacRuby/trunk/sample-macruby/HotCocoa/demo/lib/views/buttons.rb
by source_changes＠macosforge.org 29 Aug '08

29 Aug '08

Revision: 517 http://trac.macosforge.org/projects/ruby/changeset/517 Author: rich(a)infoether.com Date: 2008-08-29 13:16:54 -0700 (Fri, 29 Aug 2008) Log Message: ----------- add alert demo Modified Paths: -------------- MacRuby/trunk/sample-macruby/HotCocoa/demo/lib/views/buttons.rb Modified: MacRuby/trunk/sample-macruby/HotCocoa/demo/lib/views/buttons.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/demo/lib/views/buttons.rb 2008-08-29 20:16:43 UTC (rev 516) +++ MacRuby/trunk/sample-macruby/HotCocoa/demo/lib/views/buttons.rb 2008-08-29 20:16:54 UTC (rev 517) @@ -5,21 +5,25 @@ end def self.create + action = Proc.new { + alert(:message => "This is an alert!", :info => "This is a little more info!").show + } + layout_view :frame => [0, 0, 0, 0], :layout => {:expand => [:width, :height]} do |view| - view << button(:title => "Rounded", :bezel => :rounded, :layout => {:expand => :width, :start => false}) - view << button(:title => "Regular Square", :bezel => :regular_square, :layout => {:expand => :width, :start => false}) - view << button(:title => "Thick Square", :bezel => :thick_square, :layout => {:expand => :width, :start => false}) - view << button(:title => "Thicker Square", :bezel => :thicker_square, :layout => {:expand => :width, :start => false}) - #view << button(:title => "", :bezel => :disclosure, :layout => {:expand => :width, :start => false}) - view << button(:title => "Shadowless Square", :bezel => :shadowless_square, :layout => {:expand => :width, :start => false}) - #view << button(:title => "", :bezel => :circular, :layout => {:expand => :width, :start => false}) - view << button(:title => "Textured Square", :bezel => :textured_square, :layout => {:expand => :width, :start => false}) - #view << button(:title => "Help Button", :bezel => :help_button, :layout => {:expand => :width, :start => false}) - view << button(:title => "Small Square", :bezel => :small_square, :layout => {:expand => :width, :start => false}) - view << button(:title => "Textured Rounded", :bezel => :textured_rounded, :layout => {:expand => :width, :start => false}) - view << button(:title => "Round Rect", :bezel => :round_rect, :layout => {:expand => :width, :start => false}) - view << button(:title => "Recessed", :bezel => :recessed, :layout => {:expand => :width, :start => false}) - #view << button(:title => "", :bezel => :rounded_disclosure, :layout => {:expand => :width, :start => false}) + view << button(:title => "Rounded", :bezel => :rounded, :layout => {:expand => :width, :start => false}, :on_action => action) + view << button(:title => "Regular Square", :bezel => :regular_square, :layout => {:expand => :width, :start => false}, :on_action => action) + view << button(:title => "Thick Square", :bezel => :thick_square, :layout => {:expand => :width, :start => false}, :on_action => action) + view << button(:title => "Thicker Square", :bezel => :thicker_square, :layout => {:expand => :width, :start => false}, :on_action => action) + #view << button(:title => "", :bezel => :disclosure, :layout => {:expand => :width, :start => false}, :on_action => action) + view << button(:title => "Shadowless Square", :bezel => :shadowless_square, :layout => {:expand => :width, :start => false}, :on_action => action) + #view << button(:title => "", :bezel => :circular, :layout => {:expand => :width, :start => false}, :on_action => action) + view << button(:title => "Textured Square", :bezel => :textured_square, :layout => {:expand => :width, :start => false}, :on_action => action) + #view << button(:title => "Help Button", :bezel => :help_button, :layout => {:expand => :width, :start => false}, :on_action => action) + view << button(:title => "Small Square", :bezel => :small_square, :layout => {:expand => :width, :start => false}, :on_action => action) + view << button(:title => "Textured Rounded", :bezel => :textured_rounded, :layout => {:expand => :width, :start => false}, :on_action => action) + view << button(:title => "Round Rect", :bezel => :round_rect, :layout => {:expand => :width, :start => false}, :on_action => action) + view << button(:title => "Recessed", :bezel => :recessed, :layout => {:expand => :width, :start => false}, :on_action => action) + #view << button(:title => "", :bezel => :rounded_disclosure, :layout => {:expand => :width, :start => false}, :on_action => action) end end

1 0

[516] MacRuby/trunk/lib/hotcocoa/mappings/alert.rb
by source_changes＠macosforge.org 29 Aug '08

29 Aug '08

Revision: 516 http://trac.macosforge.org/projects/ruby/changeset/516 Author: rich(a)infoether.com Date: 2008-08-29 13:16:43 -0700 (Fri, 29 Aug 2008) Log Message: ----------- add alert Added Paths: ----------- MacRuby/trunk/lib/hotcocoa/mappings/alert.rb Added: MacRuby/trunk/lib/hotcocoa/mappings/alert.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/alert.rb (rev 0) +++ MacRuby/trunk/lib/hotcocoa/mappings/alert.rb 2008-08-29 20:16:43 UTC (rev 516) @@ -0,0 +1,21 @@ +HotCocoa::Mappings.map :alert => :NSAlert do + + defaults :default => "OK", :alternate => nil, :other => nil, :info => nil + + def alloc_with_options(options) + if options[:message] + NSAlert.alertWithMessageText options.delete(:message), + defaultButton:options.delete(:default), + alternateButton:options.delete(:alternate), + otherButton:options.delete(:other), + informativeTextWithFormat:options.delete(:info) + end + end + + custom_methods do + def show + runModal + end + end + +end

1 0

[515] MacRuby/trunk/sample-macruby/PagePacker
by source_changes＠macosforge.org 29 Aug '08

29 Aug '08

Revision: 515 http://trac.macosforge.org/projects/ruby/changeset/515 Author: lsansonetti(a)apple.com Date: 2008-08-28 21:55:31 -0700 (Thu, 28 Aug 2008) Log Message: ----------- fix some typos Modified Paths: -------------- MacRuby/trunk/sample-macruby/PagePacker/PackModel.rb MacRuby/trunk/sample-macruby/PagePacker/PageInfo.rb Modified: MacRuby/trunk/sample-macruby/PagePacker/PackModel.rb =================================================================== --- MacRuby/trunk/sample-macruby/PagePacker/PackModel.rb 2008-08-29 02:17:47 UTC (rev 514) +++ MacRuby/trunk/sample-macruby/PagePacker/PackModel.rb 2008-08-29 04:55:31 UTC (rev 515) @@ -84,7 +84,7 @@ def putAttributedString(attString, startingOnPage:i) pdf = pdfFromAttributedStringOfSize attString, NSMakeSize(200, 300) - putPDFData pdf, startingOnpage:i + putPDFData pdf, startingOnPage:i end def putPDF(pdf, startingOnPage:i) @@ -113,7 +113,7 @@ end end - def putFiles(filenames, startingOnpage:i) + def putFiles(filenames, startingOnPage:i) currentStart = i filenames.each { |x| currentStart = putFile(x, startingOnPage:currentStart) } currentStart Modified: MacRuby/trunk/sample-macruby/PagePacker/PageInfo.rb =================================================================== --- MacRuby/trunk/sample-macruby/PagePacker/PageInfo.rb 2008-08-29 02:17:47 UTC (rev 514) +++ MacRuby/trunk/sample-macruby/PagePacker/PageInfo.rb 2008-08-29 04:55:31 UTC (rev 515) @@ -1,5 +1,4 @@ class PageInfo - def encodeWithCoder(c) c.encodeObject @imageRep, forKey:'imageRep' c.encodeInt @pageOfRep, forKey:'pageOfRep'

1 0

[514] MacRuby/trunk/test/ruby/test_objc.rb
by source_changes＠macosforge.org 29 Aug '08

29 Aug '08

Revision: 514 http://trac.macosforge.org/projects/ruby/changeset/514 Author: lsansonetti(a)apple.com Date: 2008-08-28 19:17:47 -0700 (Thu, 28 Aug 2008) Log Message: ----------- adding some tests Modified Paths: -------------- MacRuby/trunk/test/ruby/test_objc.rb Modified: MacRuby/trunk/test/ruby/test_objc.rb =================================================================== --- MacRuby/trunk/test/ruby/test_objc.rb 2008-08-29 02:12:45 UTC (rev 513) +++ MacRuby/trunk/test/ruby/test_objc.rb 2008-08-29 02:17:47 UTC (rev 514) @@ -77,6 +77,28 @@ assert_kind_of(NSObject, []) end + def test_class_shortcuts + assert_equal(NSObject, Object) + assert_equal(NSMutableString, String) + assert_equal(NSMutableArray, Array) + assert_equal(NSMutableDictionary, Hash) + end + + def test_instance_of_on_primitive_types + o = 'foo' + assert(o.instance_of?(NSMutableString)) + assert(o.instance_of?(String)) + assert(o.kind_of?(String)) + o = [42] + assert(o.instance_of?(NSMutableArray)) + assert(o.instance_of?(Array)) + assert(o.kind_of?(Array)) + o = {42=>42} + assert(o.instance_of?(NSMutableDictionary)) + assert(o.instance_of?(Hash)) + assert(o.kind_of?(Hash)) + end + class ClassWithNamedArg def doSomethingWith(x, andObject:y, andObject:z) x + y + z

1 0

[513] MacRuby/trunk
by source_changes＠macosforge.org 29 Aug '08

29 Aug '08

Revision: 513 http://trac.macosforge.org/projects/ruby/changeset/513 Author: lsansonetti(a)apple.com Date: 2008-08-28 19:12:45 -0700 (Thu, 28 Aug 2008) Log Message: ----------- fixed variadic objc dispatch, added rb_objc.rb to the test suite, removed a warning when running sample/test.rb Modified Paths: -------------- MacRuby/trunk/objc.m MacRuby/trunk/sample/test.rb MacRuby/trunk/test/macruby_runner.rb MacRuby/trunk/test/ruby/test_objc.rb Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-08-28 08:02:31 UTC (rev 512) +++ MacRuby/trunk/objc.m 2008-08-29 02:12:45 UTC (rev 513) @@ -1239,20 +1239,31 @@ for (i = 0; i < argc; i++) { ffi_type *ffi_argtype; - const char *type2; - type = SkipStackSize(type); - type2 = SkipFirstType(type); - strncpy(buf, type, MIN(sizeof buf, type2 - type)); - buf[MIN(sizeof buf, type2 - type)] = '\0'; + if (*type == '\0') { + if (bs_method->variadic) { + buf[0] = '@'; + buf[1] = '\0'; + } + else { + rb_bug("incomplete method signature `%s' for argc %d", sig->types, argc); + } + } + else { + const char *type2; + type = SkipStackSize(type); + type2 = SkipFirstType(type); + strncpy(buf, type, MIN(sizeof buf, type2 - type)); + buf[MIN(sizeof buf, type2 - type)] = '\0'; + type = type2; + } + ffi_argtypes[i + 2] = rb_objc_octype_to_ffitype(buf); assert(ffi_argtypes[i + 2]->size > 0); ffi_argtype = ffi_argtypes[i + 2]; ffi_args[i + 2] = (void *)alloca(ffi_argtype->size); rb_objc_rval_to_ocval(argv[i], buf, ffi_args[i + 2]); - - type = type2; } ffi_argtypes[count] = NULL; Modified: MacRuby/trunk/sample/test.rb =================================================================== --- MacRuby/trunk/sample/test.rb 2008-08-28 08:02:31 UTC (rev 512) +++ MacRuby/trunk/sample/test.rb 2008-08-29 02:12:45 UTC (rev 513) @@ -1948,7 +1948,10 @@ $y = Marshal.dump($x) test_ok($x == Marshal.load($y)) -StrClone=String.clone; +old_verbose = $VERBOSE # because String.clone produces a warning in MacRuby +$VERBOSE = nil +StrClone=String.clone +$VERBOSE = old_verbose test_ok(Marshal.load(Marshal.dump(StrClone.new("abc"))).class == StrClone) [[1,2,3,4], [81, 2, 118, 3146]].each { |w,x,y,z| Modified: MacRuby/trunk/test/macruby_runner.rb =================================================================== --- MacRuby/trunk/test/macruby_runner.rb 2008-08-28 08:02:31 UTC (rev 512) +++ MacRuby/trunk/test/macruby_runner.rb 2008-08-29 02:12:45 UTC (rev 513) @@ -3,6 +3,6 @@ $:.unshift('./lib') require 'test/unit' -tests = %w{ array string stringchar hash } +tests = %w{ array string stringchar hash objc } tests.each { |x| require("test/ruby/test_#{x}.rb") } Modified: MacRuby/trunk/test/ruby/test_objc.rb =================================================================== --- MacRuby/trunk/test/ruby/test_objc.rb 2008-08-28 08:02:31 UTC (rev 512) +++ MacRuby/trunk/test/ruby/test_objc.rb 2008-08-29 02:12:45 UTC (rev 513) @@ -145,9 +145,8 @@ assert_equal(42, obj.foo) obj = TestSuperMethod.performSelector(:alloc).performSelector(:init) assert_equal(42, obj.foo) - # FIXME this doesn't work yet - #obj = TestSuperMethod.new - #assert_equal(42, obj.foo) + obj = TestSuperMethod.new + assert_equal(42, obj.foo) obj = TestSuperMethod.performSelector(:new) assert_equal(42, obj.foo) end @@ -252,30 +251,19 @@ n = nil assert_kind_of(NSNull, n.self) assert_equal(NSNull.null, n.self) - # TODO this currently SEGV - #m = String - #assert_equal(m, m.self) + m = String + assert_equal(m, m.self) end def test_call_superclass o = Object.new - assert_equal(NSObject, o.superclass) + assert_equal(nil, o.superclass) s = 'foo' assert_equal(NSMutableString, s.superclass) - n = 42 - assert_equal(NSNumber, n.superclass) n = nil assert_equal(NSObject, n.superclass) end - def test_no_direct_nsobject_subclass - old_verbose = $VERBOSE - $VERBOSE = nil # no warn - klass = eval("class Foo < NSObject; end; Foo") - assert_equal(Object, klass.superclass) - $VERBOSE = old_verbose - end - class TestSuper1 def foo; 'xxx'; end end

1 0

[512] MacRuby/trunk/objc.m
by source_changes＠macosforge.org 28 Aug '08

28 Aug '08

Revision: 512 http://trac.macosforge.org/projects/ruby/changeset/512 Author: lsansonetti(a)apple.com Date: 2008-08-28 01:02:31 -0700 (Thu, 28 Aug 2008) Log Message: ----------- reverting a change introduced by the last commit Modified Paths: -------------- MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-08-28 06:02:21 UTC (rev 511) +++ MacRuby/trunk/objc.m 2008-08-28 08:02:31 UTC (rev 512) @@ -2067,11 +2067,10 @@ (bs_element_struct_field_t *)&bs_struct->fields[i]; if (strcmp(ivar_id_str, bs_field->name) == 0) { - VALUE val, *pval; + VALUE *pval; pval = &((VALUE *)(data + bs_boxed->ffi_type->size))[i]; if (*pval == 0) { - pval = &val; rb_objc_ocval_to_rbval(data + pos, bs_field->type, pval); } return *pval;

1 0

[511] MacRuby/trunk/sample-macruby/PagePacker/README
by source_changes＠macosforge.org 28 Aug '08

28 Aug '08

Revision: 511 http://trac.macosforge.org/projects/ruby/changeset/511 Author: lsansonetti(a)apple.com Date: 2008-08-27 23:02:21 -0700 (Wed, 27 Aug 2008) Log Message: ----------- typo Modified Paths: -------------- MacRuby/trunk/sample-macruby/PagePacker/README Modified: MacRuby/trunk/sample-macruby/PagePacker/README =================================================================== --- MacRuby/trunk/sample-macruby/PagePacker/README 2008-08-28 06:00:47 UTC (rev 510) +++ MacRuby/trunk/sample-macruby/PagePacker/README 2008-08-28 06:02:21 UTC (rev 511) @@ -1,6 +1,6 @@ -== PagePaker == +== PagePacker == -This is a MacRuby port of the original Objective-C PagePaker application, +This is a MacRuby port of the original Objective-C PagePacker application, now available at http://weblog.bignerdranch.com/?p=41. == Licensing ==

1 0

[510] MacRuby/trunk
by source_changes＠macosforge.org 28 Aug '08

28 Aug '08

Revision: 510 http://trac.macosforge.org/projects/ruby/changeset/510 Author: lsansonetti(a)apple.com Date: 2008-08-27 23:00:47 -0700 (Wed, 27 Aug 2008) Log Message: ----------- objc dispatcher now faster and supports objects implementing -forwardInvocation:, fixed a memory crasher in boxe structure ivar setters Modified Paths: -------------- MacRuby/trunk/include/ruby/intern.h MacRuby/trunk/objc.h MacRuby/trunk/objc.m MacRuby/trunk/vm_core.h MacRuby/trunk/vm_insnhelper.c Modified: MacRuby/trunk/include/ruby/intern.h =================================================================== --- MacRuby/trunk/include/ruby/intern.h 2008-08-28 05:59:22 UTC (rev 509) +++ MacRuby/trunk/include/ruby/intern.h 2008-08-28 06:00:47 UTC (rev 510) @@ -703,7 +703,6 @@ long rb_objc_remove_flags(const void *obj); void rb_objc_methods(VALUE, Class); bool rb_objc_is_immutable(VALUE); -VALUE rb_objc_call(VALUE, SEL, int, VALUE *); #endif /* version.c */ void ruby_show_version(void); Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2008-08-28 05:59:22 UTC (rev 509) +++ MacRuby/trunk/objc.h 2008-08-28 06:00:47 UTC (rev 510) @@ -1,6 +1,21 @@ #ifndef __OBJC_H_ #define __OBJC_H_ +#include "bs.h" + +struct rb_objc_method_sig { + const char *types; + unsigned int argc; +}; + +bool rb_objc_fill_sig(VALUE recv, Class klass, SEL sel, struct rb_objc_method_sig *sig, bs_element_method_t *bs_method); + +VALUE rb_objc_call(VALUE recv, SEL sel, int argc, VALUE *argv); + +VALUE rb_objc_call2(VALUE recv, VALUE klass, SEL sel, IMP imp, + struct rb_objc_method_sig *sig, bs_element_method_t *bs_method, int argc, + VALUE *argv); + static inline void rb_objc_install_method(Class klass, SEL sel, IMP imp) { Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-08-28 05:59:22 UTC (rev 509) +++ MacRuby/trunk/objc.m 2008-08-28 06:00:47 UTC (rev 510) @@ -1078,15 +1078,84 @@ return type; } +static inline int +SubtypeUntil(const char *type, char end) +{ + int level = 0; + const char *head = type; + + while (*type) + { + if (!*type || (!level && (*type == end))) + return (int)(type - head); + + switch (*type) + { + case ']': case '}': case ')': level--; break; + case '[': case '{': case '(': level += 1; break; + } + + type += 1; + } + + rb_bug ("Object: SubtypeUntil: end of type encountered prematurely\n"); + return 0; +} + +static inline const char * +SkipStackSize(const char *type) +{ + while ((*type >= '0') && (*type <= '9')) + type += 1; + return type; +} + +static inline const char * +SkipFirstType(const char *type) +{ + while (1) + { + switch (*type++) + { + case 'O': /* bycopy */ + case 'n': /* in */ + case 'o': /* out */ + case 'N': /* inout */ + case 'r': /* const */ + case 'V': /* oneway */ + case '^': /* pointers */ + break; + + /* arrays */ + case '[': + return type + SubtypeUntil (type, ']') + 1; + + /* structures */ + case '{': + return type + SubtypeUntil (type, '}') + 1; + + /* unions */ + case '(': + return type + SubtypeUntil (type, ')') + 1; + + /* basic types */ + default: + return type; + } + } +} + VALUE -rb_objc_call2(VALUE recv, VALUE klass, SEL sel, IMP imp, Method method, bs_element_method_t *bs_method, int argc, VALUE *argv) +rb_objc_call2(VALUE recv, VALUE klass, SEL sel, IMP imp, + struct rb_objc_method_sig *sig, bs_element_method_t *bs_method, + int argc, VALUE *argv) { unsigned i, real_count, count; ffi_type *ffi_rettype, **ffi_argtypes; void *ffi_ret, **ffi_args; ffi_cif *cif; const char *type; - char buf[128]; + char *rettype, buf[100]; id ocrcv; /* XXX very special exceptions! */ @@ -1103,7 +1172,7 @@ DLOG("OCALL", "%c[<%s %p> %s]", class_isMetaClass((Class)klass) ? '+' : '-', class_getName((Class)klass), (void *)ocrcv, (char *)sel); - count = method_getNumberOfArguments(method); + count = sig->argc; assert(count >= 2); real_count = count; @@ -1119,8 +1188,7 @@ } if (count == 2) { - method_getReturnType(method, buf, sizeof buf); - if (buf[0] == '@' || buf[0] == '#' || buf[0] == 'v') { + if (sig->types[0] == '@' || sig->types[0] == '#' || sig->types[0] == 'v') { /* Easy case! */ @try { if (klass == RCLASS_SUPER(*(Class *)ocrcv)) { @@ -1136,8 +1204,10 @@ @catch (id e) { rb_objc_exc_raise(e); } - if (buf[0] == '@' || buf[0] == '#') { + if (sig->types[0] == '@' || sig->types[0] == '#') { VALUE retval; + buf[0] = sig->types[0]; + buf[1] = '\0'; rb_objc_ocval_to_rbval(&ffi_ret, buf, &retval); return retval; } @@ -1156,31 +1226,43 @@ ffi_args[0] = &ocrcv; ffi_args[1] = &sel; + type = SkipFirstType(sig->types); + rettype = alloca(type - sig->types + 1); + strncpy(rettype, sig->types, type - sig->types); + rettype[type - sig->types] = '\0'; + ffi_rettype = rb_objc_octype_to_ffitype(rettype); + + type = SkipStackSize(type); + type = SkipFirstType(type); /* skip receiver */ + type = SkipStackSize(type); + type = SkipFirstType(type); /* skip selector */ + for (i = 0; i < argc; i++) { ffi_type *ffi_argtype; + const char *type2; - type = rb_objc_method_get_type(method, real_count, bs_method, - i, buf, sizeof buf); + type = SkipStackSize(type); + type2 = SkipFirstType(type); + strncpy(buf, type, MIN(sizeof buf, type2 - type)); + buf[MIN(sizeof buf, type2 - type)] = '\0'; - ffi_argtypes[i + 2] = rb_objc_octype_to_ffitype(type); + ffi_argtypes[i + 2] = rb_objc_octype_to_ffitype(buf); assert(ffi_argtypes[i + 2]->size > 0); ffi_argtype = ffi_argtypes[i + 2]; ffi_args[i + 2] = (void *)alloca(ffi_argtype->size); - rb_objc_rval_to_ocval(argv[i], type, ffi_args[i + 2]); + rb_objc_rval_to_ocval(argv[i], buf, ffi_args[i + 2]); + + type = type2; } ffi_argtypes[count] = NULL; ffi_args[count] = NULL; - type = rb_objc_method_get_type(method, real_count, bs_method, - -1, buf, sizeof buf); - ffi_rettype = rb_objc_octype_to_ffitype(type); - cif = (ffi_cif *)alloca(sizeof(ffi_cif)); if (ffi_prep_cif(cif, FFI_DEFAULT_ABI, count, ffi_rettype, ffi_argtypes) != FFI_OK) { rb_fatal("can't prepare cif for objc method type `%s'", - method_getTypeEncoding(method)); + sig->types); } if (ffi_rettype != &ffi_type_void) { @@ -1199,7 +1281,7 @@ if (ffi_rettype != &ffi_type_void) { VALUE resp; - rb_objc_ocval_to_rbval(ffi_ret, type, &resp); + rb_objc_ocval_to_rbval(ffi_ret, rettype, &resp); return resp; } else { @@ -1212,13 +1294,102 @@ { VALUE klass; Method method; + struct rb_objc_method_sig sig; klass = CLASS_OF(recv); method = class_getInstanceMethod((Class)klass, sel); + assert(rb_objc_fill_sig(recv, (Class)klass, sel, &sig, NULL)); - return rb_objc_call2(recv, klass, sel, method_getImplementation(method), method, NULL, argc, argv); + return rb_objc_call2(recv, klass, sel, method_getImplementation(method), + &sig, NULL, argc, argv); } +static inline const char * +rb_get_bs_method_type(bs_element_method_t *bs_method, int arg) +{ + if (bs_method != NULL) { + if (arg == -1) { + if (bs_method->retval != NULL) + return bs_method->retval->type; + } + else { + int i; + for (i = 0; i < bs_method->args_count; i++) { + if (bs_method->args[i].index == arg) + return bs_method->args[i].type; + } + } + } + return NULL; +} + +bool +rb_objc_fill_sig(VALUE recv, Class klass, SEL sel, struct rb_objc_method_sig *sig, bs_element_method_t *bs_method) +{ + Method method; + const char *type; + char buf[100]; + unsigned i; + + method = class_getInstanceMethod(klass, sel); + if (method != NULL) { + if (bs_method == NULL) { + sig->types = method_getTypeEncoding(method); + sig->argc = method_getNumberOfArguments(method); + } + else { + char buf2[100]; + type = rb_get_bs_method_type(bs_method, -1); + if (type != NULL) { + strlcpy(buf, type, sizeof buf); + } + else { + method_getReturnType(method, buf2, sizeof buf2); + strlcpy(buf, buf2, sizeof buf); + } + + sig->argc = method_getNumberOfArguments(method); + for (i = 0; i < sig->argc; i++) { + if (i >= 2 && (type = rb_get_bs_method_type(bs_method, i - 2)) != NULL) { + strlcat(buf, type, sizeof buf); + } + else { + method_getArgumentType(method, i, buf2, sizeof(buf2)); + strlcat(buf, buf2, sizeof buf); + } + } + + sig->types = (char *)sel_registerName(buf); /* unify the string */ + } + return true; + } + else if (!SPECIAL_CONST_P(recv)) { + NSMethodSignature *msig = [(id)recv methodSignatureForSelector:sel]; + if (msig != NULL) { + char buf[100]; + unsigned i; + + buf[0] = '\0'; + type = rb_get_bs_method_type(bs_method, -1); + if (type == NULL) + type = [msig methodReturnType]; + strlcat(buf, type, sizeof buf); + + sig->argc = [msig numberOfArguments]; + for (i = 0; i < sig->argc; i++) { + if (i < 2 || (type = rb_get_bs_method_type(bs_method, i - 2)) == NULL) { + type = [msig getArgumentTypeAtIndex:i]; + } + strlcat(buf, type, sizeof buf); + } + + sig->types = (char *)sel_registerName(buf); /* unify the string */ + return true; + } + } + return false; +} + void rb_objc_alias(VALUE klass, ID name, ID def) { @@ -1896,12 +2067,14 @@ (bs_element_struct_field_t *)&bs_struct->fields[i]; if (strcmp(ivar_id_str, bs_field->name) == 0) { - VALUE *val; + VALUE val, *pval; - val = &((VALUE *)(data + bs_boxed->ffi_type->size))[i]; - if (*val == 0) - rb_objc_ocval_to_rbval(data + pos, bs_field->type, val); - return *val; + pval = &((VALUE *)(data + bs_boxed->ffi_type->size))[i]; + if (*pval == 0) { + pval = &val; + rb_objc_ocval_to_rbval(data + pos, bs_field->type, pval); + } + return *pval; } pos += rb_objc_octype_to_ffitype(bs_field->type)->size; } @@ -2568,22 +2741,6 @@ } } -static inline void -rb_objc_install_method(Class klass, SEL sel, IMP imp) -{ - Method method = class_getInstanceMethod(klass, sel); - assert(method != NULL); - assert(class_addMethod(klass, sel, imp, method_getTypeEncoding(method))); -} - -static inline void -rb_objc_override_method(Class klass, SEL sel, IMP imp) -{ - Method method = class_getInstanceMethod(klass, sel); - assert(method != NULL); - method_setImplementation(method, imp); -} - static void rb_install_boxed_primitives(void) { Modified: MacRuby/trunk/vm_core.h =================================================================== --- MacRuby/trunk/vm_core.h 2008-08-28 05:59:22 UTC (rev 509) +++ MacRuby/trunk/vm_core.h 2008-08-28 06:00:47 UTC (rev 510) @@ -546,6 +546,7 @@ #if WITH_OBJC # include "bs.h" +# include "objc.h" struct rb_method_cache { unsigned int flags; #define RB_MCACHE_RCALL_FLAG 0x10 @@ -562,7 +563,7 @@ SEL sel; VALUE klass; IMP imp; - Method method; + struct rb_objc_method_sig sig; bs_element_method_t *bs_method; } ocall; struct { Modified: MacRuby/trunk/vm_insnhelper.c =================================================================== --- MacRuby/trunk/vm_insnhelper.c 2008-08-28 05:59:22 UTC (rev 509) +++ MacRuby/trunk/vm_insnhelper.c 2008-08-28 06:00:47 UTC (rev 510) @@ -511,7 +511,6 @@ } bs_element_method_t * rb_bs_find_method(Class klass, SEL sel); -VALUE rb_objc_call2(VALUE recv, VALUE klass, SEL sel, IMP imp, Method method, bs_element_method_t *bs_method, int argc, VALUE *argv); static inline VALUE vm_call_method(rb_thread_t * const th, rb_control_frame_t * const cfp, @@ -547,8 +546,12 @@ mcache->flags = RB_MCACHE_OCALL_FLAG; mcache->as.ocall.klass = klass; mcache->as.ocall.imp = imp; - mcache->as.ocall.method = class_getInstanceMethod((Class)klass, mcache->as.rcall.sel); - mcache->as.ocall.bs_method = rb_bs_find_method((Class)klass, mcache->as.rcall.sel); + mcache->as.ocall.bs_method = rb_bs_find_method( + (Class)klass, mcache->as.rcall.sel); + assert(rb_objc_fill_sig(recv, (Class)klass, + mcache->as.rcall.sel, + &mcache->as.ocall.sig, + mcache->as.ocall.bs_method)); goto ocall_dispatch; } @@ -632,7 +635,7 @@ reg_cfp->sp -= num + 1; - val = rb_objc_call2(recv, klass, mcache->as.rcall.sel, mcache->as.ocall.imp, mcache->as.ocall.method, mcache->as.ocall.bs_method, num, reg_cfp->sp + 1); + val = rb_objc_call2(recv, klass, mcache->as.rcall.sel, mcache->as.ocall.imp, &mcache->as.ocall.sig, mcache->as.ocall.bs_method, num, reg_cfp->sp + 1); if (reg_cfp != th->cfp + 1) rb_bug("cfp consistency error - send"); @@ -680,8 +683,11 @@ mcache->as.ocall.sel = sel; mcache->as.ocall.klass = klass; mcache->as.ocall.imp = imp; - mcache->as.ocall.method = class_getInstanceMethod((Class)klass, mcache->as.rcall.sel); - mcache->as.ocall.bs_method = rb_bs_find_method((Class)klass, mcache->as.rcall.sel); + mcache->as.ocall.bs_method = rb_bs_find_method((Class)klass, + mcache->as.rcall.sel); + assert(rb_objc_fill_sig(recv, (Class)klass, mcache->as.rcall.sel, + &mcache->as.ocall.sig, + mcache->as.ocall.bs_method)); goto ocall_dispatch; } } @@ -809,38 +815,54 @@ } } else if (mcache != NULL) { - const char *p = (const char *)mcache->as.rcall.sel; - size_t len = strlen(p); - if (len >= 3) { - char buf[100]; - SEL sel = 0; - if (isalpha(p[len - 3]) && p[len - 2] == '=' && p[len - 1] == ':') { - /* foo=: -> setFoo: shortcut */ - snprintf(buf, sizeof buf, "set%s", p); - buf[3] = toupper(buf[3]); - buf[len + 1] = ':'; - buf[len + 2] = '\0'; - sel = sel_registerName(buf); - } - else if (isalpha(p[len - 2]) && p[len - 1] == '?') { - /* foo?: -> isFoo: shortcut */ - snprintf(buf, sizeof buf, "is%s", p); - buf[2] = toupper(buf[2]); - buf[len + 1] = '\0'; - sel = sel_registerName(buf); - } - if (sel != 0) { - Method method = class_getInstanceMethod((Class)klass, sel); - if (method != NULL) { - IMP imp = method_getImplementation(method); - if (rb_objc_method_node3(imp) == NULL) { - assert(class_addMethod((Class)klass, mcache->as.rcall.sel, imp, + struct rb_objc_method_sig sig; + if (rb_objc_fill_sig(recv, (Class)klass, mcache->as.rcall.sel, &sig, NULL)) { + /* the class probably implements forwardInvocation: */ + mcache->flags = RB_MCACHE_OCALL_FLAG; + mcache->as.ocall.klass = klass; + mcache->as.ocall.imp = (IMP)objc_msgSend; + mcache->as.ocall.sig = sig; + mcache->as.ocall.bs_method = NULL; + goto ocall_dispatch; + } + else { + const char *p = (const char *)mcache->as.rcall.sel; + size_t len = strlen(p); + if (len >= 3) { + char buf[100]; + SEL sel = 0; + if (isalpha(p[len - 3]) && p[len - 2] == '=' && p[len - 1] == ':') { + /* foo=: -> setFoo: shortcut */ + snprintf(buf, sizeof buf, "set%s", p); + buf[3] = toupper(buf[3]); + buf[len + 1] = ':'; + buf[len + 2] = '\0'; + sel = sel_registerName(buf); + } + else if (isalpha(p[len - 2]) && p[len - 1] == '?') { + /* foo?: -> isFoo: shortcut */ + snprintf(buf, sizeof buf, "is%s", p); + buf[2] = toupper(buf[2]); + buf[len + 1] = '\0'; + sel = sel_registerName(buf); + } + if (sel != 0) { + Method method = class_getInstanceMethod((Class)klass, sel); + IMP imp; + if (method != NULL + && (imp = method_getImplementation(method)) != NULL + && rb_objc_method_node3(imp) == NULL) { + assert(class_addMethod((Class)klass, + mcache->as.rcall.sel, imp, method_getTypeEncoding(method))); mcache->flags = RB_MCACHE_OCALL_FLAG; mcache->as.ocall.klass = klass; mcache->as.ocall.imp = imp; - mcache->as.ocall.method = class_getInstanceMethod((Class)klass, mcache->as.rcall.sel); - mcache->as.ocall.bs_method = rb_bs_find_method((Class)klass, mcache->as.rcall.sel); + mcache->as.ocall.sig.argc = method_getNumberOfArguments(method); + mcache->as.ocall.sig.types = method_getTypeEncoding(method); + mcache->as.ocall.bs_method = + rb_bs_find_method((Class)klass, + mcache->as.rcall.sel); goto ocall_dispatch; } }

1 0