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

[643] MacRuby/trunk
by source_changes＠macosforge.org 30 Sep '08

30 Sep '08

Revision: 643 http://trac.macosforge.org/projects/ruby/changeset/643 Author: lsansonetti(a)apple.com Date: 2008-09-30 12:29:23 -0700 (Tue, 30 Sep 2008) Log Message: ----------- applying cleanup patch from vincent isambart Modified Paths: -------------- MacRuby/trunk/objc.m MacRuby/trunk/vm_insnhelper.c Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-09-30 19:27:55 UTC (rev 642) +++ MacRuby/trunk/objc.m 2008-09-30 19:29:23 UTC (rev 643) @@ -1360,11 +1360,10 @@ 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); + strlcpy(buf, type, sizeof buf); sig->argc = [msig numberOfArguments]; for (i = 0; i < sig->argc; i++) { Modified: MacRuby/trunk/vm_insnhelper.c =================================================================== --- MacRuby/trunk/vm_insnhelper.c 2008-09-30 19:27:55 UTC (rev 642) +++ MacRuby/trunk/vm_insnhelper.c 2008-09-30 19:29:23 UTC (rev 643) @@ -523,13 +523,11 @@ { VALUE val; #if WITH_OBJC - NODE *mn; + NODE *mn = NULL; #if ENABLE_DEBUG_LOGGING bool cached = false; #endif - mn = NULL; - if (mcache != NULL) { cache_relookup: if (mcache->flags & RB_MCACHE_RCALL_FLAG) { @@ -728,7 +726,7 @@ start_method_dispatch: - if (mn != 0) { + if (mn != NULL) { if ((mn->nd_noex == 0)) { /* dispatch method */ NODE *node;

1 0

[642] MacRuby/trunk
by source_changes＠macosforge.org 30 Sep '08

30 Sep '08

Revision: 642 http://trac.macosforge.org/projects/ruby/changeset/642 Author: lsansonetti(a)apple.com Date: 2008-09-30 12:27:55 -0700 (Tue, 30 Sep 2008) Log Message: ----------- support for writing formal protocol methods Modified Paths: -------------- MacRuby/trunk/objc.m MacRuby/trunk/test/ruby/test_objc.rb Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-09-29 05:30:32 UTC (rev 641) +++ MacRuby/trunk/objc.m 2008-09-30 19:27:55 UTC (rev 642) @@ -2627,6 +2627,45 @@ } static void +reload_protocols(void) +{ + Protocol **prots; + unsigned int i, prots_count; + + prots = objc_copyProtocolList(&prots_count); + for (i = 0; i < prots_count; i++) { + Protocol *p; + struct objc_method_description *methods; + unsigned j, methods_count; + + p = prots[i]; + +#define REGISTER_MDESCS(t) \ + do { \ + for (j = 0; j < methods_count; j++) { \ + if (methods[j].name == sel_ignored) \ + continue; \ + st_insert(t, (st_data_t)methods[j].name, (st_data_t)methods[j].types); \ + } \ + free(methods); \ + } \ + while (0) + + methods = protocol_copyMethodDescriptionList(p, true, true, &methods_count); + REGISTER_MDESCS(bs_inf_prot_imethods); + methods = protocol_copyMethodDescriptionList(p, false, true, &methods_count); + REGISTER_MDESCS(bs_inf_prot_imethods); + methods = protocol_copyMethodDescriptionList(p, true, false, &methods_count); + REGISTER_MDESCS(bs_inf_prot_cmethods); + methods = protocol_copyMethodDescriptionList(p, false, false, &methods_count); + REGISTER_MDESCS(bs_inf_prot_cmethods); + +#undef REGISTER_MDESCS + } + free(prots); +} + +static void reload_class_constants(void) { static int class_count = 0; @@ -2750,6 +2789,7 @@ rb_objc_search_and_load_bridge_support(cstr); reload_class_constants(); + reload_protocols(); return Qtrue; } Modified: MacRuby/trunk/test/ruby/test_objc.rb =================================================================== --- MacRuby/trunk/test/ruby/test_objc.rb 2008-09-29 05:30:32 UTC (rev 641) +++ MacRuby/trunk/test/ruby/test_objc.rb 2008-09-30 19:27:55 UTC (rev 642) @@ -411,5 +411,15 @@ assert_equal(Module, Kernel.class) assert_equal(Class, Class.new.class) assert_equal(Module, Module.new.class) - end + end + + def test_protocol + o = Object.new + # TODO object should automatically conform to protocol when all mandatory methods are implemented. + #assert(!o.conformsToProtocol(Protocol.protocolWithName('NSMutableCopying'))) + def o.mutableCopyWithZone(zone); self; end + #assert(o.conformsToProtocol(Protocol.protocolWithName('NSMutableCopying'))) + assert_equal(o, o.mutableCopy) + assert_equal('^{_NSZone=}', o.methodSignatureForSelector('mutableCopyWithZone:').getArgumentTypeAtIndex(2)) + end end

