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

[822] MacRuby/trunk/lib/hotcocoa/application_builder.rb
by source_changes＠macosforge.org 28 Feb '09

28 Feb '09

Revision: 822 http://trac.macosforge.org/projects/ruby/changeset/822 Author: lsansonetti(a)apple.com Date: 2009-02-28 13:13:53 -0800 (Sat, 28 Feb 2009) Log Message: ----------- no need to copy the BridgeSupport dylib files Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/application_builder.rb Modified: MacRuby/trunk/lib/hotcocoa/application_builder.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/application_builder.rb 2009-02-28 21:09:05 UTC (rev 821) +++ MacRuby/trunk/lib/hotcocoa/application_builder.rb 2009-02-28 21:13:53 UTC (rev 822) @@ -93,7 +93,6 @@ def deploy copy_framework - copy_bs_dylibs end def deploy? @@ -150,15 +149,6 @@ end `install_name_tool -change #{current_macruby_path}/usr/lib/libmacruby.dylib @executable_path/../Frameworks/MacRuby.framework/Versions/#{current_macruby_version}/usr/lib/libmacruby.dylib '#{macos_root}/#{objective_c_executable_file}'` end - - def copy_bs_dylibs - unless File.exist?(bridgesupport_root) - FileUtils.mkdir_p(bridgesupport_root) - Dir.glob('/System/Library/Frameworks/**/BridgeSupport/*.dylib').each do |p| - FileUtils.cp(p, bridgesupport_root) - end - end - end def copy_sources if secure?

1 0

[821] MacRuby/trunk/Rakefile
by source_changes＠macosforge.org 28 Feb '09

28 Feb '09

Revision: 821 http://trac.macosforge.org/projects/ruby/changeset/821 Author: lsansonetti(a)apple.com Date: 2009-02-28 13:09:05 -0800 (Sat, 28 Feb 2009) Log Message: ----------- 10.5.6 is now necessary Modified Paths: -------------- MacRuby/trunk/Rakefile Modified: MacRuby/trunk/Rakefile =================================================================== --- MacRuby/trunk/Rakefile 2009-02-28 21:06:49 UTC (rev 820) +++ MacRuby/trunk/Rakefile 2009-02-28 21:09:05 UTC (rev 821) @@ -42,8 +42,8 @@ verbose(true) -if `sw_vers -productVersion`.strip.to_f < 10.5 - $stderr.puts "Sorry, your environment is not supported. MacRuby requires Mac OS X 10.5 or higher." +if `sw_vers -productVersion`.strip < '10.5.6' + $stderr.puts "Sorry, your environment is not supported. MacRuby requires Mac OS X 10.5.6 or higher." exit 1 end

1 0

[820] MacRuby/trunk/instruby.rb
by source_changes＠macosforge.org 28 Feb '09

28 Feb '09

Revision: 820 http://trac.macosforge.org/projects/ruby/changeset/820 Author: lsansonetti(a)apple.com Date: 2009-02-28 13:06:49 -0800 (Sat, 28 Feb 2009) Log Message: ----------- removed the markgc phase, since the problem was fixed in 10.5.6 Modified Paths: -------------- MacRuby/trunk/instruby.rb Modified: MacRuby/trunk/instruby.rb =================================================================== --- MacRuby/trunk/instruby.rb 2009-02-28 20:38:50 UTC (rev 819) +++ MacRuby/trunk/instruby.rb 2009-02-28 21:06:49 UTC (rev 820) @@ -516,35 +516,6 @@ ln_sfh File.join("../../..", CONFIG['bindir'], 'rb_nibtool'), ib_dest install('tool/rb_nibtool.old', ib_dest, :mode => $prog_mode) -touch_file = '/System/Library/Frameworks/.bridgesupport_dylib_gcmarked' -if ($destdir.empty? and File.exist?(touch_file)) or `sw_vers -productVersion`.strip.to_f >= 10.6 - puts "bridge support dylibs already fixed" -else - puts "fixing bridge support dylibs" - unless File.exist?('markgc') - unless system("/usr/bin/gcc markgc.c -std=gnu99 -o markgc -nostdinc -I/usr/include") - $stderr.puts "cannot build the markgc tool" - exit 1 - end - end - Dir.glob('/System/Library/Frameworks/**/BridgeSupport/*.dylib').each do |p| - unless File.exist?(touch_file) - unless system("./markgc '#{p}' >& /dev/null") - $stderr.puts "cannot markgc #{p}" - exit 1 - end - end - unless $destdir.empty? - dirname = File.dirname(p) - mkdir_p(dirname) - install(p, dirname) - end - end - if $destdir.empty? - touch(touch_file) - end -end - end # unless $installing_rdoc # vi:set sw=2:

