April 2010 - macruby-changes - lists.macosforge.org

[3937] MacRuby/trunk
by source_changes＠macosforge.org 16 Apr '10

16 Apr '10

Revision: 3937 http://trac.macosforge.org/projects/ruby/changeset/3937 Author: lsansonetti(a)apple.com Date: 2010-04-16 16:59:45 -0700 (Fri, 16 Apr 2010) Log Message: ----------- force class initialization upon lazy lookup Modified Paths: -------------- MacRuby/trunk/objc.h MacRuby/trunk/objc.m MacRuby/trunk/object.c MacRuby/trunk/variable.c Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2010-04-15 02:02:19 UTC (rev 3936) +++ MacRuby/trunk/objc.h 2010-04-16 23:59:45 UTC (rev 3937) @@ -234,6 +234,7 @@ void rb_objc_exception_raise(const char *name, const char *message); bool rb_objc_ignore_sel(SEL sel); +void rb_objc_force_class_initialize(Class klass); #if defined(__cplusplus) } Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2010-04-15 02:02:19 UTC (rev 3936) +++ MacRuby/trunk/objc.m 2010-04-16 23:59:45 UTC (rev 3937) @@ -640,13 +640,20 @@ bool rb_objc_ignore_sel(SEL sel) { - return sel == @selector(retain) - || sel == @selector(release) - || sel == @selector(autorelease) - || sel == @selector(retainCount) - || sel == @selector(dealloc); + return sel == @selector(retain) + || sel == @selector(release) + || sel == @selector(autorelease) + || sel == @selector(retainCount) + || sel == @selector(dealloc); } +void +rb_objc_force_class_initialize(Class klass) +{ + // This forces +initialize to be called. + class_getMethodImplementation(klass, @selector(initialize)); +} + size_t rb_objc_type_size(const char *type) { Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2010-04-15 02:02:19 UTC (rev 3936) +++ MacRuby/trunk/object.c 2010-04-16 23:59:45 UTC (rev 3937) @@ -1843,8 +1843,7 @@ static bool initialized = false; if (!initialized) { initialized = true; - // force initialize - class_getMethodImplementation((Class)module, sel); + rb_objc_force_class_initialize((Class)module); initialized = false; if (rb_block_given_p()) { Modified: MacRuby/trunk/variable.c =================================================================== --- MacRuby/trunk/variable.c 2010-04-15 02:02:19 UTC (rev 3936) +++ MacRuby/trunk/variable.c 2010-04-16 23:59:45 UTC (rev 3937) @@ -12,6 +12,7 @@ #include "ruby/util.h" #include "id.h" #include "vm.h" +#include "objc.h" st_table *rb_global_tbl; st_table *rb_class_tbl; @@ -1524,6 +1525,7 @@ if (k != 0 && !RCLASS_RUBY(k)) { // Set the constant. Only if the returned class is a pure // Objective-C class, to avoid namespace conflicts in Ruby land. + rb_objc_force_class_initialize((Class)k); rb_const_set(klass, name, k); return k; }

1 0

[3936] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 15 Apr '10

15 Apr '10

Revision: 3936 http://trac.macosforge.org/projects/ruby/changeset/3936 Author: lsansonetti(a)apple.com Date: 2010-04-14 19:02:19 -0700 (Wed, 14 Apr 2010) Log Message: ----------- when preparing a method, do an extra resolve pass in case the objc cache is invalid Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-04-15 02:01:47 UTC (rev 3935) +++ MacRuby/trunk/vm.cpp 2010-04-15 02:02:19 UTC (rev 3936) @@ -2131,6 +2131,11 @@ prepare_method: m = class_getInstanceMethod(klass, sel); + if (m == NULL && rb_vm_resolve_method(klass, sel)) { + m = class_getInstanceMethod(klass, sel); + assert(m != NULL); + } + if (precompiled) { if (imp == NULL) { imp = (IMP)data;

1 0

[3935] MacRuby/trunk/dispatcher.cpp
by source_changes＠macosforge.org 15 Apr '10

15 Apr '10

