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

[1223] MacRuby/branches/experimental/bootstraptest/
by source_changes＠macosforge.org 28 Mar '09

28 Mar '09

Revision: 1223 http://trac.macosforge.org/projects/ruby/changeset/1223 Author: lsansonetti(a)apple.com Date: 2009-03-27 17:18:19 -0700 (Fri, 27 Mar 2009) Log Message: ----------- removed the YARV bootstraptests Removed Paths: ------------- MacRuby/branches/experimental/bootstraptest/

1 0

[1222] MacRuby/branches/experimental/README
by source_changes＠macosforge.org 28 Mar '09

28 Mar '09

Revision: 1222 http://trac.macosforge.org/projects/ruby/changeset/1222 Author: lsansonetti(a)apple.com Date: 2009-03-27 17:17:45 -0700 (Fri, 27 Mar 2009) Log Message: ----------- rewrote the README to insist that this is an experimental version of MacRuby Modified Paths: -------------- MacRuby/branches/experimental/README Modified: MacRuby/branches/experimental/README =================================================================== --- MacRuby/branches/experimental/README 2009-03-28 00:17:12 UTC (rev 1221) +++ MacRuby/branches/experimental/README 2009-03-28 00:17:45 UTC (rev 1222) @@ -33,10 +33,24 @@ $ sudo env UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 \ make install -=== Installation +=== Build Instructions +You can build MacRuby by doing the following command: + $ rake + +Once done, you can run the RubySpec-based regression tests as well as the +performance suite: + + $ rake spec:ci + $ rake bench:ci + +To install MacRuby on your machine: + $ sudo rake install +WARNING: This version of MacRuby is still under development and cannot be +installed yet. + Then you should be all set! Please report us any problem you will find (the http://macruby.org website has pointers). Thanks!

1 0

[1221] MacRuby/branches/experimental/bench.rb
by source_changes＠macosforge.org 28 Mar '09

28 Mar '09

Revision: 1221 http://trac.macosforge.org/projects/ruby/changeset/1221 Author: lsansonetti(a)apple.com Date: 2009-03-27 17:17:12 -0700 (Fri, 27 Mar 2009) Log Message: ----------- better output + added a test for ackermann Modified Paths: -------------- MacRuby/branches/experimental/bench.rb Modified: MacRuby/branches/experimental/bench.rb =================================================================== --- MacRuby/branches/experimental/bench.rb 2009-03-28 00:04:02 UTC (rev 1220) +++ MacRuby/branches/experimental/bench.rb 2009-03-28 00:17:12 UTC (rev 1221) @@ -34,6 +34,16 @@ end end +def ack(m, n) + if m == 0 then + n + 1 + elsif n == 0 then + ack(m - 1, 1) + else + ack(m - 1, ack(m, n - 1)) + end +end + class Class1 def method1; end def method2(x); x; end @@ -61,7 +71,7 @@ require 'benchmark' -Benchmark.bm(3) do |bm| +Benchmark.bm(30) do |bm| # Fixnum arithmetic. bm.report('10 fib(30)') do @@ -72,6 +82,7 @@ end bm.report('tak') { tak(18,9,0) } bm.report('tarai') { tarai(12,6,0) } + bm.report('ackermann') { ack(3,9) } # Loops. bm.report('10000000 times loop') do

1 0

[1220] MacRuby/branches/experimental/rakelib/builder.rake
by source_changes＠macosforge.org 28 Mar '09

28 Mar '09