1 0

[819] MacRuby/trunk
by source_changes＠macosforge.org 28 Feb '09

28 Feb '09

Revision: 819 http://trac.macosforge.org/projects/ruby/changeset/819 Author: lsansonetti(a)apple.com Date: 2009-02-28 12:38:50 -0800 (Sat, 28 Feb 2009) Log Message: ----------- fixed GC leaks Modified Paths: -------------- MacRuby/trunk/include/ruby/io.h MacRuby/trunk/io.c MacRuby/trunk/thread.c Modified: MacRuby/trunk/include/ruby/io.h =================================================================== --- MacRuby/trunk/include/ruby/io.h 2009-02-28 20:33:06 UTC (rev 818) +++ MacRuby/trunk/include/ruby/io.h 2009-02-28 20:38:50 UTC (rev 819) @@ -72,7 +72,8 @@ RFILE(obj)->fptr = 0;\ }\ fp = 0;\ - fp = RFILE(obj)->fptr = ALLOC(rb_io_t);\ + fp = ALLOC(rb_io_t);\ + GC_WB(&RFILE(obj)->fptr, fp);\ fp->fd = -1;\ fp->stdio_file = NULL;\ fp->mode = 0;\ Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2009-02-28 20:33:06 UTC (rev 818) +++ MacRuby/trunk/io.c 2009-02-28 20:38:50 UTC (rev 819) @@ -656,7 +656,7 @@ int rb_io_wait_writable(int f) { - rb_fdset_t wfds; + rb_fdset_t *wfds = xmalloc(sizeof(rb_fdset_t)); switch (errno) { case EINTR: @@ -670,13 +670,13 @@ #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN case EWOULDBLOCK: #endif - rb_fd_init(&wfds); - rb_fd_set(f, &wfds); + rb_fd_init(wfds); + rb_fd_set(f, wfds); #ifdef HAVE_RB_FD_INIT - rb_ensure(wait_writable, (VALUE)&wfds, - (VALUE (*)(VALUE))rb_fd_term, (VALUE)&wfds); + rb_ensure(wait_writable, (VALUE)wfds, + (VALUE (*)(VALUE))rb_fd_term, (VALUE)wfds); #else - rb_thread_select(f + 1, NULL, &wfds, NULL, NULL); + rb_thread_select(f + 1, NULL, wfds, NULL, NULL); #endif return Qtrue; Modified: MacRuby/trunk/thread.c =================================================================== --- MacRuby/trunk/thread.c 2009-02-28 20:33:06 UTC (rev 818) +++ MacRuby/trunk/thread.c 2009-02-28 20:38:50 UTC (rev 819) @@ -1786,7 +1786,7 @@ if (o < sizeof(fd_set)) o = sizeof(fd_set); if (m > o) { - fds->fdset = realloc(fds->fdset, m); + GC_WB(&fds->fdset, realloc(fds->fdset, m)); memset((char *)fds->fdset + o, 0, m - o); } if (n >= fds->maxfd) fds->maxfd = n + 1; @@ -1820,7 +1820,7 @@ if (size < sizeof(fd_set)) size = sizeof(fd_set); dst->maxfd = max; - dst->fdset = realloc(dst->fdset, size); + GC_WB(&dst->fdset, realloc(dst->fdset, size)); memcpy(dst->fdset, src, size); }

1 0

[818] MacRuby/trunk/st.c
by source_changes＠macosforge.org 28 Feb '09

28 Feb '09

Revision: 818 http://trac.macosforge.org/projects/ruby/changeset/818 Author: lsansonetti(a)apple.com Date: 2009-02-28 12:33:06 -0800 (Sat, 28 Feb 2009) Log Message: ----------- fixed a GC leak Modified Paths: -------------- MacRuby/trunk/st.c Modified: MacRuby/trunk/st.c =================================================================== --- MacRuby/trunk/st.c 2009-02-28 20:31:47 UTC (rev 817) +++ MacRuby/trunk/st.c 2009-02-28 20:33:06 UTC (rev 818) @@ -454,7 +454,7 @@ do { hash_val = ptr->hash % new_num_bins; ptr->next = new_bins[hash_val]; - new_bins[hash_val] = ptr; + GC_WB(&new_bins[hash_val], ptr); } while ((ptr = ptr->fore) != table->head); } }

