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

[4176] MacRuby/trunk/spec/frozen/core/encoding/converter/convpath_spec.rb
by source_changes＠macosforge.org 30 May '10

30 May '10

Revision: 4176 http://trac.macosforge.org/projects/ruby/changeset/4176 Author: eloy.de.enige(a)gmail.com Date: 2010-05-30 04:14:31 -0700 (Sun, 30 May 2010) Log Message: ----------- And actually implement the convpath spec as Patrick proposed... Modified Paths: -------------- MacRuby/trunk/spec/frozen/core/encoding/converter/convpath_spec.rb Modified: MacRuby/trunk/spec/frozen/core/encoding/converter/convpath_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/core/encoding/converter/convpath_spec.rb 2010-05-30 11:10:25 UTC (rev 4175) +++ MacRuby/trunk/spec/frozen/core/encoding/converter/convpath_spec.rb 2010-05-30 11:14:31 UTC (rev 4176) @@ -29,6 +29,7 @@ ec = Encoding::Converter.new('ascii','Big5') ec.convpath.size.should == 2 ec.convpath.first.first.should == Encoding::US_ASCII + ec.convpath.first.last.should == ec.convpath.last.first ec.convpath.last.last.should == Encoding::Big5 end

1 0

[4175] MacRuby/trunk/spec/frozen/core/encoding/converter/convpath_spec.rb
by source_changes＠macosforge.org 30 May '10

30 May '10

Revision: 4175 http://trac.macosforge.org/projects/ruby/changeset/4175 Author: eloy.de.enige(a)gmail.com Date: 2010-05-30 04:10:25 -0700 (Sun, 30 May 2010) Log Message: ----------- Only describe the endpoints of encoding conversion. It's an implementation detail, as discussed with Matz at EuRuKo 2010. Modified Paths: -------------- MacRuby/trunk/spec/frozen/core/encoding/converter/convpath_spec.rb Modified: MacRuby/trunk/spec/frozen/core/encoding/converter/convpath_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/core/encoding/converter/convpath_spec.rb 2010-05-28 21:07:07 UTC (rev 4174) +++ MacRuby/trunk/spec/frozen/core/encoding/converter/convpath_spec.rb 2010-05-30 11:10:25 UTC (rev 4175) @@ -28,8 +28,8 @@ it "returns multiple encoding pairs when direct conversion is impossible" do ec = Encoding::Converter.new('ascii','Big5') ec.convpath.size.should == 2 - ec.convpath.first.should == [Encoding::US_ASCII, Encoding::UTF_8] - ec.convpath.last.should == [Encoding::UTF_8, Encoding::Big5] + ec.convpath.first.first.should == Encoding::US_ASCII + ec.convpath.last.last.should == Encoding::Big5 end it "sets the last element of each pair to the first element of the next" do

1 0

[4174] MacRuby/trunk/perf/perf_method.rb
by source_changes＠macosforge.org 28 May '10

28 May '10

Revision: 4174 http://trac.macosforge.org/projects/ruby/changeset/4174 Author: lsansonetti(a)apple.com Date: 2010-05-28 14:07:07 -0700 (Fri, 28 May 2010) Log Message: ----------- added poly+super method tests Modified Paths: -------------- MacRuby/trunk/perf/perf_method.rb Modified: MacRuby/trunk/perf/perf_method.rb =================================================================== --- MacRuby/trunk/perf/perf_method.rb 2010-05-28 01:52:31 UTC (rev 4173) +++ MacRuby/trunk/perf/perf_method.rb 2010-05-28 21:07:07 UTC (rev 4174) @@ -89,3 +89,63 @@ i += 1 end end + +class TestPolyMethod1 + def foo; 1; end +end + +class TestPolyMethod2 + def foo; 2; end +end + +class TestPolyMethod3 < TestPolyMethod1 + def foo; 3; end +end + +class TestPolyMethod4 < TestPolyMethod2 + def foo; 4; end +end + +perf_test('poly') do + o1 = TestPolyMethod1.new + o2 = TestPolyMethod2.new + o3 = TestPolyMethod3.new + o4 = TestPolyMethod4.new + i = 0 + while i < 1000000 + o1.foo; o2.foo; o3.foo; o4.foo + o1.foo; o2.foo; o3.foo; o4.foo + o1.foo; o2.foo; o3.foo; o4.foo + o1.foo; o2.foo; o3.foo; o4.foo + i += 1 + end +end + +class TestSuper1 + def foo; 42; end +end + +class TestSuper2 < TestSuper1 + def foo; super; end +end + +class TestSuper3 < TestSuper2 + def foo; super; end +end + +class TestSuper4 < TestSuper3 + def foo; super; end +end + +perf_test('super') do + o4 = TestSuper4.new + o3 = TestSuper3.new + i = 0 + while i < 10000 + o4.foo; o3.foo; o4.foo; o3.foo + o4.foo; o3.foo; o4.foo; o3.foo + o4.foo; o3.foo; o4.foo; o3.foo + o4.foo; o3.foo; o4.foo; o3.foo + i += 1 + end +end