1 0

[641] MacRuby/trunk/lib/hotcocoa/delegate_builder.rb
by source_changes＠macosforge.org 29 Sep '08

29 Sep '08

Revision: 641 http://trac.macosforge.org/projects/ruby/changeset/641 Author: lsansonetti(a)apple.com Date: 2008-09-28 22:30:32 -0700 (Sun, 28 Sep 2008) Log Message: ----------- reverting workaround Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/delegate_builder.rb Modified: MacRuby/trunk/lib/hotcocoa/delegate_builder.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/delegate_builder.rb 2008-09-29 05:22:09 UTC (rev 640) +++ MacRuby/trunk/lib/hotcocoa/delegate_builder.rb 2008-09-29 05:30:32 UTC (rev 641) @@ -43,9 +43,7 @@ end def set_delegate - #puts "setting delegate (#{delegate}) on #{control.class} which has the following methods:" - #puts (delegate.methods.sort - Object.methods).collect {|method| "- #{method}"} - control.performSelector('setDelegate:', withObject:delegate) + control.setDelegate(delegate) end def block_instance_variable @@ -78,4 +76,4 @@ end -end \ No newline at end of file +end

1 0

[640] MacRuby/trunk/lib/hotcocoa/mappings/font.rb
by source_changes＠macosforge.org 29 Sep '08

29 Sep '08

Revision: 640 http://trac.macosforge.org/projects/ruby/changeset/640 Author: rich(a)infoether.com Date: 2008-09-28 22:22:09 -0700 (Sun, 28 Sep 2008) Log Message: ----------- add font traits Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/font.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/font.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/font.rb 2008-09-29 05:13:09 UTC (rev 639) +++ MacRuby/trunk/lib/hotcocoa/mappings/font.rb 2008-09-29 05:22:09 UTC (rev 640) @@ -1,9 +1,22 @@ HotCocoa::Mappings.map :font => :NSFont do + constant :trait, { + :italic => NSItalicFontMask, + :bold => NSBoldFontMask, + :unbold => NSUnboldFontMask, + :nonstandard_character_set => NSNonStandardCharacterSetFontMask, + :narrow => NSNarrowFontMask, + :expanded => NSExpandedFontMask, + :condensed => NSCondensedFontMask, + :small_caps => NSSmallCapsFontMask, + :poster => NSPosterFontMask, + :compressed => NSCompressedFontMask, + :fixed_pitch => NSFixedPitchFontMask, + :unitalic => NSUnitalicFontMask + } + def alloc_with_options(options) - if options.has_key?(:system) && options.delete(:bold) - return NSFont.boldSystemFontOfSize(options.delete(:system)) - end + font = nil { :label => :labelFontOfSize, :system => :systemFontOfSize, @@ -17,13 +30,15 @@ :user_fixed => :userFixedPitchFontOfSize, :user => :userFontOfSize }.each do |key, method| - return eval("NSFont.#{method}(#{options.delete(key)})") if options.has_key?(key) + if options.has_key?(key) + font = eval("NSFont.#{method}(#{options.delete(key)})") + break + end end - if options.has_key?(:name) - return NSFont.fontWithName(options.delete(:name), size:(options.delete(:size) || 0)) - else - raise "Cannot create font with the provided options" - end + font = NSFont.fontWithName(options.delete(:name), size:(options.delete(:size) || 0)) if options.has_key?(:name) + raise "Cannot create font with the provided options" unless font + font = NSFontManager.sharedFontManager.convertFont(font, toHaveTrait:options.delete(:trait)) if options[:trait] + font end end

1 0

[639] MacRuby/trunk/vm_insnhelper.c
by source_changes＠macosforge.org 29 Sep '08

29 Sep '08