1 0

[817] MacRuby/trunk/include/ruby/defines.h
by source_changes＠macosforge.org 28 Feb '09

28 Feb '09

Revision: 817 http://trac.macosforge.org/projects/ruby/changeset/817 Author: lsansonetti(a)apple.com Date: 2009-02-28 12:31:47 -0800 (Sat, 28 Feb 2009) Log Message: ----------- fixed a serious bug in the GC_WB() macro that would evaluate the second parameter twice Modified Paths: -------------- MacRuby/trunk/include/ruby/defines.h Modified: MacRuby/trunk/include/ruby/defines.h =================================================================== --- MacRuby/trunk/include/ruby/defines.h 2009-02-27 12:54:37 UTC (rev 816) +++ MacRuby/trunk/include/ruby/defines.h 2009-02-28 20:31:47 UTC (rev 817) @@ -302,7 +302,7 @@ *(void **)dst = nv; \ } \ else { \ - rb_objc_wb((void *)dst, (void *)newval); \ + rb_objc_wb((void *)dst, (void *)nv); \ } \ } \ while (0)

1 0

[816] MacRuby/trunk
by source_changes＠macosforge.org 27 Feb '09

27 Feb '09

Revision: 816 http://trac.macosforge.org/projects/ruby/changeset/816 Author: eloy.de.enige(a)gmail.com Date: 2009-02-27 04:54:37 -0800 (Fri, 27 Feb 2009) Log Message: ----------- Make HotCocoa mapper builder methods callable on the HotCocoa module as well as on instances. Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mapper.rb MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb Modified: MacRuby/trunk/lib/hotcocoa/mapper.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mapper.rb 2009-02-27 12:44:55 UTC (rev 815) +++ MacRuby/trunk/lib/hotcocoa/mapper.rb 2009-02-27 12:54:37 UTC (rev 816) @@ -49,7 +49,7 @@ Views[guid] = control if guid inst.customize(control) map.each do |key, value| - if control.respond_to?(key) && value == true + if control.respond_to?(key) and not control.respond_to?("#{key}=") and value == true if control.respond_to?("set#{key.to_s.capitalize}") eval "control.set#{key.to_s.capitalize}(true)" else @@ -71,6 +71,10 @@ end control end + # make the function callable using HotCocoa.xxxx + HotCocoa.send(:module_function, builder_method) + # module_function makes the instance method private, but we want it to stay public + HotCocoa.send(:public, builder_method) self end Modified: MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-02-27 12:44:55 UTC (rev 815) +++ MacRuby/trunk/test-macruby/cases/hotcocoa/mappings_test.rb 2009-02-27 12:54:37 UTC (rev 816) @@ -31,6 +31,12 @@ assert Mappings.frameworks.is_a?(Hash) end + it "should create a mapping to a class with a module and instance method" do + Mappings.map(:method_name_that_does_not_already_exist => SampleClass) {} + assert_respond_to HotCocoa, :method_name_that_does_not_already_exist + assert_respond_to HotCocoa.new, :method_name_that_does_not_already_exist + end + it "should create a mapping to a class with a Class instance given to #map" do Mappings.map(:klass => SampleClass) {} assert_equal SampleClass, Mappings.mappings[:klass].control_class

1 0

[815] MacRuby/trunk
by source_changes＠macosforge.org 27 Feb '09

27 Feb '09