Revision: 3935 http://trac.macosforge.org/projects/ruby/changeset/3935 Author: lsansonetti(a)apple.com Date: 2010-04-14 19:01:47 -0700 (Wed, 14 Apr 2010) Log Message: ----------- reset current super state when doing normal dispatch Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2010-04-15 02:00:40 UTC (rev 3934) +++ MacRuby/trunk/dispatcher.cpp 2010-04-15 02:01:47 UTC (rev 3935) @@ -261,9 +261,12 @@ const int count = RARRAY_LEN(ary); bool klass_located = false; #if ROXOR_VM_DEBUG - printf("locating super method %s of class %s in ancestor chain %s\n", - sel_getName(sel), rb_class2name((VALUE)klass), - RSTRING_PTR(rb_inspect(ary))); + printf("locating super method %s of class %s in ancestor chain: ", + sel_getName(sel), rb_class2name((VALUE)klass)); + for (int i = 0; i < count; i++) { + printf("%s ", rb_class2name(RARRAY_AT(ary, i))); + } + printf("\n"); #endif for (int i = 0; i < count; i++) { if (!klass_located && RARRAY_AT(ary, i) == (VALUE)self_class) { @@ -598,6 +601,7 @@ &current_super_class); } else { + current_super_sel = 0; method = class_getInstanceMethod(klass, sel); }

1 0

[3934] MacRuby/trunk
by source_changes＠macosforge.org 15 Apr '10

15 Apr '10

Revision: 3934 http://trac.macosforge.org/projects/ruby/changeset/3934 Author: lsansonetti(a)apple.com Date: 2010-04-14 19:00:40 -0700 (Wed, 14 Apr 2010) Log Message: ----------- always auto-convert NSNumbers Modified Paths: -------------- MacRuby/trunk/objc.h MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2010-04-14 20:04:13 UTC (rev 3933) +++ MacRuby/trunk/objc.h 2010-04-15 02:00:40 UTC (rev 3934) @@ -174,6 +174,8 @@ return (id)kCFNull; } if (FIXNUM_P(obj)) { + // TODO: this could be optimized in case we can fit the fixnum + // into an immediate NSNumber directly. long val = FIX2LONG(obj); CFNumberRef number = CFNumberCreate(NULL, kCFNumberLongType, &val); CFMakeCollectable(number); @@ -190,6 +192,8 @@ return (id)obj; } +extern CFTypeID __CFNumberTypeID; + static inline VALUE rb_ocid_to_rval(id obj) { @@ -202,35 +206,25 @@ if (obj == (id)kCFNull || obj == nil) { return Qnil; } -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 - if (true) { -#else - if (((unsigned long)obj & 0x1) == 0x1) { -#endif - // An Objective-C immediate! We only recognize NSNumbers for now. - Class k = object_getClass(obj); - while (k != NULL) { - if (k == (Class)rb_cNSNumber) { - if (CFNumberIsFloatType((CFNumberRef)obj)) { - // Will likely not happen, but just in case... - double v; - assert(CFNumberGetValue((CFNumberRef)obj, - kCFNumberDoubleType, &v)); - return DOUBLE2NUM(v); - } - else { - long v; - assert(CFNumberGetValue((CFNumberRef)obj, - kCFNumberLongType, &v)); - return LONG2FIX(v); - } - } - k = class_getSuperclass(k); + + if (CFGetTypeID(obj) == __CFNumberTypeID) { + // TODO: this could be optimized in case the object is an immediate. + if (CFNumberIsFloatType((CFNumberRef)obj)) { + double v = 0; + assert(CFNumberGetValue((CFNumberRef)obj, kCFNumberDoubleType, &v)); + return DOUBLE2NUM(v); } -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 + else { + long v = 0; + assert(CFNumberGetValue((CFNumberRef)obj, kCFNumberLongType, &v)); + return LONG2FIX(v); + } + } + + if (((unsigned long)obj & 0x1) == 0x1) { rb_bug("unknown Objective-C immediate: %p\n", obj); -#endif } + return (VALUE)obj; } Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2010-04-14 20:04:13 UTC (rev 3933) +++ MacRuby/trunk/objc.m 2010-04-15 02:00:40 UTC (rev 3934) @@ -25,6 +25,8 @@ # include "bs.h" #endif +CFTypeID __CFNumberTypeID = 0; + static inline const char * rb_get_bs_method_type(bs_element_method_t *bs_method, int arg) { @@ -663,6 +665,9 @@ void Init_ObjC(void) { + __CFNumberTypeID = CFNumberGetTypeID(); + assert(__CFNumberTypeID > 0); + rb_objc_define_method(rb_mKernel, "load_bridge_support_file", rb_objc_load_bs, 1);

1 0

[3933] MacRuby/trunk/objc.h
by source_changes＠macosforge.org 14 Apr '10

14 Apr '10