Revision: 1220 http://trac.macosforge.org/projects/ruby/changeset/1220 Author: lsansonetti(a)apple.com Date: 2009-03-27 17:04:02 -0700 (Fri, 27 Mar 2009) Log Message: ----------- blocked the rake all/install tasks for now Modified Paths: -------------- MacRuby/branches/experimental/rakelib/builder.rake Modified: MacRuby/branches/experimental/rakelib/builder.rake =================================================================== --- MacRuby/branches/experimental/rakelib/builder.rake 2009-03-27 23:41:58 UTC (rev 1219) +++ MacRuby/branches/experimental/rakelib/builder.rake 2009-03-28 00:04:02 UTC (rev 1220) @@ -273,6 +273,9 @@ namespace :macruby do desc "Build dynamic libraries for MacRuby" task :dylib => [:rbconfig, :miniruby] do + $stderr.puts "Warning: this version of MacRuby is still under development and can only build the \"miniruby\" target." + system("ls -l ./miniruby") + exit 0 sh("./miniruby -I. -I./lib -rrbconfig tool/compile_prelude.rb prelude.rb gem_prelude.rb prelude.c.new") if !File.exist?('prelude.c') or File.read('prelude.c') != File.read('prelude.c.new') mv('prelude.c.new', 'prelude.c') @@ -354,6 +357,8 @@ desc "Install the framework" task :install => :info_plist do + $stderr.puts "This version of MacRuby is under development and cannot be installed yet. Please retry later." + exit 1 sh "./miniruby instruby.rb #{INSTRUBY_ARGS}" end end @@ -371,4 +376,4 @@ sh "./miniruby -I./lib -I.ext/common -I./- -r./ext/purelib.rb ext/extmk.rb #{EXTMK_ARGS} -- clean" end end -end \ No newline at end of file +end

1 0

[1219] MacRuby/branches/experimental/Rakefile
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1219 http://trac.macosforge.org/projects/ruby/changeset/1219 Author: lsansonetti(a)apple.com Date: 2009-03-27 16:41:58 -0700 (Fri, 27 Mar 2009) Log Message: ----------- commented the previous test tasks + added a test_vm task for test_roxor.rb Modified Paths: -------------- MacRuby/branches/experimental/Rakefile Modified: MacRuby/branches/experimental/Rakefile =================================================================== --- MacRuby/branches/experimental/Rakefile 2009-03-27 23:34:45 UTC (rev 1218) +++ MacRuby/branches/experimental/Rakefile 2009-03-27 23:41:58 UTC (rev 1219) @@ -20,6 +20,14 @@ desc "Same as macruby:build" task :macruby => 'macruby:build' +# The old test tasks are now commented since we are switching to RubySpec +# for regression testing. We still add a task to run the VM regression test +# suite, though. +desc "Run the VM regression test suite" +task :test_vm do + sh "/usr/bin/ruby test_roxor.rb" +end +=begin desc "Run the sample tests" task :sample_test do sh "./miniruby rubytest.rb" @@ -30,19 +38,20 @@ sh "./miniruby test/macruby_runner.rb" end +desc "Run all tests" +task :test => [:sample_test, :unit_tests] +=end + desc "Clean local and extension build files" task :clean => ['clean:local', 'clean:ext'] desc "Build MacRuby and extensions" task :all => [:macruby, :extensions] -desc "Run all tests" -task :test => [:sample_test, :unit_tests] - desc "Create an archive (GIT only)" task :git_archive do sh "git archive --format=tar --prefix=MacRuby-HEAD/ HEAD | gzip >MacRuby-HEAD.tar.gz" end # desc "Run all 'known good' specs (task alias for spec:ci)" -# task :spec => 'spec:ci' \ No newline at end of file +# task :spec => 'spec:ci'

1 0