1 0

[4173] MacRuby/trunk/objc.m
by source_changes＠macosforge.org 28 May '10

28 May '10

Revision: 4173 http://trac.macosforge.org/projects/ruby/changeset/4173 Author: martinlagardette(a)apple.com Date: 2010-05-27 18:52:31 -0700 (Thu, 27 May 2010) Log Message: ----------- Set the actual backtrace to Obj-C exceptions, instead of an empty array Modified Paths: -------------- MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2010-05-27 21:55:13 UTC (rev 4172) +++ MacRuby/trunk/objc.m 2010-05-28 01:52:31 UTC (rev 4173) @@ -639,8 +639,8 @@ snprintf(buf, sizeof buf, "%s: %s", [[exc name] UTF8String], [[exc reason] UTF8String]); VALUE e = rb_exc_new2(rb_eRuntimeError, buf); - // Set an empty backtrace for Obj-C exceptions (instead of nil) - rb_iv_set(e, "bt", rb_ary_new()); + // Set the backtrace for Obj-C exceptions + rb_iv_set(e, "bt", rb_vm_backtrace(0)); return e; }

1 0

[4172] MacRuby/trunk/bridgesupport.cpp
by source_changes＠macosforge.org 27 May '10

27 May '10

Revision: 4172 http://trac.macosforge.org/projects/ruby/changeset/4172 Author: lsansonetti(a)apple.com Date: 2010-05-27 14:55:13 -0700 (Thu, 27 May 2010) Log Message: ----------- disable performSelector: signature runtime fix Modified Paths: -------------- MacRuby/trunk/bridgesupport.cpp Modified: MacRuby/trunk/bridgesupport.cpp =================================================================== --- MacRuby/trunk/bridgesupport.cpp 2010-05-27 21:39:54 UTC (rev 4171) +++ MacRuby/trunk/bridgesupport.cpp 2010-05-27 21:55:13 UTC (rev 4172) @@ -1350,6 +1350,7 @@ } } #endif +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 static bool R7281806fixed = false; // XXX work around for // <rdar://problem/7281806> -[NSObject performSelector:] has wrong sel_of_type attributes @@ -1370,6 +1371,7 @@ } } } +#endif } extern "C"

1 0

[4171] MacRuby/trunk/lib/rubygems/gemcutter_utilities.rb
by source_changes＠macosforge.org 27 May '10

27 May '10

