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

[4474] MacRuby/trunk/perf/perf_masgn.rb
by source_changes＠macosforge.org 27 Aug '10

27 Aug '10

Revision: 4474 http://trac.macosforge.org/projects/ruby/changeset/4474 Author: lsansonetti(a)apple.com Date: 2010-08-27 12:59:55 -0700 (Fri, 27 Aug 2010) Log Message: ----------- adding perf test covering symetric masgn Added Paths: ----------- MacRuby/trunk/perf/perf_masgn.rb Added: MacRuby/trunk/perf/perf_masgn.rb =================================================================== --- MacRuby/trunk/perf/perf_masgn.rb (rev 0) +++ MacRuby/trunk/perf/perf_masgn.rb 2010-08-27 19:59:55 UTC (rev 4474) @@ -0,0 +1,16 @@ +perf_test('symetric') do + i = 0 + x = 1 + y = 2 + while i < 200000 + x, y = y, x + y, x = x, y + x, y = y, x + y, x = x, y + x, y = y, x + y, x = x, y + x, y = y, x + y, x = x, y + i += 1 + end +end

1 0

[4473] MacRuby/trunk/perf/perf_io.rb
by source_changes＠macosforge.org 27 Aug '10

27 Aug '10

Revision: 4473 http://trac.macosforge.org/projects/ruby/changeset/4473 Author: lsansonetti(a)apple.com Date: 2010-08-27 12:56:55 -0700 (Fri, 27 Aug 2010) Log Message: ----------- adding some IO perf tests Added Paths: ----------- MacRuby/trunk/perf/perf_io.rb Added: MacRuby/trunk/perf/perf_io.rb =================================================================== --- MacRuby/trunk/perf/perf_io.rb (rev 0) +++ MacRuby/trunk/perf/perf_io.rb 2010-08-27 19:56:55 UTC (rev 4473) @@ -0,0 +1,9 @@ +TEST_FILE = '/usr/share/dict/words' + +perf_test('File.read') do + File.read(TEST_FILE) +end + +perf_test('File#each_line') do + File.open(TEST_FILE).each_line {} +end

1 0

[4472] MacRuby/trunk
by source_changes＠macosforge.org 27 Aug '10

27 Aug '10