Revision: 639 http://trac.macosforge.org/projects/ruby/changeset/639 Author: lsansonetti(a)apple.com Date: 2008-09-28 22:13:09 -0700 (Sun, 28 Sep 2008) Log Message: ----------- appropriately invalidating the objc method cache Modified Paths: -------------- MacRuby/trunk/vm_insnhelper.c Modified: MacRuby/trunk/vm_insnhelper.c =================================================================== --- MacRuby/trunk/vm_insnhelper.c 2008-09-29 03:14:51 UTC (rev 638) +++ MacRuby/trunk/vm_insnhelper.c 2008-09-29 05:13:09 UTC (rev 639) @@ -531,6 +531,7 @@ mn = NULL; if (mcache != NULL) { +cache_relookup: if (mcache->flags & RB_MCACHE_RCALL_FLAG) { if (mcache->as.rcall.klass == klass && mcache->as.rcall.node != NULL) { mn = mcache->as.rcall.node; @@ -641,8 +642,15 @@ else if (mcache->flags & RB_MCACHE_OCALL_FLAG) { rb_control_frame_t *reg_cfp; rb_control_frame_t *_cfp; - -ocall_dispatch: + + if (mcache->as.ocall.klass != klass) { + mcache->flags = RB_MCACHE_RCALL_FLAG; + mcache->as.rcall.klass = 0; + mcache->as.rcall.node = NULL; + goto cache_relookup; + } + +ocall_dispatch: reg_cfp = cfp; _cfp = vm_push_frame(th, 0, FRAME_MAGIC_CFUNC | (flag << FRAME_MAGIC_MASK_BITS), recv, (VALUE) blockptr, 0, reg_cfp->sp, 0, 1); @@ -888,6 +896,7 @@ mcache->as.rcall.sel, imp, method_getTypeEncoding(method))); mcache->flags = RB_MCACHE_OCALL_FLAG; + mcache->as.rcall.sel = sel; mcache->as.ocall.klass = klass; mcache->as.ocall.imp = imp; mcache->as.ocall.sig.argc = method_getNumberOfArguments(method);

1 0

[638] MacRuby/trunk
by source_changes＠macosforge.org 29 Sep '08

29 Sep '08

Revision: 638 http://trac.macosforge.org/projects/ruby/changeset/638 Author: lsansonetti(a)apple.com Date: 2008-09-28 20:14:51 -0700 (Sun, 28 Sep 2008) Log Message: ----------- use UTF8 encoding instead of ASCII, thanks to vincent isambart :) Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/plist.rb MacRuby/trunk/test/hotcocoa/test_plist.rb Modified: MacRuby/trunk/lib/hotcocoa/plist.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/plist.rb 2008-09-29 02:29:34 UTC (rev 637) +++ MacRuby/trunk/lib/hotcocoa/plist.rb 2008-09-29 03:14:51 UTC (rev 638) @@ -11,7 +11,7 @@ raise ArgumentError, "invalid mutability `#{mutability}'" end if data.is_a?(String) - data = data.dataUsingEncoding(NSASCIIStringEncoding) + data = data.dataUsingEncoding(NSUTF8StringEncoding) if data.nil? raise ArgumentError, "cannot convert string `#{data}' to data" end @@ -40,6 +40,6 @@ data = NSPropertyListSerialization.dataFromPropertyList(self, format:format, errorDescription:nil) - NSMutableString.alloc.initWithData(data, encoding:NSASCIIStringEncoding) + NSMutableString.alloc.initWithData(data, encoding:NSUTF8StringEncoding) end end Modified: MacRuby/trunk/test/hotcocoa/test_plist.rb =================================================================== --- MacRuby/trunk/test/hotcocoa/test_plist.rb 2008-09-29 02:29:34 UTC (rev 637) +++ MacRuby/trunk/test/hotcocoa/test_plist.rb 2008-09-29 03:14:51 UTC (rev 638) @@ -9,6 +9,7 @@ assert_plist(true) assert_plist(false) assert_plist('foo') + assert_plist('aiueo'.transform('latin-hiragana')) assert_plist(:foo, 'foo') assert_plist([1,2,3]) assert_plist({'un' => 1, 'deux' => 2})

1 0

[637] MacRuby/trunk
by source_changes＠macosforge.org 29 Sep '08

29 Sep '08