Revision: 3933 http://trac.macosforge.org/projects/ruby/changeset/3933 Author: eloy.de.enige(a)gmail.com Date: 2010-04-14 13:04:13 -0700 (Wed, 14 Apr 2010) Log Message: ----------- Make NSNumber bridging work for us on old systems again Modified Paths: -------------- MacRuby/trunk/objc.h Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2010-04-14 20:01:45 UTC (rev 3932) +++ MacRuby/trunk/objc.h 2010-04-14 20:04:13 UTC (rev 3933) @@ -202,7 +202,11 @@ if (obj == (id)kCFNull || obj == nil) { return Qnil; } +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 + if (true) { +#else if (((unsigned long)obj & 0x1) == 0x1) { +#endif // An Objective-C immediate! We only recognize NSNumbers for now. Class k = object_getClass(obj); while (k != NULL) { @@ -223,7 +227,9 @@ } k = class_getSuperclass(k); } +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 rb_bug("unknown Objective-C immediate: %p\n", obj); +#endif } return (VALUE)obj; }

1 0

[3932] MacRuby/trunk
by source_changes＠macosforge.org 14 Apr '10

14 Apr '10

Revision: 3932 http://trac.macosforge.org/projects/ruby/changeset/3932 Author: lsansonetti(a)apple.com Date: 2010-04-14 13:01:45 -0700 (Wed, 14 Apr 2010) Log Message: ----------- revert r3931 Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/3931 Modified Paths: -------------- MacRuby/trunk/ext/json/extconf.rb MacRuby/trunk/ext/ripper/extconf.rb MacRuby/trunk/rakelib/builder/options.rb MacRuby/trunk/rakelib/builder.rake Modified: MacRuby/trunk/ext/json/extconf.rb =================================================================== --- MacRuby/trunk/ext/json/extconf.rb 2010-04-14 14:15:39 UTC (rev 3931) +++ MacRuby/trunk/ext/json/extconf.rb 2010-04-14 20:01:45 UTC (rev 3932) @@ -3,6 +3,6 @@ require 'rbconfig' $INCFLAGS << ' -I../..' -$CFLAGS << ' -Wall -std=gnu99' +$CFLAGS << ' -Wall -std=c99' create_makefile("json") Modified: MacRuby/trunk/ext/ripper/extconf.rb =================================================================== --- MacRuby/trunk/ext/ripper/extconf.rb 2010-04-14 14:15:39 UTC (rev 3931) +++ MacRuby/trunk/ext/ripper/extconf.rb 2010-04-14 20:01:45 UTC (rev 3932) @@ -17,7 +17,7 @@ $VPATH << '$(topdir)' << '$(top_srcdir)' $INCFLAGS << ' -I$(topdir) -I$(top_srcdir) -I$(top_srcdir)/onig' $INCFLAGS << ' -I../../icu-1060' if `sw_vers -productVersion`.to_f <= 10.6 - $CFLAGS << ' -std=gnu99' + $CFLAGS << ' -std=c99' create_makefile 'ripper' end Modified: MacRuby/trunk/rakelib/builder/options.rb =================================================================== --- MacRuby/trunk/rakelib/builder/options.rb 2010-04-14 14:15:39 UTC (rev 3931) +++ MacRuby/trunk/rakelib/builder/options.rb 2010-04-14 20:01:45 UTC (rev 3932) @@ -115,8 +115,8 @@ LDFLAGS << " -lpthread -ldl -lxml2 -lobjc -lauto -licucore -framework Foundation" DLDFLAGS = "-dynamiclib -undefined suppress -flat_namespace -install_name #{INSTALL_NAME} -current_version #{MACRUBY_VERSION} -compatibility_version #{MACRUBY_VERSION}" DLDFLAGS << " -unexported_symbols_list #{UNEXPORTED_SYMBOLS_LIST}" if UNEXPORTED_SYMBOLS_LIST -CFLAGS << " -std=gnu99" # we add this one later to not conflict with C++ flags -OBJC_CFLAGS << " -std=gnu99" +CFLAGS << " -std=c99" # we add this one later to not conflict with C++ flags +OBJC_CFLAGS << " -std=c99" if `sw_vers -productVersion`.to_f <= 10.6 CFLAGS << " -I./icu-1060" Modified: MacRuby/trunk/rakelib/builder.rake =================================================================== --- MacRuby/trunk/rakelib/builder.rake 2010-04-14 14:15:39 UTC (rev 3931) +++ MacRuby/trunk/rakelib/builder.rake 2010-04-14 20:01:45 UTC (rev 3932) @@ -3,7 +3,7 @@ desc "Build the markgc tool" task :mark_gc do if !File.exist?('markgc') - sh "/usr/bin/gcc -std=gnu99 markgc.c -o markgc -Wno-format" + sh "/usr/bin/gcc -std=c99 markgc.c -o markgc -Wno-format" end end

1 0