[1218] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1218 http://trac.macosforge.org/projects/ruby/changeset/1218 Author: lsansonetti(a)apple.com Date: 2009-03-27 16:34:45 -0700 (Fri, 27 Mar 2009) Log Message: ----------- added a bench:yarv task, removed old_bench.rb Modified Paths: -------------- MacRuby/branches/experimental/rakelib/bench.rake Removed Paths: ------------- MacRuby/branches/experimental/old_bench.rb Deleted: MacRuby/branches/experimental/old_bench.rb =================================================================== --- MacRuby/branches/experimental/old_bench.rb 2009-03-27 23:27:39 UTC (rev 1217) +++ MacRuby/branches/experimental/old_bench.rb 2009-03-27 23:34:45 UTC (rev 1218) @@ -1,64 +0,0 @@ -core_features = [ - 'bm_app_answer.rb', - 'bm_app_factorial.rb', - 'bm_app_fib.rb', - 'bm_app_raise.rb', - 'bm_app_tak.rb' , - 'bm_app_tarai.rb', - 'bm_app_mergesort.rb', - 'bm_loop_times.rb', - 'bm_loop_whileloop.rb', - 'bm_so_ackermann.rb', -# 'bm_so_nested_loop.rb', - 'bm_so_object.rb', - 'bm_so_random.rb', - 'bm_vm1_block.rb', - 'bm_vm1_const.rb', - 'bm_vm1_ivar.rb', - 'bm_vm1_ivar_set.rb', - 'bm_vm1_ensure.rb', -# 'bm_vm1_length.rb', - 'bm_vm1_rescue.rb', - 'bm_vm1_simplereturn.rb', -# 'bm_vm1_swap.rb', - 'bm_vm2_eval.rb', - 'bm_vm2_poly_method.rb', - 'bm_vm2_proc.rb', - 'bm_vm2_send.rb', - 'bm_vm2_method.rb', - 'bm_vm2_super.rb', - 'bm_vm2_unif1.rb', - 'bm_vm2_zsuper.rb' -] - -def bench(rubies, file, quiet) - rubies.map do |ruby| - $stderr.puts " " + `#{ruby} -v`.strip unless quiet - line = "#{ruby} #{file}" - best = 1e10 - 3.times do - t = Time.now - v = system(line) ? Time.now - t : nil - $stderr.puts " " + v.to_s unless quiet - if v and (best == nil or best > v) - best = v - end - end - [ruby, best] - end -end - -our_ruby = File.join(Dir.pwd, 'miniruby') -rubies = [our_ruby, '/usr/local/bin/ruby19'] -#rubies = [our_ruby, '/usr/local/bin/ruby19', '/usr/bin/ruby'] - -quiet = ARGV[0] == '--quiet' - -Dir.chdir('benchmark') do - core_features.each do |file| - $stderr.puts file + ' ...' - results = bench(rubies, file, quiet) - ok = results.sort { |x, y| x[1] <=> y[1] }[0][0].include?(our_ruby) - $stderr.puts ' ' + (ok ? 'PASS' : 'FAIL') - end -end Modified: MacRuby/branches/experimental/rakelib/bench.rake =================================================================== --- MacRuby/branches/experimental/rakelib/bench.rake 2009-03-27 23:27:39 UTC (rev 1217) +++ MacRuby/branches/experimental/rakelib/bench.rake 2009-03-27 23:34:45 UTC (rev 1218) @@ -5,4 +5,23 @@ sh "./miniruby -I./lib bench.rb" end + # We cannot run all the benchmarks yet, so we only run a selection for now. + YARV_BENCHMARKS = %w{ + bm_app_answer.rb bm_app_factorial.rb bm_app_fib.rb bm_app_raise.rb + bm_app_tak.rb bm_app_tarai.rb bm_app_mergesort.rb bm_loop_times.rb + bm_loop_whileloop.r bm_so_ackermann.rb bm_so_object.rb bm_so_random.rb + bm_vm1_block.rb bm_vm1_const.rb bm_vm1_ivar.rb bm_vm1_ivar_set.rb + bm_vm1_ensure.rb bm_vm1_rescue.rb bm_vm1_simplereturn.rb bm_vm2_eval.rb + bm_vm2_poly_method.rb bm_vm2_proc.rb bm_vm2_send.rb bm_vm2_method.rb + bm_vm2_super.rb bm_vm2_unif1.rb' bm_vm2_zsuper.rb + } + + desc "Run the YARV benchmarks" + task :yarv do + YARV_BENCHMARKS.each do |file| + path = File.join('benchmark', file) + sh "/usr/bin/ruby b.rb #{path}" + end + end + end

1 0