Revision: 4171 http://trac.macosforge.org/projects/ruby/changeset/4171 Author: martinlagardette(a)apple.com Date: 2010-05-27 14:39:54 -0700 (Thu, 27 May 2010) Log Message: ----------- Oops, one file was missing in rubygems, causing some gems to crash when requiring it - Fixes #678 Added Paths: ----------- MacRuby/trunk/lib/rubygems/gemcutter_utilities.rb Added: MacRuby/trunk/lib/rubygems/gemcutter_utilities.rb =================================================================== --- MacRuby/trunk/lib/rubygems/gemcutter_utilities.rb (rev 0) +++ MacRuby/trunk/lib/rubygems/gemcutter_utilities.rb 2010-05-27 21:39:54 UTC (rev 4171) @@ -0,0 +1,49 @@ +require 'net/http' +require 'rubygems/remote_fetcher' + +module Gem::GemcutterUtilities + + def sign_in + return if Gem.configuration.rubygems_api_key + + say "Enter your RubyGems.org credentials." + say "Don't have an account yet? Create one at http://rubygems.org/sign_up" + + email = ask " Email: " + password = ask_for_password "Password: " + say "\n" + + response = rubygems_api_request :get, "api/v1/api_key" do |request| + request.basic_auth email, password + end + + with_response response do |resp| + say "Signed in." + Gem.configuration.rubygems_api_key = resp.body + end + end + + def rubygems_api_request(method, path, &block) + host = ENV['RUBYGEMS_HOST'] || 'https://rubygems.org' + uri = URI.parse "#{host}/#{path}" + + request_method = Net::HTTP.const_get method.to_s.capitalize + + Gem::RemoteFetcher.fetcher.request(uri, request_method, &block) + end + + def with_response(resp) + case resp + when Net::HTTPSuccess then + if block_given? then + yield resp + else + say resp.body + end + else + say resp.body + terminate_interaction 1 + end + end + +end

1 0

[4170] MacRuby/trunk/lib/yaml.rb
by source_changes＠macosforge.org 27 May '10

27 May '10

Revision: 4170 http://trac.macosforge.org/projects/ruby/changeset/4170 Author: pthomson(a)apple.com Date: 2010-05-27 14:02:13 -0700 (Thu, 27 May 2010) Log Message: ----------- Implementing add_builtin_type, add_private_type, add_ruby_type, and add_domain_type in yaml.rb. Modified Paths: -------------- MacRuby/trunk/lib/yaml.rb Modified: MacRuby/trunk/lib/yaml.rb =================================================================== --- MacRuby/trunk/lib/yaml.rb 2010-05-27 07:26:37 UTC (rev 4169) +++ MacRuby/trunk/lib/yaml.rb 2010-05-27 21:02:13 UTC (rev 4170) @@ -82,6 +82,22 @@ klass end + def YAML.add_builtin_type(type_tag, &transfer) + LibYAML::DEFAULT_RESOLVER.add_type("tag:yaml.org,2002:#{type_tag}", transfer) + end + + def YAML.add_domain_type(domain, type_tag, &transfer) + LibYAML::DEFAULT_RESOLVER.add_type("tag:#{domain}:#{type_tag}", transfer) + end + + def YAML.add_ruby_type(type_tag, &transfer) + LibYAML::DEFAULT_RESOLVER.add_type("tag:ruby.yaml.org,2002:#{type_tag}", transfer) + end + + def YAML.add_private_type(type_tag, &transfer) + LibYAML::DEFAULT_RESOLVER.add_type("x-private:#{type_tag}", transfer) + end + end module Kernel

1 0

[4169] MacRuby/trunk
by source_changes＠macosforge.org 27 May '10

27 May '10

Revision: 4169 http://trac.macosforge.org/projects/ruby/changeset/4169 Author: martinlagardette(a)apple.com Date: 2010-05-27 00:26:37 -0700 (Thu, 27 May 2010) Log Message: ----------- Revert r4165 and fix the issue within MacRuby instead. Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/4165 Modified Paths: -------------- MacRuby/trunk/lib/irb/formatter.rb MacRuby/trunk/objc.m Modified: MacRuby/trunk/lib/irb/formatter.rb =================================================================== --- MacRuby/trunk/lib/irb/formatter.rb 2010-05-26 23:38:25 UTC (rev 4168) +++ MacRuby/trunk/lib/irb/formatter.rb 2010-05-27 07:26:37 UTC (rev 4169) @@ -47,7 +47,6 @@ end def exception(exception) - exception.set_backtrace([]) if exception.backtrace.nil? backtrace = $DEBUG ? exception.backtrace : filter_backtrace(exception.backtrace) "#{exception.class.name}: #{exception.message}\n\t#{backtrace.join("\n\t")}" end Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2010-05-26 23:38:25 UTC (rev 4168) +++ MacRuby/trunk/objc.m 2010-05-27 07:26:37 UTC (rev 4169) @@ -638,7 +638,10 @@ char buf[1000]; snprintf(buf, sizeof buf, "%s: %s", [[exc name] UTF8String], [[exc reason] UTF8String]); - return rb_exc_new2(rb_eRuntimeError, buf); + VALUE e = rb_exc_new2(rb_eRuntimeError, buf); + // Set an empty backtrace for Obj-C exceptions (instead of nil) + rb_iv_set(e, "bt", rb_ary_new()); + return e; } void