[3931] MacRuby/trunk
by source_changes＠macosforge.org 14 Apr '10

14 Apr '10

Revision: 3931 http://trac.macosforge.org/projects/ruby/changeset/3931 Author: neeracher(a)apple.com Date: 2010-04-14 07:15:39 -0700 (Wed, 14 Apr 2010) Log Message: ----------- -std=c99 -> -std=gnu99 (Because some system include files may include language extensions) Modified Paths: -------------- MacRuby/trunk/ext/json/extconf.rb MacRuby/trunk/ext/ripper/extconf.rb MacRuby/trunk/rakelib/builder/options.rb MacRuby/trunk/rakelib/builder.rake Modified: MacRuby/trunk/ext/json/extconf.rb =================================================================== --- MacRuby/trunk/ext/json/extconf.rb 2010-04-14 09:08:00 UTC (rev 3930) +++ MacRuby/trunk/ext/json/extconf.rb 2010-04-14 14:15:39 UTC (rev 3931) @@ -3,6 +3,6 @@ require 'rbconfig' $INCFLAGS << ' -I../..' -$CFLAGS << ' -Wall -std=c99' +$CFLAGS << ' -Wall -std=gnu99' create_makefile("json") Modified: MacRuby/trunk/ext/ripper/extconf.rb =================================================================== --- MacRuby/trunk/ext/ripper/extconf.rb 2010-04-14 09:08:00 UTC (rev 3930) +++ MacRuby/trunk/ext/ripper/extconf.rb 2010-04-14 14:15:39 UTC (rev 3931) @@ -17,7 +17,7 @@ $VPATH << '$(topdir)' << '$(top_srcdir)' $INCFLAGS << ' -I$(topdir) -I$(top_srcdir) -I$(top_srcdir)/onig' $INCFLAGS << ' -I../../icu-1060' if `sw_vers -productVersion`.to_f <= 10.6 - $CFLAGS << ' -std=c99' + $CFLAGS << ' -std=gnu99' create_makefile 'ripper' end Modified: MacRuby/trunk/rakelib/builder/options.rb =================================================================== --- MacRuby/trunk/rakelib/builder/options.rb 2010-04-14 09:08:00 UTC (rev 3930) +++ MacRuby/trunk/rakelib/builder/options.rb 2010-04-14 14:15:39 UTC (rev 3931) @@ -115,8 +115,8 @@ LDFLAGS << " -lpthread -ldl -lxml2 -lobjc -lauto -licucore -framework Foundation" DLDFLAGS = "-dynamiclib -undefined suppress -flat_namespace -install_name #{INSTALL_NAME} -current_version #{MACRUBY_VERSION} -compatibility_version #{MACRUBY_VERSION}" DLDFLAGS << " -unexported_symbols_list #{UNEXPORTED_SYMBOLS_LIST}" if UNEXPORTED_SYMBOLS_LIST -CFLAGS << " -std=c99" # we add this one later to not conflict with C++ flags -OBJC_CFLAGS << " -std=c99" +CFLAGS << " -std=gnu99" # we add this one later to not conflict with C++ flags +OBJC_CFLAGS << " -std=gnu99" if `sw_vers -productVersion`.to_f <= 10.6 CFLAGS << " -I./icu-1060" Modified: MacRuby/trunk/rakelib/builder.rake =================================================================== --- MacRuby/trunk/rakelib/builder.rake 2010-04-14 09:08:00 UTC (rev 3930) +++ MacRuby/trunk/rakelib/builder.rake 2010-04-14 14:15:39 UTC (rev 3931) @@ -3,7 +3,7 @@ desc "Build the markgc tool" task :mark_gc do if !File.exist?('markgc') - sh "/usr/bin/gcc -std=c99 markgc.c -o markgc -Wno-format" + sh "/usr/bin/gcc -std=gnu99 markgc.c -o markgc -Wno-format" end end

1 0

[3930] MacRuby/trunk/bin/ruby_deploy
by source_changes＠macosforge.org 14 Apr '10

14 Apr '10