[1217] MacRuby/branches/experimental/rakelib/bench.rake
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1217 http://trac.macosforge.org/projects/ruby/changeset/1217 Author: lsansonetti(a)apple.com Date: 2009-03-27 16:27:39 -0700 (Fri, 27 Mar 2009) Log Message: ----------- added a bench:ci rake task for bench.rb Added Paths: ----------- MacRuby/branches/experimental/rakelib/bench.rake Added: MacRuby/branches/experimental/rakelib/bench.rake =================================================================== --- MacRuby/branches/experimental/rakelib/bench.rake (rev 0) +++ MacRuby/branches/experimental/rakelib/bench.rake 2009-03-27 23:27:39 UTC (rev 1217) @@ -0,0 +1,8 @@ +namespace :bench do + + desc "Run the regression performance suite" + task :ci do + sh "./miniruby -I./lib bench.rb" + end + +end

1 0

[1216] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1216 http://trac.macosforge.org/projects/ruby/changeset/1216 Author: lsansonetti(a)apple.com Date: 2009-03-27 16:24:28 -0700 (Fri, 27 Mar 2009) Log Message: ----------- renamed bench_roxor.rb to old_bench.rb (which will eventually be a separate rake task after) and added a new bench.rb script which will be the basis of the regression performance suite Added Paths: ----------- MacRuby/branches/experimental/bench.rb MacRuby/branches/experimental/old_bench.rb Removed Paths: ------------- MacRuby/branches/experimental/bench_roxor.rb Added: MacRuby/branches/experimental/bench.rb =================================================================== --- MacRuby/branches/experimental/bench.rb (rev 0) +++ MacRuby/branches/experimental/bench.rb 2009-03-27 23:24:28 UTC (rev 1216) @@ -0,0 +1,187 @@ +# A regression performance suite for MacRuby (which doesn't really catch +# regressions yet). +# +# Run with: +# $ ./miniruby -I./lib bench.rb +# +# The same script can also be executed using /usr/bin/ruby or ruby19 to +# compare the implementations. + +def fib(n) + if n < 3 + 1 + else + fib(n-1) + fib(n-2) + end +end + +def tak(x, y, z) + unless y < x + z + else + tak(tak(x-1, y, z), + tak(y-1, z, x), + tak(z-1, x, y)) + end +end + +def tarai(x, y, z) + if x <= y + then y + else tarai(tarai(x-1, y, z), + tarai(y-1, z, x), + tarai(z-1, x, y)) + end +end + +class Class1 + def method1; end + def method2(x); x; end + + def yield1(n); i=0; while i<n; yield; i+=1; end; end + def yield2; yield; end +end + +class Class2 < Class1 + def method1; super; end + def method2(x); super; end +end + +def bench_ivar_read(n) + @obj = 1 + i=0; while i<n; i+=@obj; end +end + +def bench_ivar_write(n) + @obj = 0 + i=0; while i<n; i+=@obj+1; end +end + +ConstantOne = 1 + +require 'benchmark' + +Benchmark.bm(3) do |bm| + + # Fixnum arithmetic. + bm.report('10 fib(30)') do + i=0; while i<10; fib(30); i+=1; end + end + bm.report('10 fib(35)') do + i=0; while i<10; fib(35); i+=1; end + end + bm.report('tak') { tak(18,9,0) } + bm.report('tarai') { tarai(12,6,0) } + + # Loops. + bm.report('10000000 times loop') do + 3000000.times {} + end + bm.report('30000000 times loop') do + 30000000.times {} + end + bm.report('10000000 while loop') do + i=0; while i<10000000; i+=1; end + end + bm.report('60000000 while loop') do + i=0; while i<60000000; i+=1; end + end + + # Messages. + bm.report('30000000 0 arg msg') do + o = Class1.new + i=0; while i<10000000; o.method1; o.method1; o.method1; i+=1; end + end + bm.report('30000000 1 arg msg') do + o = Class1.new + i=0; while i<10000000; o.method2(i); o.method2(i); o.method2(i); i+=1; end + end + bm.report('10000000 0 arg super msg') do + o = Class2.new + i=0; while i<10000000; o.method1; i+=1; end + end + bm.report('10000000 1 arg super msg') do + o = Class2.new + i=0; while i<10000000; o.method2(i); i+=1; end + end + bm.report('10000000 #send') do + o = Class1.new + i=0; while i<10000000; o.send(:method1); i+=1; end + end + + # Instance variables. + bm.report('10000000 ivar read') { bench_ivar_read(10000000) } + bm.report('30000000 ivar read') { bench_ivar_read(30000000) } + bm.report('10000000 ivar write') { bench_ivar_write(10000000) } + bm.report('30000000 ivar write') { bench_ivar_write(30000000) } + + # Const lookup. + bm.report('30000000 const') do + i=0; while i<30000000; i+=ConstantOne; end + end + + # Blocks + bm.report('30000000 yield') do + o = Class1.new + o.yield1(30000000) {} + end + bm.report('30000000 msg w/ block+yield') do + o = Class1.new + i=0; while i<30000000; o.yield2 {}; i+=1; end + end + bm.report('30000000 Proc#call') do + o = proc {} + i=0; while i<30000000; o.call; i+=1; end + end + + # Break + bm.report('30000000 while break') do + i=0; while i<30000000; while true; i+=1; break; end; end + end + bm.report('10000000 block break') do + i=0; while i<10000000; 1.times { i+=1; break }; end + end + + # Next + bm.report('30000000 while next') do + i=0; while i<30000000; i+=1; next; exit; end + end + bm.report('10000000 block next') do + i=0; while i<10000000; 1.times { i+=1; next; exit; }; end + end + + # Exception handlers. + bm.report('60000000 begin w/o exception') do + i=0 + while i<60000000 + begin + i+=1 + rescue + end + end + end + bm.report('60000000 ensure w/o exception') do + i=0 + while i<60000000 + begin + begin + ensure + i+=1 + end + ensure + i+=1 + end + end + end + bm.report('50000 raise') do + i=0 + while i<50000 + begin + raise + rescue + i+=1 + end + end + end + +end Deleted: MacRuby/branches/experimental/bench_roxor.rb =================================================================== --- MacRuby/branches/experimental/bench_roxor.rb 2009-03-27 22:55:46 UTC (rev 1215) +++ MacRuby/branches/experimental/bench_roxor.rb 2009-03-27 23:24:28 UTC (rev 1216) @@ -1,64 +0,0 @@ -core_features = [ - 'bm_app_answer.rb', - 'bm_app_factorial.rb', - 'bm_app_fib.rb', - 'bm_app_raise.rb', - 'bm_app_tak.rb' , - 'bm_app_tarai.rb', - 'bm_app_mergesort.rb', - 'bm_loop_times.rb', - 'bm_loop_whileloop.rb', - 'bm_so_ackermann.rb', -# 'bm_so_nested_loop.rb', - 'bm_so_object.rb', - 'bm_so_random.rb', - 'bm_vm1_block.rb', - 'bm_vm1_const.rb', - 'bm_vm1_ivar.rb', - 'bm_vm1_ivar_set.rb', - 'bm_vm1_ensure.rb', -# 'bm_vm1_length.rb', - 'bm_vm1_rescue.rb', - 'bm_vm1_simplereturn.rb', -# 'bm_vm1_swap.rb', - 'bm_vm2_eval.rb', - 'bm_vm2_poly_method.rb', - 'bm_vm2_proc.rb', - 'bm_vm2_send.rb', - 'bm_vm2_method.rb', - 'bm_vm2_super.rb', - 'bm_vm2_unif1.rb', - 'bm_vm2_zsuper.rb' -] - -def bench(rubies, file, quiet) - rubies.map do |ruby| - $stderr.puts " " + `#{ruby} -v`.strip unless quiet - line = "#{ruby} #{file}" - best = 1e10 - 3.times do - t = Time.now - v = system(line) ? Time.now - t : nil - $stderr.puts " " + v.to_s unless quiet - if v and (best == nil or best > v) - best = v - end - end - [ruby, best] - end -end - -our_ruby = File.join(Dir.pwd, 'miniruby') -rubies = [our_ruby, '/usr/local/bin/ruby19'] -#rubies = [our_ruby, '/usr/local/bin/ruby19', '/usr/bin/ruby'] - -quiet = ARGV[0] == '--quiet' - -Dir.chdir('benchmark') do - core_features.each do |file| - $stderr.puts file + ' ...' - results = bench(rubies, file, quiet) - ok = results.sort { |x, y| x[1] <=> y[1] }[0][0].include?(our_ruby) - $stderr.puts ' ' + (ok ? 'PASS' : 'FAIL') - end -end Copied: MacRuby/branches/experimental/old_bench.rb (from rev 1211, MacRuby/branches/experimental/bench_roxor.rb) =================================================================== --- MacRuby/branches/experimental/old_bench.rb (rev 0) +++ MacRuby/branches/experimental/old_bench.rb 2009-03-27 23:24:28 UTC (rev 1216) @@ -0,0 +1,64 @@ +core_features = [ + 'bm_app_answer.rb', + 'bm_app_factorial.rb', + 'bm_app_fib.rb', + 'bm_app_raise.rb', + 'bm_app_tak.rb' , + 'bm_app_tarai.rb', + 'bm_app_mergesort.rb', + 'bm_loop_times.rb', + 'bm_loop_whileloop.rb', + 'bm_so_ackermann.rb', +# 'bm_so_nested_loop.rb', + 'bm_so_object.rb', + 'bm_so_random.rb', + 'bm_vm1_block.rb', + 'bm_vm1_const.rb', + 'bm_vm1_ivar.rb', + 'bm_vm1_ivar_set.rb', + 'bm_vm1_ensure.rb', +# 'bm_vm1_length.rb', + 'bm_vm1_rescue.rb', + 'bm_vm1_simplereturn.rb', +# 'bm_vm1_swap.rb', + 'bm_vm2_eval.rb', + 'bm_vm2_poly_method.rb', + 'bm_vm2_proc.rb', + 'bm_vm2_send.rb', + 'bm_vm2_method.rb', + 'bm_vm2_super.rb', + 'bm_vm2_unif1.rb', + 'bm_vm2_zsuper.rb' +] + +def bench(rubies, file, quiet) + rubies.map do |ruby| + $stderr.puts " " + `#{ruby} -v`.strip unless quiet + line = "#{ruby} #{file}" + best = 1e10 + 3.times do + t = Time.now + v = system(line) ? Time.now - t : nil + $stderr.puts " " + v.to_s unless quiet + if v and (best == nil or best > v) + best = v + end + end + [ruby, best] + end +end + +our_ruby = File.join(Dir.pwd, 'miniruby') +rubies = [our_ruby, '/usr/local/bin/ruby19'] +#rubies = [our_ruby, '/usr/local/bin/ruby19', '/usr/bin/ruby'] + +quiet = ARGV[0] == '--quiet' + +Dir.chdir('benchmark') do + core_features.each do |file| + $stderr.puts file + ' ...' + results = bench(rubies, file, quiet) + ok = results.sort { |x, y| x[1] <=> y[1] }[0][0].include?(our_ruby) + $stderr.puts ' ' + (ok ? 'PASS' : 'FAIL') + end +end