1 0

[4168] MacRuby/trunk/kernel.c
by source_changes＠macosforge.org 26 May '10

26 May '10

Revision: 4168 http://trac.macosforge.org/projects/ruby/changeset/4168 Author: lsansonetti(a)apple.com Date: 2010-05-26 16:38:25 -0700 (Wed, 26 May 2010) Log Message: ----------- fix kernel primitives using SEL to use void pointers instead, to conform to the code the compiler will generate Modified Paths: -------------- MacRuby/trunk/kernel.c Modified: MacRuby/trunk/kernel.c =================================================================== --- MacRuby/trunk/kernel.c 2010-05-26 23:14:14 UTC (rev 4167) +++ MacRuby/trunk/kernel.c 2010-05-26 23:38:25 UTC (rev 4168) @@ -533,9 +533,9 @@ } inline VALUE -vm_sel_to_rval(SEL sel) +vm_sel_to_rval(void *sel) { - return sel == 0 ? Qnil : ID2SYM(rb_intern(sel_getName(sel))); + return sel == 0 ? Qnil : ID2SYM(rb_intern(sel_getName((SEL)sel))); } inline VALUE @@ -581,10 +581,10 @@ } inline void -vm_rval_to_sel(VALUE rval, SEL *ocval) +vm_rval_to_sel(VALUE rval, void **ocval) { const char *cstr = rval_to_c_str(rval); - *ocval = cstr == NULL ? NULL : sel_registerName(cstr); + *(SEL *)ocval = cstr == NULL ? NULL : sel_registerName(cstr); } inline void

1 0

[4167] MacRuby/trunk/perf/run.rb
by source_changes＠macosforge.org 26 May '10

26 May '10

Revision: 4167 http://trac.macosforge.org/projects/ruby/changeset/4167 Author: martinlagardette(a)apple.com Date: 2010-05-26 16:14:14 -0700 (Wed, 26 May 2010) Log Message: ----------- Add a very basic usage text + apply patch by Jordan Breeding Modified Paths: -------------- MacRuby/trunk/perf/run.rb Modified: MacRuby/trunk/perf/run.rb =================================================================== --- MacRuby/trunk/perf/run.rb 2010-05-26 22:00:53 UTC (rev 4166) +++ MacRuby/trunk/perf/run.rb 2010-05-26 23:14:14 UTC (rev 4167) @@ -1,11 +1,20 @@ #!/usr/bin/ruby +def usage + puts "ruby #{$0} [--rubies=...] [--iterations=n] [perf_suite, [perf_suite...]]" + exit 0 +end + +usage if ARGV.size < 1 + cwd = File.dirname(__FILE__) perf_files = [] rubies = [] n_iterations = 3 ARGV.each do |arg| - if md = /--rubies=(.*)/.match(arg) + if arg.match(/--help/) + usage + elsif md = /--rubies=(.*)/.match(arg) rubies = md[1].split(/,/) elsif md = /--iterations=(.*)/.match(arg) n_iterations = md[1].to_i @@ -31,9 +40,10 @@ rubies_names = rubies.map { |x| `#{x} -v`.scan(/^\w+\s+[^\s]+/)[0] } -print 'Name'.ljust(20) -rubies_names.each { |x| print x.ljust(20) } -puts '', '-' * 80 +header_string = 'Name'.ljust(20) +rubies_names.each { |x| header_string += x.ljust(20) } +print header_string +puts '', '-' * header_string.length booter = File.join(cwd, 'boot.rb') perf_files.each do |file, suite| @@ -53,7 +63,9 @@ print "#{prefix}:#{title}".ljust(20) winner = nil if res.size > 1 - winner = res.sort { |a, b| a[:best].to_f <=> b[:best].to_f }.first[:best] + winner = res.reject { |a| a[:best] == 'ERROR' }.sort { |a, b| + a[:best].to_f <=> b[:best].to_f + }.first[:best] end res.each do |rb| best = rb[:best]

1 0