Revision: 4472 http://trac.macosforge.org/projects/ruby/changeset/4472 Author: joshua.ballanco(a)apple.com Date: 2010-08-26 23:43:45 -0700 (Thu, 26 Aug 2010) Log Message: ----------- Added some linker options to rubyc Modified Paths: -------------- MacRuby/trunk/bin/rubyc MacRuby/trunk/rubyc.1 Modified: MacRuby/trunk/bin/rubyc =================================================================== --- MacRuby/trunk/bin/rubyc 2010-08-27 03:37:03 UTC (rev 4471) +++ MacRuby/trunk/bin/rubyc 2010-08-27 06:43:45 UTC (rev 4472) @@ -16,6 +16,7 @@ @archs = [] @internal = argv.delete('--internal') @frameworks = %w{Foundation} + @linkf = [] # Parse arguments. OptionParser.new do |opts| @@ -26,6 +27,9 @@ opts.on('--framework <name>', "Link standalone static executable with given framework") { |p| @frameworks << p } opts.on('--sdk <path>', "Use SDK when compiling standalone static executable") { |x| @sdk = x } opts.on('--dylib', "Create a dynamic library") { @dylib = true } + opts.on('--compatibility_version <VERSION>', "Compatibility Version for linking") { |ver| @linkf << "-compatibility_version #{ver}" } + opts.on('--current_version <VERSION>', "Current Version for linking") { |ver| @linkf << "-current_version #{ver}" } + opts.on('--install_name <NAME>', "Install Name for linking") { |name| @linkf << "-install_name #{name}" } opts.on('-C', 'Compile, assemble and link a loadable object file') { @bundle = true } opts.on('-a', '--arch <ARCH>', 'Compile for specified CPU architecture') { |arch| @archs << arch } opts.on('-v', '--version', 'Display the version') { puts RUBY_DESCRIPTION; exit 1 } @@ -139,7 +143,7 @@ end def cleanup - @tmpfiles.each { |x| File.delete(x) } + @tmpfiles.each { |x| File.delete(x) if File.exist?(x) } end private @@ -224,9 +228,9 @@ # Build. main = gen_tmpfile('main', 'c') File.open(main, 'w') { |io| io.write(main_txt) } - linkf = @internal ? "-L. -lmacruby" : "-L#{RbConfig::CONFIG['libdir']} -lmacruby" + @linkf << @internal ? "-L. -lmacruby" : "-L#{RbConfig::CONFIG['libdir']} -lmacruby" objs = objs_data.map { |obj, f| "\"#{obj}\"" }.join(' ') - execute("#{@gcxx} \"#{main}\" -dynamiclib -dynamic -undefined suppress -flat_namespace #{arch_flags} #{linkf} #{objs} -o \"#{output}\"") + execute("#{@gcxx} \"#{main}\" -dynamiclib -dynamic -undefined suppress -flat_namespace #{arch_flags} #{(a)linkf.join(' ')} #{objs} -o \"#{output}\"") strip(output) end Modified: MacRuby/trunk/rubyc.1 =================================================================== --- MacRuby/trunk/rubyc.1 2010-08-27 03:37:03 UTC (rev 4471) +++ MacRuby/trunk/rubyc.1 2010-08-27 06:43:45 UTC (rev 4472) @@ -45,6 +45,16 @@ .Nm require method. .Pp +.It Fl h, Fl -help +Display a short description of the command line options. +.Pp +.It Fl o Ar file +Place the output into +.Ar file . +If this option is not given, +.Nm macrubyc +will try to determine a default output file name based on the object file type that is being generated. For executables, the default is a.out. For objects, the default is the original source file name with the object type extension. For dynamic libraries, this option is mandatory. +.Pp .It Fl -dylib Create a dynamic library instead of an executable. This option compiles every Ruby source file passed to .Nm macrubyc @@ -54,16 +64,17 @@ .Fl o option must be provided when building dynamic libraries. .Pp -.It Fl h, Fl -help -Display a short description of the command line options. +.Bl -tag -width XXXXXXXXXX +The +.Fl -dylib +option can also take the following optional linker arguments (see +.Xr libtool 1 +for more information): +.It Fl -compatibility_version Ar VERSION +.It Fl -current_version Ar VERSION +.It Fl -install_name Ar NAME +.El .Pp -.It Fl o Ar file -Place the output into -.Ar file . -If this option is not given, -.Nm macrubyc -will try to determine a default output file name based on the object file type that is being generated. For executables, the default is a.out. For objects, the default is the original source file name with the object type extension. For dynamic libraries, this option is mandatory. -.Pp .It Fl -static Create a standalone, static executable. By default, executables created by .Nm macrubyc

1 0

[4471] MacRuby/trunk
by source_changes＠macosforge.org 27 Aug '10

27 Aug '10

Revision: 4471 http://trac.macosforge.org/projects/ruby/changeset/4471 Author: lsansonetti(a)apple.com Date: 2010-08-26 20:37:03 -0700 (Thu, 26 Aug 2010) Log Message: ----------- clarify licensing Modified Paths: -------------- MacRuby/trunk/COPYING MacRuby/trunk/LEGAL Modified: MacRuby/trunk/COPYING =================================================================== --- MacRuby/trunk/COPYING 2010-08-27 00:09:08 UTC (rev 4470) +++ MacRuby/trunk/COPYING 2010-08-27 03:37:03 UTC (rev 4471) @@ -1,4 +1,7 @@ MacRuby is copyrighted free software by Apple Inc. +MacRuby contains code from the Ruby project, copyrighted free software by +Yukihiro Matsumoto <matz(a)netlab.jp>. + You can redistribute it and/or modify it under either the terms of the GPL version 2 (see the file GPL), or the conditions below: Modified: MacRuby/trunk/LEGAL =================================================================== --- MacRuby/trunk/LEGAL 2010-08-27 00:09:08 UTC (rev 4470) +++ MacRuby/trunk/LEGAL 2010-08-27 03:37:03 UTC (rev 4471) @@ -2,8 +2,8 @@ ------------------------ All the files in this distribution are covered under either the Ruby's -license (see the file COPYING) or public-domain except some files -mentioned below. +license (see the file COPYING) under specific copyright holders (see their +header comment) or public-domain except some files mentioned below. parse.c:

1 0

[4470] MacRuby/trunk
by source_changes＠macosforge.org 27 Aug '10

27 Aug '10