Revision: 815 http://trac.macosforge.org/projects/ruby/changeset/815 Author: eloy.de.enige(a)gmail.com Date: 2009-02-27 04:44:55 -0800 (Fri, 27 Feb 2009) Log Message: ----------- Use NSString#length for String#length which correctly returns the length of a string with multibyte characters. Patch by Vincent Isambart. Modified Paths: -------------- MacRuby/trunk/insns.def MacRuby/trunk/test-macruby/cases/string_test.rb Modified: MacRuby/trunk/insns.def =================================================================== --- MacRuby/trunk/insns.def 2009-02-25 22:24:26 UTC (rev 814) +++ MacRuby/trunk/insns.def 2009-02-27 12:44:55 UTC (rev 815) @@ -1980,10 +1980,7 @@ { if (!SPECIAL_CONST_P(recv) && BASIC_OP_UNREDEFINED_P(BOP_LENGTH)) { - if (HEAP_CLASS_OF(recv) == rb_cCFString) { - val = rb_str_length(recv); - } - else if (HEAP_CLASS_OF(recv) == rb_cCFArray) { + if (HEAP_CLASS_OF(recv) == rb_cCFArray) { val = LONG2NUM(RARRAY_LEN(recv)); } else if (HEAP_CLASS_OF(recv) == rb_cCFHash) { Modified: MacRuby/trunk/test-macruby/cases/string_test.rb =================================================================== --- MacRuby/trunk/test-macruby/cases/string_test.rb 2009-02-25 22:24:26 UTC (rev 814) +++ MacRuby/trunk/test-macruby/cases/string_test.rb 2009-02-27 12:44:55 UTC (rev 815) @@ -22,7 +22,7 @@ @end EOS File.open('/tmp/_test_string.m', 'w') { |io| io.write(s) } - system("gcc /tmp/_test_string.m -bundle -o #{bundle} -framework Foundation -fobjc-gc-only") or exit 1 + system("gcc /tmp/_test_string.m -bundle -o #{bundle} -arch i386 -arch x86_64 -framework Foundation -fobjc-gc-only") or exit 1 end require 'dl'; DL.dlopen(bundle) end @@ -43,6 +43,12 @@ end end + it "should return the correct length for multibyte characters" do + assert_equal(3, 'あいう'.length) + assert_equal(2, 'aあ'.length) + assert_equal(1, 'a'.length) + end + # # Tests for UTF-16 surrogate pairs # These tests should be fixed in the future.

1 0

[814] MacRuby/branches/testing/
by source_changes＠macosforge.org 25 Feb '09

25 Feb '09

Revision: 814 http://trac.macosforge.org/projects/ruby/changeset/814 Author: lsansonetti(a)apple.com Date: 2009-02-25 14:24:26 -0800 (Wed, 25 Feb 2009) Log Message: ----------- removing testing branch Removed Paths: ------------- MacRuby/branches/testing/

1 0

[813] MacRuby/trunk
by source_changes＠macosforge.org 14 Feb '09

14 Feb '09

Revision: 813 http://trac.macosforge.org/projects/ruby/changeset/813 Author: lsansonetti(a)apple.com Date: 2009-02-13 16:56:22 -0800 (Fri, 13 Feb 2009) Log Message: ----------- make sure the primitive methods are added when creating the singleton class of a CF string/array/hash Modified Paths: -------------- MacRuby/trunk/class.c MacRuby/trunk/test/ruby/test_array.rb Modified: MacRuby/trunk/class.c =================================================================== --- MacRuby/trunk/class.c 2009-02-12 19:06:06 UTC (rev 812) +++ MacRuby/trunk/class.c 2009-02-14 00:56:22 UTC (rev 813) @@ -173,7 +173,17 @@ rb_objc_create_class(const char *name, VALUE super) { VALUE klass; - + + if (super == rb_cCFString) { + super = rb_cNSMutableString; + } + else if (super == rb_cCFArray) { + super = rb_cNSMutableArray; + } + else if (super == rb_cCFHash) { + super = rb_cNSMutableHash; + } + klass = rb_objc_alloc_class(name, super, T_CLASS, rb_cClass); objc_registerClassPair((Class)klass); Modified: MacRuby/trunk/test/ruby/test_array.rb =================================================================== --- MacRuby/trunk/test/ruby/test_array.rb 2009-02-12 19:06:06 UTC (rev 812) +++ MacRuby/trunk/test/ruby/test_array.rb 2009-02-14 00:56:22 UTC (rev 813) @@ -1584,4 +1584,13 @@ def test_array_subclass assert_equal(Array2, Array2[1,2,3].uniq.class, "[ruby-dev:34581]") end + + def test_array_singleton_class + a = [1,2,3] + def a.foo; 42; end + assert_equal(42, a.foo) + assert_equal([1,2,3], a) + a.replace([4,5,6]) + assert_equal([4,5,6], a) + end end

1 0