Revision: 3930 http://trac.macosforge.org/projects/ruby/changeset/3930 Author: lsansonetti(a)apple.com Date: 2010-04-14 02:08:00 -0700 (Wed, 14 Apr 2010) Log Message: ----------- backport r3929 into trunk Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/3929 Modified Paths: -------------- MacRuby/trunk/bin/ruby_deploy Modified: MacRuby/trunk/bin/ruby_deploy =================================================================== --- MacRuby/trunk/bin/ruby_deploy 2010-04-14 06:19:10 UTC (rev 3929) +++ MacRuby/trunk/bin/ruby_deploy 2010-04-14 09:08:00 UTC (rev 3930) @@ -83,17 +83,18 @@ end def compile_files - Dir.glob(File.join(@app_bundle, 'Contents/Resources/*.rb')) + - Dir.glob(File.join(app_macruby_usr, '**/*.rb')) + Dir.glob(File.join(@app_bundle, 'Contents/Resources/*.rb')) end + MACRUBYC = File.join(RbConfig::CONFIG['bindir'], 'macrubyc') + def compile compile_files.each do |source| base = File.basename(source, '.rb') next if base == 'rb_main' obj = File.join(File.dirname(source), base + '.rbo') if !File.exist?(obj) or File.mtime(source) > File.mtime(obj) - compile_cmd = "macrubyc -C \"#{source}\" -o \"#{obj}\"" + compile_cmd = "#{MACRUBYC} -C \"#{source}\" -o \"#{obj}\"" # Use Xcode ARCHS env var to determine which archs to compile for compile_cmd += ENV['ARCHS'].strip.split.map { |a| " -a #{a}" }.join if ENV['ARCHS'] execute(compile_cmd, "Can't compile \"#{source}\"")

1 0

[3929] MacRuby/branches/vm-mcache/bin/ruby_deploy
by source_changes＠macosforge.org 14 Apr '10

14 Apr '10

Revision: 3929 http://trac.macosforge.org/projects/ruby/changeset/3929 Author: lsansonetti(a)apple.com Date: 2010-04-13 23:19:10 -0700 (Tue, 13 Apr 2010) Log Message: ----------- do not include stdlib files for compilation and spawn macrubyc from the current ruby's bindir Modified Paths: -------------- MacRuby/branches/vm-mcache/bin/ruby_deploy Modified: MacRuby/branches/vm-mcache/bin/ruby_deploy =================================================================== --- MacRuby/branches/vm-mcache/bin/ruby_deploy 2010-04-14 03:35:11 UTC (rev 3928) +++ MacRuby/branches/vm-mcache/bin/ruby_deploy 2010-04-14 06:19:10 UTC (rev 3929) @@ -83,17 +83,18 @@ end def compile_files - Dir.glob(File.join(@app_bundle, 'Contents/Resources/*.rb')) + - Dir.glob(File.join(app_macruby_usr, '**/*.rb')) + Dir.glob(File.join(@app_bundle, 'Contents/Resources/*.rb')) end + MACRUBYC = File.join(RbConfig::CONFIG['bindir'], 'macrubyc') + def compile compile_files.each do |source| base = File.basename(source, '.rb') next if base == 'rb_main' obj = File.join(File.dirname(source), base + '.rbo') if !File.exist?(obj) or File.mtime(source) > File.mtime(obj) - compile_cmd = "macrubyc -C \"#{source}\" -o \"#{obj}\"" + compile_cmd = "#{MACRUBYC} -C \"#{source}\" -o \"#{obj}\"" # Use Xcode ARCHS env var to determine which archs to compile for compile_cmd += ENV['ARCHS'].strip.split.map { |a| " -a #{a}" }.join if ENV['ARCHS'] execute(compile_cmd, "Can't compile \"#{source}\"")

1 0

[3928] MacRubyWebsite/trunk/content/downloads.txt
by source_changes＠macosforge.org 14 Apr '10

14 Apr '10

Revision: 3928 http://trac.macosforge.org/projects/ruby/changeset/3928 Author: lsansonetti(a)apple.com Date: 2010-04-13 20:35:11 -0700 (Tue, 13 Apr 2010) Log Message: ----------- fixed nightly build location Modified Paths: -------------- MacRubyWebsite/trunk/content/downloads.txt Modified: MacRubyWebsite/trunk/content/downloads.txt =================================================================== --- MacRubyWebsite/trunk/content/downloads.txt 2010-04-14 03:07:29 UTC (rev 3927) +++ MacRubyWebsite/trunk/content/downloads.txt 2010-04-14 03:35:11 UTC (rev 3928) @@ -17,7 +17,7 @@ h2. Nightly builds <p> -You can download one of MacRuby's development branch <a href="http://macruby.icoretech.org/">nightly builds</a>, which also come as standalone binaries. Please note that these builds are development versions of MacRuby and might perhaps be unstable. +You can download one of MacRuby's development branch <a href="http://www.macruby.org/files/nightlies">nightly builds</a>, which also come as standalone binaries. Please note that these builds are development versions of MacRuby and might perhaps be unstable. <em>Note: these builds only work on Intel machines running on Snow Leopard or higher.</em> </p>

1 0