Revision: 4470 http://trac.macosforge.org/projects/ruby/changeset/4470 Author: lsansonetti(a)apple.com Date: 2010-08-26 17:09:08 -0700 (Thu, 26 Aug 2010) Log Message: ----------- fixed String#sum to accept bits argument greater than 64 (logic imported from 1.9 upstream sources) Modified Paths: -------------- MacRuby/trunk/id.c MacRuby/trunk/id.h MacRuby/trunk/string.c Modified: MacRuby/trunk/id.c =================================================================== --- MacRuby/trunk/id.c 2010-08-26 23:33:33 UTC (rev 4469) +++ MacRuby/trunk/id.c 2010-08-27 00:09:08 UTC (rev 4470) @@ -48,6 +48,7 @@ selMULT = sel_registerName("*:"); selDIV = sel_registerName("/:"); selMOD = sel_registerName("%:"); + selAND = sel_registerName("&:"); selEq = sel_registerName("==:"); selNeq = sel_registerName("!=:"); selCmp = sel_registerName("<=>:"); Modified: MacRuby/trunk/id.h =================================================================== --- MacRuby/trunk/id.h 2010-08-26 23:33:33 UTC (rev 4469) +++ MacRuby/trunk/id.h 2010-08-27 00:09:08 UTC (rev 4470) @@ -58,6 +58,7 @@ extern SEL selMULT; extern SEL selDIV; extern SEL selMOD; +extern SEL selAND; extern SEL selEq; extern SEL selNeq; extern SEL selCmp; Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-08-26 23:33:33 UTC (rev 4469) +++ MacRuby/trunk/string.c 2010-08-27 00:09:08 UTC (rev 4470) @@ -5514,6 +5514,12 @@ * checksum. */ +static inline VALUE +rb_vm_call_simple(VALUE rcv, SEL sel, VALUE arg) +{ + return rb_vm_call(rcv, sel, 1, &arg); +} + static VALUE rstr_sum(VALUE str, SEL sel, int argc, VALUE *argv) { @@ -5524,19 +5530,39 @@ bits = NUM2INT(vbits); } - if (bits >= sizeof(long) * CHAR_BIT) { - rb_raise(rb_eArgError, "bits argument too big"); - } - - unsigned long sum = 0; + VALUE sum = INT2FIX(0); + unsigned long sum0 = 0; for (long i = 0; i < RSTR(str)->length_in_bytes; i++) { - sum += (unsigned char)RSTR(str)->data.bytes[i]; + if (FIXNUM_MAX - UCHAR_MAX < sum0) { + sum = rb_vm_call_simple(sum, selPLUS, LONG2FIX(sum0)); + sum0 = 0; + } + sum0 += (unsigned char)RSTR(str)->data.bytes[i]; } - if (bits != 0) { - sum &= (((unsigned long)1) << bits) - 1; + if (bits == 0) { + if (sum0 != 0) { + sum = rb_vm_call_simple(sum, selPLUS, LONG2FIX(sum0)); + } } + else { + if (sum == INT2FIX(0)) { + if (bits < (int)sizeof(long) * CHAR_BIT) { + sum0 &= (((unsigned long)1) << bits) - 1; + } + sum = LONG2FIX(sum0); + } + else { + if (sum0 != 0) { + sum = rb_vm_call_simple(sum, selPLUS, LONG2FIX(sum0)); + } - return rb_int2inum(sum); + VALUE mod = rb_vm_call_simple(INT2FIX(1), selLTLT, INT2FIX(bits)); + mod = rb_vm_call_simple(mod, selMINUS, INT2FIX(1)); + sum = rb_vm_call_simple(sum, selAND, mod); + } + } + + return sum; } /*

1 0

[4469] MacRuby/trunk/bs.c
by source_changes＠macosforge.org 26 Aug '10

26 Aug '10

Revision: 4469 http://trac.macosforge.org/projects/ruby/changeset/4469 Author: watson1978(a)gmail.com Date: 2010-08-26 16:33:33 -0700 (Thu, 26 Aug 2010) Log Message: ----------- Fixed the Leak Modified Paths: -------------- MacRuby/trunk/bs.c Modified: MacRuby/trunk/bs.c =================================================================== --- MacRuby/trunk/bs.c 2010-08-26 20:43:06 UTC (rev 4468) +++ MacRuby/trunk/bs.c 2010-08-26 23:33:33 UTC (rev 4469) @@ -454,6 +454,7 @@ /* check if the given framework path has not been loaded already */ cf_path = CFStringCreateWithFileSystemRepresentation(kCFAllocatorMalloc, path); + CFMakeCollectable(cf_path); for (unsigned i = 0, count = CFArrayGetCount(parser->loaded_paths); i < count; i++) { CFStringRef s = CFArrayGetValueAtIndex(parser->loaded_paths, i); @@ -1269,7 +1270,6 @@ } } } - CFRelease(cf_path); if (success && options == BS_PARSE_OPTIONS_LOAD_DYLIBS && framework_path != NULL) { char buf[PATH_MAX];