Revision: 637 http://trac.macosforge.org/projects/ruby/changeset/637 Author: lsansonetti(a)apple.com Date: 2008-09-28 19:29:34 -0700 (Sun, 28 Sep 2008) Log Message: ----------- adding Object#to_plist, HotCocoa#read_plist Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa.rb Added Paths: ----------- MacRuby/trunk/lib/hotcocoa/plist.rb MacRuby/trunk/test/hotcocoa/ MacRuby/trunk/test/hotcocoa/test_plist.rb Added: MacRuby/trunk/lib/hotcocoa/plist.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/plist.rb (rev 0) +++ MacRuby/trunk/lib/hotcocoa/plist.rb 2008-09-29 02:29:34 UTC (rev 637) @@ -0,0 +1,45 @@ +module HotCocoa + def read_plist(data, mutability=:all) + mutability = case mutability + when :none + NSPropertyListImmutable + when :containers_only + NSPropertyListMutableContainers + when :all + NSPropertyListMutableContainersAndLeaves + else + raise ArgumentError, "invalid mutability `#{mutability}'" + end + if data.is_a?(String) + data = data.dataUsingEncoding(NSASCIIStringEncoding) + if data.nil? + raise ArgumentError, "cannot convert string `#{data}' to data" + end + end + # TODO retrieve error description and raise it if there is an error. + NSPropertyListSerialization.propertyListFromData(data, + mutabilityOption:mutability, + format:nil, + errorDescription:nil) + end +end + +class Object + def to_plist(format=:xml) + format = case format + when :xml + NSPropertyListXMLFormat_v1_0 + when :binary + NSPropertyListBinaryFormat_v1_0 + when :open_step + NSPropertyListOpenStepFormat + else + raise ArgumentError, "invalid format `#{format}'" + end + # TODO retrieve error description and raise it if there is an error. + data = NSPropertyListSerialization.dataFromPropertyList(self, + format:format, + errorDescription:nil) + NSMutableString.alloc.initWithData(data, encoding:NSASCIIStringEncoding) + end +end Modified: MacRuby/trunk/lib/hotcocoa.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa.rb 2008-09-29 01:51:41 UTC (rev 636) +++ MacRuby/trunk/lib/hotcocoa.rb 2008-09-29 02:29:34 UTC (rev 637) @@ -16,5 +16,6 @@ require 'hotcocoa/data_sources/table_data_source' require 'hotcocoa/data_sources/combo_box_data_source' require 'hotcocoa/kernel_ext' +require 'hotcocoa/plist' HotCocoa::Mappings.reload Added: MacRuby/trunk/test/hotcocoa/test_plist.rb =================================================================== --- MacRuby/trunk/test/hotcocoa/test_plist.rb (rev 0) +++ MacRuby/trunk/test/hotcocoa/test_plist.rb 2008-09-29 02:29:34 UTC (rev 637) @@ -0,0 +1,28 @@ +require 'test/unit' +require 'hotcocoa' + +class TestPlist < Test::Unit::TestCase + include HotCocoa + + def test_to_plist + assert_plist(123) + assert_plist(true) + assert_plist(false) + assert_plist('foo') + assert_plist(:foo, 'foo') + assert_plist([1,2,3]) + assert_plist({'un' => 1, 'deux' => 2}) + end + + def test_to_plist_with_invalid_objects + assert_plist(nil, nil) + assert_plist(Object.new, nil) + assert_plist(/foo/, nil) + end + + private + + def assert_plist(val, expected=val) + assert_equal(expected, read_plist(val.to_plist)) + end +end

1 0

[636] MacRuby/trunk/lib/hotcocoa/mappings/timer.rb
by source_changes＠macosforge.org 29 Sep '08

29 Sep '08

Revision: 636 http://trac.macosforge.org/projects/ruby/changeset/636 Author: rich(a)infoether.com Date: 2008-09-28 18:51:41 -0700 (Sun, 28 Sep 2008) Log Message: ----------- add timer Added Paths: ----------- MacRuby/trunk/lib/hotcocoa/mappings/timer.rb Added: MacRuby/trunk/lib/hotcocoa/mappings/timer.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/timer.rb (rev 0) +++ MacRuby/trunk/lib/hotcocoa/mappings/timer.rb 2008-09-29 01:51:41 UTC (rev 636) @@ -0,0 +1,25 @@ +HotCocoa::Mappings.map :timer => :NSTimer do + + defaults :scheduled => true, :repeats => false + + def alloc_with_options(options) + raise ArgumentError, "timer requires :interval" unless options.has_key?(:interval) + target = options.delete(:target) + selector = options.delete(:selector) + if !target || !selector + raise ArgumentError, "timer requires either :target and :selector or :on_action" unless options.has_key?(:on_action) + target = Object.new + target.instance_variable_set(:@block, options.delete(:on_action)) + def target.fire(timer) + @block.call(timer) + end + selector = "fire:" + end + if options.delete(:scheduled) + NSTimer.scheduledTimerWithTimeInterval(options.delete(:interval), target:target, selector:selector, userInfo:options.delete(:info), repeats:options.delete(:repeats)) + else + NSTimer.timerWithTimeInterval(options.delete(:interval), target:target, selector:selector, userInfo:options.delete(:info), repeats:options.delete(:repeats)) + end + end + +end \ No newline at end of file

1 0