1 0

[1215] MacRuby/branches/experimental/spec/frozen/language/variables_spec.rb
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1215 http://trac.macosforge.org/projects/ruby/changeset/1215 Author: eloy.de.enige(a)gmail.com Date: 2009-03-27 15:55:46 -0700 (Fri, 27 Mar 2009) Log Message: ----------- Fixed whitespace. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/variables_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/language/variables_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/variables_spec.rb 2009-03-27 22:07:55 UTC (rev 1214) +++ MacRuby/branches/experimental/spec/frozen/language/variables_spec.rb 2009-03-27 22:55:46 UTC (rev 1215) @@ -28,6 +28,7 @@ a.should be_nil end end + ruby_version_is "1.9" do it "assigns [] to lhs when rhs is an empty splat expression" do a = *() @@ -49,6 +50,7 @@ a = *[*[1,2]]; a.should == [1,2] end end + ruby_version_is "1.9" do it "allows the assignment of the rhs to the lhs using the rhs splat operator" do a = *nil; a.should == [] @@ -79,6 +81,7 @@ *a = [*[1,2]]; a.should == [[1,2]] end end + ruby_version_is "1.9" do it "allows the assignment of the rhs to the lhs using the lhs splat operator" do * = 1,2 # Valid syntax, but pretty useless! Nothing to test @@ -109,6 +112,7 @@ *a = *[*[1,2]]; a.should == [1,2] end end + ruby_version_is "1.9" do it "allows the assignment of rhs to the lhs using the lhs and rhs splat operators simultaneously" do *a = *nil; a.should == [] @@ -193,6 +197,7 @@ x.should == [[1, 2, 3, 4, 5, 6, 7]] end end + ruby_version_is "1.9" do it "succeeds without conversion" do *x = (1..7).to_a