1 0

[4468] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 26 Aug '10

26 Aug '10

Revision: 4468 http://trac.macosforge.org/projects/ruby/changeset/4468 Author: joshua.ballanco(a)apple.com Date: 2010-08-26 13:43:06 -0700 (Thu, 26 Aug 2010) Log Message: ----------- Fixes multiple feature requires Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-08-25 23:45:27 UTC (rev 4467) +++ MacRuby/trunk/vm.cpp 2010-08-26 20:43:06 UTC (rev 4468) @@ -5019,8 +5019,10 @@ return false; } void *init_func = iter->second; - ((void *(*)(void *, void *))init_func)((void *)rb_vm_top_self(), NULL); - aot_features.erase(iter); + if (init_func != NULL) { + ((void *(*)(void *, void *))init_func)((void *)rb_vm_top_self(), NULL); + iter->second = NULL; + } return true; }

1 0

[4467] MacRuby/trunk/sample-macruby/Skreenics/src
by source_changes＠macosforge.org 25 Aug '10

25 Aug '10

Revision: 4467 http://trac.macosforge.org/projects/ruby/changeset/4467 Author: martinlagardette(a)apple.com Date: 2010-08-25 16:45:27 -0700 (Wed, 25 Aug 2010) Log Message: ----------- Fix small GC issues with Skreenics Modified Paths: -------------- MacRuby/trunk/sample-macruby/Skreenics/src/Operations/SKGenerateThumbnailOperation.rb MacRuby/trunk/sample-macruby/Skreenics/src/SkreenicsAppDelegate.rb Modified: MacRuby/trunk/sample-macruby/Skreenics/src/Operations/SKGenerateThumbnailOperation.rb =================================================================== --- MacRuby/trunk/sample-macruby/Skreenics/src/Operations/SKGenerateThumbnailOperation.rb 2010-08-25 22:21:53 UTC (rev 4466) +++ MacRuby/trunk/sample-macruby/Skreenics/src/Operations/SKGenerateThumbnailOperation.rb 2010-08-25 23:45:27 UTC (rev 4467) @@ -232,10 +232,11 @@ repr.representationUsingType(imageFileType, properties: nil).writeToFile(savePath, atomically: true) end - # Release all our manually allocated data - thumbnailShadow.release - resultImage.release - movie.release + # Since the code is garbage collected, there is no need to release + # the allocated variables (unlike the Obj-C version) + # thumbnailShadow.release + # resultImage.release + # movie.release QTMovie.exitQTKitOnThread Modified: MacRuby/trunk/sample-macruby/Skreenics/src/SkreenicsAppDelegate.rb =================================================================== --- MacRuby/trunk/sample-macruby/Skreenics/src/SkreenicsAppDelegate.rb 2010-08-25 22:21:53 UTC (rev 4466) +++ MacRuby/trunk/sample-macruby/Skreenics/src/SkreenicsAppDelegate.rb 2010-08-25 23:45:27 UTC (rev 4467) @@ -12,10 +12,10 @@ # We want to be able to provide alpha colors NSColor.setIgnoresAlpha(false) # Set transformers for the prefs -NSValueTransformer.setValueTransformer(ExpandedPathToIconTransformer.alloc.init.autorelease, forName: "ExpandedPathToIconTransformer") -NSValueTransformer.setValueTransformer(ExpandedPathToPathTransformer.alloc.init.autorelease, forName: "ExpandedPathToPathTransformer") +NSValueTransformer.setValueTransformer(ExpandedPathToIconTransformer.alloc.init, forName: "ExpandedPathToIconTransformer") +NSValueTransformer.setValueTransformer(ExpandedPathToPathTransformer.alloc.init, forName: "ExpandedPathToPathTransformer") # Set the default RGB to NSColor transformer -NSValueTransformer.setValueTransformer(SKRgbToNSColorTransformer.alloc.init.autorelease, forName: "SKRgbToNSColorTransformer") +NSValueTransformer.setValueTransformer(SKRgbToNSColorTransformer.alloc.init, forName: "SKRgbToNSColorTransformer") # And now we can register our user defaults NSUserDefaults.standardUserDefaults.registerDefaults(NSDictionary.dictionaryWithContentsOfFile(NSBundle.mainBundle.pathForResource("UserDefaults", ofType: "plist")))

1 0

[4466] MacRuby/trunk
by source_changes＠macosforge.org 25 Aug '10

25 Aug '10