[635] MacRuby/trunk/lib/hotcocoa/delegate_builder.rb
by source_changes＠macosforge.org 29 Sep '08

29 Sep '08

Revision: 635 http://trac.macosforge.org/projects/ruby/changeset/635 Author: rich(a)infoether.com Date: 2008-09-28 18:51:33 -0700 (Sun, 28 Sep 2008) Log Message: ----------- fix delegates Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/delegate_builder.rb Modified: MacRuby/trunk/lib/hotcocoa/delegate_builder.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/delegate_builder.rb 2008-09-28 03:49:21 UTC (rev 634) +++ MacRuby/trunk/lib/hotcocoa/delegate_builder.rb 2008-09-29 01:51:33 UTC (rev 635) @@ -43,9 +43,9 @@ end def set_delegate - puts "setting delegate (#{delegate}) on #{control.class} which has the following methods:" - puts (delegate.methods.sort - Object.methods).collect {|method| "- #{method}"} - control.setDelegate(delegate) + #puts "setting delegate (#{delegate}) on #{control.class} which has the following methods:" + #puts (delegate.methods.sort - Object.methods).collect {|method| "- #{method}"} + control.performSelector('setDelegate:', withObject:delegate) end def block_instance_variable

1 0

[634] MacRuby/trunk/lib/hotcocoa
by source_changes＠macosforge.org 28 Sep '08

28 Sep '08

Revision: 634 http://trac.macosforge.org/projects/ruby/changeset/634 Author: rich(a)infoether.com Date: 2008-09-27 20:49:21 -0700 (Sat, 27 Sep 2008) Log Message: ----------- trying to figure out why delegate methods are not working, this has some debug code in it Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/delegate_builder.rb MacRuby/trunk/lib/hotcocoa/mapper.rb Modified: MacRuby/trunk/lib/hotcocoa/delegate_builder.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/delegate_builder.rb 2008-09-28 03:49:02 UTC (rev 633) +++ MacRuby/trunk/lib/hotcocoa/delegate_builder.rb 2008-09-28 03:49:21 UTC (rev 634) @@ -39,10 +39,12 @@ end def clear_delegate - control.setDelegate(nil) + control.setDelegate(nil) if control.delegate end def set_delegate + puts "setting delegate (#{delegate}) on #{control.class} which has the following methods:" + puts (delegate.methods.sort - Object.methods).collect {|method| "- #{method}"} control.setDelegate(delegate) end Modified: MacRuby/trunk/lib/hotcocoa/mapper.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mapper.rb 2008-09-28 03:49:02 UTC (rev 633) +++ MacRuby/trunk/lib/hotcocoa/mapper.rb 2008-09-28 03:49:21 UTC (rev 634) @@ -119,24 +119,25 @@ end def delegate_module_for_control_class - return Mapper.delegate_modules[control_class] if Mapper.delegate_modules.has_key?(control_class) - delegate_module = Module.new - required_methods = [] - inherited_delegate_methods.each do |delegate_method, mapping| - required_methods << delegate_method if mapping[:required] + unless Mapper.delegate_modules.has_key?(control_class) + delegate_module = Module.new + required_methods = [] + inherited_delegate_methods.each do |delegate_method, mapping| + required_methods << delegate_method if mapping[:required] + end + inherited_delegate_methods.each do |delegate_method, mapping| + parameters = mapping[:parameters] ? ", "+mapping[:parameters].map {|param| %{"#{param}"} }.join(",") : "" + delegate_module.module_eval %{ + def #{mapping[:to]}(&block) + raise "Must pass in a block to use this delegate method" unless block_given? + @_delegate_builder ||= HotCocoa::DelegateBuilder.new(self, #{required_methods.inspect}) + @_delegate_builder.add_delegated_method(block, "#{delegate_method}" #{parameters}) + end + } + end + Mapper.delegate_modules[control_class] = delegate_module end - inherited_delegate_methods.each do |delegate_method, mapping| - parameters = mapping[:parameters] ? ", "+mapping[:parameters].map {|param| %{"#{param}"} }.join(",") : "" - delegate_module.module_eval %{ - def #{mapping[:to]}(&block) - raise "Must pass in a block to use this delegate method" unless block_given? - @_delegate_builder ||= HotCocoa::DelegateBuilder.new(self, #{required_methods.inspect}) - @_delegate_builder.add_delegated_method(block, "#{delegate_method}" #{parameters}) - end - } - end - Mapper.delegate_modules[control_class] = delegate_module - delegate_module + Mapper.delegate_modules[control_class] end def decorate_with_bindings_methods(control)

1 0