1 0

[1214] MacRuby/branches/experimental/roxor.cpp
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1214 http://trac.macosforge.org/projects/ruby/changeset/1214 Author: lsansonetti(a)apple.com Date: 2009-03-27 15:07:55 -0700 (Fri, 27 Mar 2009) Log Message: ----------- a better implementation for alias Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-27 20:23:03 UTC (rev 1213) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-27 22:07:55 UTC (rev 1214) @@ -4514,54 +4514,64 @@ extern "C" void rb_print_undef(VALUE, ID, int); +static void +rb_vm_alias_method(Class klass, Method method, ID name, int arity) +{ + IMP imp = method_getImplementation(method); + const char *types = method_getTypeEncoding(method); + NODE *node = GET_VM()->method_node_get(imp); + if (node == NULL) { + rb_raise(rb_eArgError, "cannot alias non-Ruby method `%s'", + sel_getName(method_getName(method))); + } + + const char *name_str = rb_id2name(name); + SEL sel; + if (arity == 0) { + sel = sel_registerName(name_str); + } + else { + char tmp[100]; + snprintf(tmp, sizeof tmp, "%s:", name_str); + sel = sel_registerName(tmp); + } + + GET_VM()->add_method(klass, sel, imp, node, types); +} + extern "C" void rb_vm_alias(VALUE outer, ID name, ID def) { - // TODO reassign klass if called within module_eval - + if (GET_VM()->current_class != NULL) { + outer = (VALUE)GET_VM()->current_class; + } rb_frozen_class_p(outer); if (outer == rb_cObject) { rb_secure(4); } Class klass = (Class)outer; - // Find the implementation of the original method first. const char *def_str = rb_id2name(def); - SEL def_sel = sel_registerName(def_str); - Method def_method = class_getInstanceMethod(klass, def_sel); - bool def_qualified = false; - if (def_method == NULL && def_str[strlen(def_str) - 1] != ':') { + SEL sel = sel_registerName(def_str); + Method def_method1 = class_getInstanceMethod(klass, sel); + Method def_method2 = NULL; + if (def_str[strlen(def_str) - 1] != ':') { char tmp[100]; snprintf(tmp, sizeof tmp, "%s:", def_str); - def_sel = sel_registerName(tmp); - def_method = class_getInstanceMethod(klass, def_sel); - def_qualified = true; + sel = sel_registerName(tmp); + def_method2 = class_getInstanceMethod(klass, sel); } - if (def_method == NULL) { + + if (def_method1 == NULL && def_method2 == NULL) { rb_print_undef((VALUE)klass, def, 0); } - IMP def_imp = method_getImplementation(def_method); - const char *def_types = method_getTypeEncoding(def_method); - - // Get the NODE*. - NODE *node = GET_VM()->method_node_get(def_imp); - if (node == NULL) { - rb_raise(rb_eArgError, "cannot alias non-Ruby method `%s'", sel_getName(def_sel)); + if (def_method1 != NULL) { + rb_vm_alias_method(klass, def_method1, name, 0); } - - // Do the method aliasing. - const char *new_str = rb_id2name(name); - SEL new_sel; - if (def_qualified && new_str[strlen(new_str) - 1] != ':') { - char tmp[100]; - snprintf(tmp, sizeof tmp, "%s:", new_str); - new_sel = sel_registerName(tmp); + if (def_method2 != NULL) { + rb_vm_alias_method(klass, def_method2, name, 1); } - else { - new_sel = sel_registerName(new_str); - } - GET_VM()->add_method(klass, new_sel, def_imp, node, def_types); } extern "C"

1 0