Revision: 4466 http://trac.macosforge.org/projects/ruby/changeset/4466 Author: lsansonetti(a)apple.com Date: 2010-08-25 15:21:53 -0700 (Wed, 25 Aug 2010) Log Message: ----------- fixed a bug in the BridgeSupport parser when dealing with circular dependencies + minor bug fixes Modified Paths: -------------- MacRuby/trunk/bridgesupport.cpp MacRuby/trunk/bs.c Modified: MacRuby/trunk/bridgesupport.cpp =================================================================== --- MacRuby/trunk/bridgesupport.cpp 2010-08-25 20:56:08 UTC (rev 4465) +++ MacRuby/trunk/bridgesupport.cpp 2010-08-25 22:21:53 UTC (rev 4466) @@ -1007,8 +1007,8 @@ (const void *)name, NULL)) { VALUE val = strchr(bs_enum->value, '.') != NULL - ? rb_float_new(rb_cstr_to_dbl(bs_enum->value, 1)) - : rb_cstr_to_inum(bs_enum->value, 10, 1); + ? rb_float_new(rb_cstr_to_dbl(bs_enum->value, 0)) + : rb_cstr_to_inum(bs_enum->value, 10, 0); CFDictionarySetValue(rb_cObject_dict, (const void *)name, (const void *)val); } Modified: MacRuby/trunk/bs.c =================================================================== --- MacRuby/trunk/bs.c 2010-08-25 20:56:08 UTC (rev 4465) +++ MacRuby/trunk/bs.c 2010-08-25 22:21:53 UTC (rev 4466) @@ -464,6 +464,8 @@ } } + CFArrayAppendValue(parser->loaded_paths, cf_path); + //printf("parsing %s\n", path); #define BAIL(fmt, args...) \ @@ -556,6 +558,8 @@ depends_on_path = get_attribute(reader, "path"); CHECK_ATTRIBUTE(depends_on_path, "path"); + +//printf("depends of %s\n", depends_on_path); bs_path_found = bs_find_path(depends_on_path, bs_path, sizeof bs_path); @@ -734,7 +738,6 @@ bs_element_cftype_t *bs_cftype; char *cftype_name; char *cftype_type; - char *cftype_gettypeid_func_name; cftype_name = get_attribute(reader, "name"); CHECK_ATTRIBUTE(cftype_name, "name"); @@ -748,6 +751,11 @@ bs_cftype->name = cftype_name; bs_cftype->type = cftype_type; +#if 1 + /* the type_id field isn't used in MacRuby */ + bs_cftype->type_id = 0; +#else + char *cftype_gettypeid_func_name; cftype_gettypeid_func_name = get_attribute(reader, "gettypeid_func"); if (cftype_gettypeid_func_name != NULL) { void *sym; @@ -765,6 +773,7 @@ else { bs_cftype->type_id = 0; } +#endif bs_cftype->tollfree = get_attribute(reader, "tollfree"); @@ -1249,8 +1258,16 @@ xmlFreeTextReader(reader); - if (success) { - CFArrayAppendValue(parser->loaded_paths, cf_path); + if (!success) { + for (unsigned i = 0, count = CFArrayGetCount(parser->loaded_paths); + i < count; i++) { + CFStringRef s = CFArrayGetValueAtIndex(parser->loaded_paths, i); + if (CFStringCompare(cf_path, s, kCFCompareCaseInsensitive) + == kCFCompareEqualTo) { + CFArrayRemoveValueAtIndex(parser->loaded_paths, i); + break; + } + } } CFRelease(cf_path);

1 0

[4465] MacRuby/trunk/bin/rubyc
by source_changes＠macosforge.org 25 Aug '10

25 Aug '10

Revision: 4465 http://trac.macosforge.org/projects/ruby/changeset/4465 Author: lsansonetti(a)apple.com Date: 2010-08-25 13:56:08 -0700 (Wed, 25 Aug 2010) Log Message: ----------- warn the user that static compilation is not yet finished Modified Paths: -------------- MacRuby/trunk/bin/rubyc Modified: MacRuby/trunk/bin/rubyc =================================================================== --- MacRuby/trunk/bin/rubyc 2010-08-25 20:45:49 UTC (rev 4464) +++ MacRuby/trunk/bin/rubyc 2010-08-25 20:56:08 UTC (rev 4465) @@ -80,6 +80,7 @@ def run @uses_bs_flags = '' if @static + $stderr.puts "Warning: static compilation is currently a work in progress and provided for development only. The compilation process may simply fail or generate non-functional machine code objects. Use it at your own risk." # BridgeSupport compilation is only enabled during static compilation. @frameworks.each do |f| p =

1 0