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

[4166] MacRuby/trunk/bin/rubyc
by source_changes＠macosforge.org 26 May '10

26 May '10

Revision: 4166 http://trac.macosforge.org/projects/ruby/changeset/4166 Author: lsansonetti(a)apple.com Date: 2010-05-26 15:00:53 -0700 (Wed, 26 May 2010) Log Message: ----------- when linking a final executable, also link against Foundation and libauto since some of their symbols can now be inlined Modified Paths: -------------- MacRuby/trunk/bin/rubyc Modified: MacRuby/trunk/bin/rubyc =================================================================== --- MacRuby/trunk/bin/rubyc 2010-05-26 21:53:53 UTC (rev 4165) +++ MacRuby/trunk/bin/rubyc 2010-05-26 22:00:53 UTC (rev 4166) @@ -273,7 +273,7 @@ # Link all objects into executable. linkf = @static ? "-L#{RbConfig::CONFIG['libdir']} #{RbConfig::CONFIG['LIBRUBYARG_STATIC_REALLY']}" : - "-framework MacRuby -lobjc" + "-framework MacRuby -framework Foundation -lobjc -lauto" line = "#{@gcxx} -o \"#{output}\" #{arch_flags} #{linkf} " objs.each { |o| line << " \"#{o}\"" } execute(line)

1 0

[4165] MacRuby/trunk/lib/irb/formatter.rb
by source_changes＠macosforge.org 26 May '10

26 May '10

Revision: 4165 http://trac.macosforge.org/projects/ruby/changeset/4165 Author: martinlagardette(a)apple.com Date: 2010-05-26 14:53:53 -0700 (Wed, 26 May 2010) Log Message: ----------- Set an empty backtrace for Obj-C exceptions so that IRB doesn't quit Modified Paths: -------------- MacRuby/trunk/lib/irb/formatter.rb Modified: MacRuby/trunk/lib/irb/formatter.rb =================================================================== --- MacRuby/trunk/lib/irb/formatter.rb 2010-05-26 20:30:35 UTC (rev 4164) +++ MacRuby/trunk/lib/irb/formatter.rb 2010-05-26 21:53:53 UTC (rev 4165) @@ -47,6 +47,7 @@ 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

1 0

[4164] MacRuby/trunk/test_vm/encoding.rb
by source_changes＠macosforge.org 26 May '10

26 May '10

Revision: 4164 http://trac.macosforge.org/projects/ruby/changeset/4164 Author: eloy.de.enige(a)gmail.com Date: 2010-05-26 13:30:35 -0700 (Wed, 26 May 2010) Log Message: ----------- Add failing test about Array#pack returning a string with the wrong encoding. Modified Paths: -------------- MacRuby/trunk/test_vm/encoding.rb Modified: MacRuby/trunk/test_vm/encoding.rb =================================================================== --- MacRuby/trunk/test_vm/encoding.rb 2010-05-26 20:30:25 UTC (rev 4163) +++ MacRuby/trunk/test_vm/encoding.rb 2010-05-26 20:30:35 UTC (rev 4164) @@ -1,3 +1,5 @@ assert "US-ASCII", "File.open('../Rakefile', 'r:US-ASCII') {|f| puts f.read.encoding.name }" assert ":ok", "puts ':ok'.encode('US-ASCII')" + +assert "true", "p [].pack('U*').encoding.name == 'UTF-8'" \ No newline at end of file

1 0

[4163] MacRuby/trunk/spec/frozen/core/string/shared/codepoints.rb
by source_changes＠macosforge.org 26 May '10

26 May '10

Revision: 4163 http://trac.macosforge.org/projects/ruby/changeset/4163 Author: eloy.de.enige(a)gmail.com Date: 2010-05-26 13:30:25 -0700 (Wed, 26 May 2010) Log Message: ----------- Add spec about String#each_codepoint for characters outside the BMP. Modified Paths: -------------- MacRuby/trunk/spec/frozen/core/string/shared/codepoints.rb Modified: MacRuby/trunk/spec/frozen/core/string/shared/codepoints.rb =================================================================== --- MacRuby/trunk/spec/frozen/core/string/shared/codepoints.rb 2010-05-26 19:58:42 UTC (rev 4162) +++ MacRuby/trunk/spec/frozen/core/string/shared/codepoints.rb 2010-05-26 20:30:25 UTC (rev 4163) @@ -47,6 +47,12 @@ s.send((a)method).to_a.should == [38937] end + it "works for characters outside of the BMP" do + s = "\u{10346}" + s.force_encoding(Encoding::UTF_8) + s.send((a)method).to_a.should == [66374] + end + it "returns the codepoint corresponding to the character's position in the String's encoding" do "\u{787}".send((a)method).to_a.should == [1927] end

1 0

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

26 May '10

Revision: 4162 http://trac.macosforge.org/projects/ruby/changeset/4162 Author: martinlagardette(a)apple.com Date: 2010-05-26 12:58:42 -0700 (Wed, 26 May 2010) Log Message: ----------- [perf] Make sure winner results ending with 0 are colored Modified Paths: -------------- MacRuby/trunk/perf/run.rb Modified: MacRuby/trunk/perf/run.rb =================================================================== --- MacRuby/trunk/perf/run.rb 2010-05-26 11:41:43 UTC (rev 4161) +++ MacRuby/trunk/perf/run.rb 2010-05-26 19:58:42 UTC (rev 4162) @@ -45,7 +45,7 @@ title, times = line.split(/:/) best = times.split(/,/).min results[title] ||= [] - results[title] << [ruby, best] + results[title] << {:ruby => ruby, :best => best} end end prefix = File.basename(file).scan(/perf_(\w+)\.rb/)[0][0] @@ -53,9 +53,10 @@ print "#{prefix}:#{title}".ljust(20) winner = nil if res.size > 1 - winner = res.map { |_, best| best.to_f }.min.to_s + winner = res.sort { |a, b| a[:best].to_f <=> b[:best].to_f }.first[:best] end - res.each do |_, best| + res.each do |rb| + best = rb[:best] s = best.ljust(20) if best == winner s = "\033[32m#{s}\033[0m" # green

1 0

[4161] MacRuby/trunk
by source_changes＠macosforge.org 26 May '10

26 May '10

Revision: 4161 http://trac.macosforge.org/projects/ruby/changeset/4161 Author: eloy.de.enige(a)gmail.com Date: 2010-05-26 04:41:43 -0700 (Wed, 26 May 2010) Log Message: ----------- Implement String#each_codepoint / String#codepoints. Modified Paths: -------------- MacRuby/trunk/string.c Removed Paths: ------------- MacRuby/trunk/spec/frozen/tags/macruby/core/string/codepoints_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/each_codepoint_tags.txt Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/codepoints_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/codepoints_tags.txt 2010-05-26 06:06:33 UTC (rev 4160) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/codepoints_tags.txt 2010-05-26 11:41:43 UTC (rev 4161) @@ -1,11 +0,0 @@ -fails:String#codepoints returns an Enumerator when no block is given -fails:String#codepoints returns an Enumerator when no block is given even when self has an invalid encoding -fails:String#codepoints raises an ArgumentError when self has an invalid encoding and a method is called on the returned Enumerator -fails:String#codepoints yields each codepoint to the block if one is given -fails:String#codepoints raises an ArgumentError if self's encoding is invalid and a block is given -fails:String#codepoints returns codepoints as Fixnums -fails:String#codepoints returns one codepoint for each character -fails:String#codepoints works for multibyte characters -fails:String#codepoints returns the codepoint corresponding to the character's position in the String's encoding -fails:String#codepoints round-trips to the original String using Integer#chr -fails:String#codepoints is synonomous with #bytes for Strings which are single-byte optimisable Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/each_codepoint_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/each_codepoint_tags.txt 2010-05-26 06:06:33 UTC (rev 4160) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/each_codepoint_tags.txt 2010-05-26 11:41:43 UTC (rev 4161) @@ -1,11 +0,0 @@ -fails:String#each_codepoint returns an Enumerator when no block is given -fails:String#each_codepoint returns an Enumerator when no block is given even when self has an invalid encoding -fails:String#each_codepoint raises an ArgumentError when self has an invalid encoding and a method is called on the returned Enumerator -fails:String#each_codepoint yields each codepoint to the block if one is given -fails:String#each_codepoint raises an ArgumentError if self's encoding is invalid and a block is given -fails:String#each_codepoint returns codepoints as Fixnums -fails:String#each_codepoint returns one codepoint for each character -fails:String#each_codepoint works for multibyte characters -fails:String#each_codepoint returns the codepoint corresponding to the character's position in the String's encoding -fails:String#each_codepoint round-trips to the original String using Integer#chr -fails:String#each_codepoint is synonomous with #bytes for Strings which are single-byte optimisable Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-05-26 06:06:33 UTC (rev 4160) +++ MacRuby/trunk/string.c 2010-05-26 11:41:43 UTC (rev 4161) @@ -4813,6 +4813,43 @@ /* * call-seq: + * str.codepoints {|integer| block } -> str + * str.codepoints -> an_enumerator + * + * str.each_codepoint {|integer| block } -> str + * str.each_codepoint -> an_enumerator + * + * Passes the <code>Integer</code> ordinal of each character in str, + * also known as a codepoint when applied to Unicode strings to the + * given block. + * + * If no block is given, an enumerator is returned instead. + * + * "hello\u0639".each_codepoint {|c| print c, ' ' } + * + * produces: + * + * 104 101 108 108 111 1593 + */ + +static VALUE +rstr_each_codepoint(VALUE str, SEL sel) +{ + if (!str_is_valid_encoding(RSTR(str))) { + rb_raise(rb_eArgError, "invalid byte sequence in %s", + RSTR(str)->encoding->public_name); + } + RETURN_ENUMERATOR(str, 0, 0); + + const long len = str_length(RSTR(str), true); + for (int i = 0; i < len; i++) { + rb_yield(INT2NUM(rb_str_get_uchar(str, i))); + } + return str; +} + +/* + * call-seq: * str.succ => new_str * str.next => new_str * @@ -5938,6 +5975,8 @@ rb_objc_define_method(rb_cRubyString, "each_char", rstr_each_char, 0); rb_objc_define_method(rb_cRubyString, "bytes", rstr_each_byte, 0); rb_objc_define_method(rb_cRubyString, "each_byte", rstr_each_byte, 0); + rb_objc_define_method(rb_cRubyString, "codepoints", rstr_each_codepoint, 0); + rb_objc_define_method(rb_cRubyString, "each_codepoint", rstr_each_codepoint, 0); rb_objc_define_method(rb_cRubyString, "succ", rstr_succ, 0); rb_objc_define_method(rb_cRubyString, "succ!", rstr_succ_bang, 0); rb_objc_define_method(rb_cRubyString, "next", rstr_succ, 0);

1 0

[4160] MacRuby/trunk/parse.y
by source_changes＠macosforge.org 26 May '10

26 May '10

Revision: 4160 http://trac.macosforge.org/projects/ruby/changeset/4160 Author: lsansonetti(a)apple.com Date: 2010-05-25 23:06:33 -0700 (Tue, 25 May 2010) Log Message: ----------- include class.h earlier to avoid a macro conflict Modified Paths: -------------- MacRuby/trunk/parse.y Modified: MacRuby/trunk/parse.y =================================================================== --- MacRuby/trunk/parse.y 2010-05-26 05:30:07 UTC (rev 4159) +++ MacRuby/trunk/parse.y 2010-05-26 06:06:33 UTC (rev 4160) @@ -25,6 +25,7 @@ #include "symbol.h" #include "id.h" #include "re.h" +#include "class.h" #include <stdio.h> #include <errno.h> #include <ctype.h> @@ -506,7 +507,6 @@ #ifdef RIPPER #define RIPPER_VERSION "0.1.0" -#include "class.h" #include "eventids1.c" #include "eventids2.c" static ID ripper_id_gets;

1 0

[4159] MacRuby/trunk
by source_changes＠macosforge.org 26 May '10

26 May '10

Revision: 4159 http://trac.macosforge.org/projects/ruby/changeset/4159 Author: lsansonetti(a)apple.com Date: 2010-05-25 22:30:07 -0700 (Tue, 25 May 2010) Log Message: ----------- faster r{ary,hash,str}_modify() functions Modified Paths: -------------- MacRuby/trunk/array.h MacRuby/trunk/dispatcher.cpp MacRuby/trunk/encoding.h MacRuby/trunk/hash.h Modified: MacRuby/trunk/array.h =================================================================== --- MacRuby/trunk/array.h 2010-05-26 03:58:42 UTC (rev 4158) +++ MacRuby/trunk/array.h 2010-05-26 05:30:07 UTC (rev 4159) @@ -48,8 +48,10 @@ if ((mask & FL_FREEZE) == FL_FREEZE) { rb_raise(rb_eRuntimeError, "can't modify frozen/immutable array"); } - if ((mask & FL_TAINT) == FL_TAINT && rb_safe_level() >= 4) { - rb_raise(rb_eSecurityError, "Insecure: can't modify array"); + if ((mask & FL_TAINT) == FL_TAINT) { + if (rb_safe_level() >= 4) { + rb_raise(rb_eSecurityError, "Insecure: can't modify array"); + } } } Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2010-05-26 03:58:42 UTC (rev 4158) +++ MacRuby/trunk/dispatcher.cpp 2010-05-26 05:30:07 UTC (rev 4159) @@ -14,10 +14,6 @@ #include "compiler.h" #include "objc.h" #include "dtrace.h" -#include "array.h" -#include "hash.h" -#include "encoding.h" -#include "re.h" #include "class.h" #include <execinfo.h> Modified: MacRuby/trunk/encoding.h =================================================================== --- MacRuby/trunk/encoding.h 2010-05-26 03:58:42 UTC (rev 4158) +++ MacRuby/trunk/encoding.h 2010-05-26 05:30:07 UTC (rev 4159) @@ -89,8 +89,10 @@ if ((mask & FL_FREEZE) == FL_FREEZE) { rb_raise(rb_eRuntimeError, "can't modify frozen/immutable string"); } - if ((mask & FL_TAINT) == FL_TAINT && rb_safe_level() >= 4) { - rb_raise(rb_eSecurityError, "Insecure: can't modify string"); + if ((mask & FL_TAINT) == FL_TAINT) { + if (rb_safe_level() >= 4) { + rb_raise(rb_eSecurityError, "Insecure: can't modify string"); + } } } Modified: MacRuby/trunk/hash.h =================================================================== --- MacRuby/trunk/hash.h 2010-05-26 03:58:42 UTC (rev 4158) +++ MacRuby/trunk/hash.h 2010-05-26 05:30:07 UTC (rev 4159) @@ -45,8 +45,10 @@ if ((mask & FL_FREEZE) == FL_FREEZE) { rb_raise(rb_eRuntimeError, "can't modify frozen/immutable hash"); } - if ((mask & FL_TAINT) == FL_TAINT && rb_safe_level() >= 4) { - rb_raise(rb_eSecurityError, "Insecure: can't modify hash"); + if ((mask & FL_TAINT) == FL_TAINT) { + if (rb_safe_level() >= 4) { + rb_raise(rb_eSecurityError, "Insecure: can't modify hash"); + } } }

1 0

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

26 May '10

Revision: 4158 http://trac.macosforge.org/projects/ruby/changeset/4158 Author: lsansonetti(a)apple.com Date: 2010-05-25 20:58:42 -0700 (Tue, 25 May 2010) Log Message: ----------- split the algo tests into a misc directory + added sudoku test Modified Paths: -------------- MacRuby/trunk/perf/boot.rb MacRuby/trunk/perf/run.rb Added Paths: ----------- MacRuby/trunk/perf/misc/ MacRuby/trunk/perf/misc/ack.rb MacRuby/trunk/perf/misc/ao_bench.rb MacRuby/trunk/perf/misc/fib.rb MacRuby/trunk/perf/misc/mandelbrot.rb MacRuby/trunk/perf/misc/sudoku.rb MacRuby/trunk/perf/misc/tak.rb MacRuby/trunk/perf/perf_misc.rb Removed Paths: ------------- MacRuby/trunk/perf/perf_algo.rb Modified: MacRuby/trunk/perf/boot.rb =================================================================== --- MacRuby/trunk/perf/boot.rb 2010-05-26 02:10:25 UTC (rev 4157) +++ MacRuby/trunk/perf/boot.rb 2010-05-26 03:58:42 UTC (rev 4158) @@ -1,14 +1,18 @@ +if ARGV.size < 2 or ARGV.size > 3 + $stderr.puts "Usage: #{__FILE__} <n-iterations> <file.rb> [suite]" + exit 1 +end +N = ARGV[0].to_i +file = ARGV[1] +@suite = ARGV[2] @perf_tests = [] def perf_test(name, &b) - @perf_tests << [name, b] + if @suite == nil or @suite == name + @perf_tests << [name, b] + end end -if ARGV.size != 2 - $stderr.puts "Usage: #{__FILE__} <n-iterations> <file.rb>" - exit 1 -end -N = ARGV[0].to_i -load(ARGV[1]) +load(file) @perf_tests.each do |name, proc| times = [] Added: MacRuby/trunk/perf/misc/ack.rb =================================================================== --- MacRuby/trunk/perf/misc/ack.rb (rev 0) +++ MacRuby/trunk/perf/misc/ack.rb 2010-05-26 03:58:42 UTC (rev 4158) @@ -0,0 +1,11 @@ +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 + +perf_test('ack') { ack(3, 9) } Added: MacRuby/trunk/perf/misc/ao_bench.rb =================================================================== --- MacRuby/trunk/perf/misc/ao_bench.rb (rev 0) +++ MacRuby/trunk/perf/misc/ao_bench.rb 2010-05-26 03:58:42 UTC (rev 4158) @@ -0,0 +1,288 @@ +module AOBench + # AO render benchmark + # Original program (C) Syoyo Fujita in Javascript (and other languages) + # http://lucille.atso-net.jp/blog/?p=642 + # http://lucille.atso-net.jp/blog/?p=711 + # Ruby(yarv2llvm) version by Hideki Miura + # http://github.com/miura1729/yarv2llvm/blob/a888d8ce6855e70b630a8673d4cfe075… + # Modified by Tomoyuki Chikanaga + # + + IMAGE_WIDTH = 64 # original value: 256 + IMAGE_HEIGHT = 64 # original value: 256 + NSUBSAMPLES = 2 + NAO_SAMPLES = 6 # original value: 8 + + class Vec + def initialize(x, y, z) + @x = x + @y = y + @z = z + end + + attr_accessor :x, :y, :z + + def vadd(b) + Vec.new(@x + b.x, @y + b.y, @z + b.z) + end + + def vsub(b) + Vec.new(@x - b.x, @y - b.y, @z - b.z) + end + + def vcross(b) + Vec.new(@y * b.z - @z * b.y, + @z * b.x - @x * b.z, + @x * b.y - @y * b.x) + end + + def vdot(b) + @x * b.x + @y * b.y + @z * b.z + end + + def vlength + Math.sqrt(@x * @x + @y * @y + @z * @z) + end + + def vnormalize! + len = vlength + if len > 1.0e-17 + r_len = 1.0 / len + @x *= r_len + @y *= r_len + @z *= r_len + end + self + end + end + + class Sphere + def initialize(center, radius) + @center = center + @radius_2 = radius * radius + end + + def intersect(ray, isect) + rs = ray.org.vsub(@center) + b = rs.vdot(ray.dir) + c = rs.vdot(rs) - @radius_2 + d = b * b - c + if d > 0.0 + t = - b - Math.sqrt(d) + + isect.cross(self, ray, t) + end + nil + end + + def normal_vec(pos) + pos.vsub((a)center).vnormalize! + end + end + + class Plane + def initialize(p, n) + @p = p + @n = n + end + + def intersect(ray, isect) + d = -@p.vdot(@n) + v = ray.dir.vdot(@n) + v0 = v + if v < 0.0 + v0 = -v + end + if v0 < 1.0e-17 + return + end + + t = -(ray.org.vdot(@n) + d) / v + + isect.cross(self, ray, t) + nil + end + + def normal_vec(pos) + @n + end + end + + class Ray + def initialize(org, dir) + @org = org + @dir = dir + end + attr_reader :org, :dir + end + + class Isect + def initialize + @t = Float::MAX + @hit = false + @pl = Vec.new(0.0, 0.0, 0.0) + @normal = Vec.new(0.0, 0.0, 0.0) + end + + attr_reader :normal + + def hit? + @hit + end + + def cross(geom, ray, dist) + if 0.0 < dist and dist < @t + @hit = true + @t = dist + @pl = Vec.new(ray.org.x + ray.dir.x * dist, + ray.org.y + ray.dir.y * dist, + ray.org.z + ray.dir.z * dist) + @normal = geom.normal_vec(@pl) + end + nil + end + + def surface(eps) + Vec.new((a)pl.x + eps * @normal.x, + @pl.y + eps * @normal.y, + @pl.z + eps * @normal.z) + end + end + + def self.clamp(f) + i = f * 255.5 + if i > 255.0 + i = 255.0 + end + if i < 0.0 + i = 0.0 + end + i.round + end + + def self.otherBasis(basis, n) + basis[2] = Vec.new(n.x, n.y, n.z) + basis[1] = Vec.new(0.0, 0.0, 0.0) + + if n.x < 0.6 and n.x > -0.6 + basis[1].x = 1.0 + elsif n.y < 0.6 and n.y > -0.6 + basis[1].y = 1.0 + elsif n.z < 0.6 and n.z > -0.6 + basis[1].z = 1.0 + else + basis[1].x = 1.0 + end + + basis[0] = basis[1].vcross(basis[2]) + basis[0].vnormalize! + + basis[1] = basis[2].vcross(basis[0]) + basis[1].vnormalize! + end + + class Scene + def initialize + @spheres = Array.new + @spheres[0] = Sphere.new(Vec.new(-2.0, 0.0, -3.5), 0.5) + @spheres[1] = Sphere.new(Vec.new(-0.5, 0.0, -3.0), 0.5) + @spheres[2] = Sphere.new(Vec.new(1.0, 0.0, -2.2), 0.5) + @plane = Plane.new(Vec.new(0.0, -0.5, 0.0), Vec.new(0.0, 1.0, 0.0)) + end + + def ambient_occlusion(isect) + basis = Array.new + AOBench.otherBasis(basis, isect.normal) + + ntheta = NAO_SAMPLES + nphi = NAO_SAMPLES + eps = 0.0001 + occlusion = 0.0 + + p0 = isect.surface(eps) + nphi.times do |j| + ntheta.times do |i| + r = rand + rr = Math.sqrt(1.0 - r) + phi = 2.0 * Math::PI * rand + x = Math.cos(phi) * rr + y = Math.sin(phi) * rr + z = Math.sqrt(r) + + rx = x * basis[0].x + y * basis[1].x + z * basis[2].x + ry = x * basis[0].y + y * basis[1].y + z * basis[2].y + rz = x * basis[0].z + y * basis[1].z + z * basis[2].z + + raydir = Vec.new(rx, ry, rz) + ray = Ray.new(p0, raydir) + + occisect = Isect.new + @spheres[0].intersect(ray, occisect) + @spheres[1].intersect(ray, occisect) + @spheres[2].intersect(ray, occisect) + @plane.intersect(ray, occisect) + if occisect.hit? + occlusion = occlusion + 1.0 + else + 0.0 + end + end + end + + occlusion = (ntheta * nphi - occlusion).to_f / (ntheta * nphi) + + occlusion + end + + def render(w, h, nsubsamples) + cnt = 0 + pixbuf = [] + nsf = nsubsamples.to_f + nsf_2 = nsf * nsf + h.times do |y| + w.times do |x| + rad = 0.0 + + # Subsmpling + nsubsamples.times do |v| + nsubsamples.times do |u| + + cnt = cnt + 1 + wf = w.to_f + hf = h.to_f + xf = x.to_f + yf = y.to_f + uf = u.to_f + vf = v.to_f + + px = (xf + (uf / nsf) - (wf / 2.0)) / (wf / 2.0) + py = -(yf + (vf / nsf) - (hf / 2.0)) / (hf / 2.0) + + eye = Vec.new(px, py, -1.0) + eye.vnormalize! + + ray = Ray.new(Vec.new(0.0, 0.0, 0.0), eye) + + isect = Isect.new + @spheres[0].intersect(ray, isect) + @spheres[1].intersect(ray, isect) + @spheres[2].intersect(ray, isect) + @plane.intersect(ray, isect) + if isect.hit? + rad += ambient_occlusion(isect) + end + end + end + + pixbuf << AOBench.clamp(rad / nsf_2) + end + end + end + end + + def self.test + Scene.new.render(IMAGE_WIDTH, IMAGE_HEIGHT, NSUBSAMPLES) + end +end + +perf_test('ao_bench') { AOBench.test } Added: MacRuby/trunk/perf/misc/fib.rb =================================================================== --- MacRuby/trunk/perf/misc/fib.rb (rev 0) +++ MacRuby/trunk/perf/misc/fib.rb 2010-05-26 03:58:42 UTC (rev 4158) @@ -0,0 +1,9 @@ +def fib(n) + if n < 3 + 1 + else + fib(n - 1) + fib(n - 2) + end +end + +perf_test('fib') { fib(37) } Added: MacRuby/trunk/perf/misc/mandelbrot.rb =================================================================== --- MacRuby/trunk/perf/misc/mandelbrot.rb (rev 0) +++ MacRuby/trunk/perf/misc/mandelbrot.rb 2010-05-26 03:58:42 UTC (rev 4158) @@ -0,0 +1,32 @@ +def mandelbrot_i(x, y) + cr = y - 0.5 + ci = x + zi = 0.0 + zr = 0.0 + i = 0 + + while true + i += 1 + temp = zr * zi + zr2 = zr * zr + zi2 = zi * zi + zr = zr2 - zi2 + cr + zi = temp + temp + ci + return i if (zi2 + zr2 > 16) + return 0 if (i > 1000) + end +end + +def mandelbrot + y = -39 + while y < 39 + x = -39 + while x < 39 + i = mandelbrot_i(x / 40.0, y/40.0) + x += 1 + end + y += 1 + end +end + +perf_test('mandelbrot') { mandelbrot } Added: MacRuby/trunk/perf/misc/sudoku.rb =================================================================== --- MacRuby/trunk/perf/misc/sudoku.rb (rev 0) +++ MacRuby/trunk/perf/misc/sudoku.rb 2010-05-26 03:58:42 UTC (rev 4158) @@ -0,0 +1,62 @@ +class Sudoku + # Sudoku solver + # from http://blog.mmediasys.com/2008/04/24/contributions-speedup-and-less-quirks-… + + def valid?(state, x, y) + # check in col and row + 0.upto(8) do |i| + return false if i != y and state[x][i] == state[x][y] + return false if i != x and state[i][y] == state[x][y] + end + + # check in box + x_from = (x / 3) * 3 + y_from = (y / 3) * 3 + x_from.upto(x_from + 2) do |xx| + y_from.upto(y_from + 2) do |yy| + return false if (xx != x or yy != y) and state[xx][yy] == state[x][y] + end + end + + true + end + + + def next_state(state, x, y) + @count = @count + 1 + y = 0 and x = x + 1 if y == 9 + return true if x == 9 + + unless state[x][y].zero? + return false unless valid?(state, x, y) + return next_state(state, x, y + 1) + else + 1.upto(9) do |i| + state[x][y] = i + return true if valid?(state, x, y) and next_state(state, x, y + 1) + end + end + + state[x][y] = 0 + false + end + + def test + @count = 0 + start = + [ + [ 0, 0, 0, 4, 0, 5, 0, 0, 1 ], + [ 0, 7, 0, 0, 0, 0, 0, 3, 0 ], + [ 0, 0, 4, 0, 0, 0, 9, 0, 0 ], + [ 0, 0, 3, 5, 0, 4, 1, 0, 0 ], + [ 0, 0, 7, 0, 0, 0, 4, 0, 0 ], + [ 0, 0, 8, 9, 0, 1, 0, 0, 0 ], + [ 0, 0, 9, 0, 0, 0, 6, 0, 0 ], + [ 0, 8, 0, 0, 0, 0, 0, 2, 0 ], + [ 4, 0, 0, 2, 0, 0, 0, 0, 0 ] + ] + next_state(start, 0, 0) + end +end + +perf_test('sudoku') { Sudoku.new.test } Added: MacRuby/trunk/perf/misc/tak.rb =================================================================== --- MacRuby/trunk/perf/misc/tak.rb (rev 0) +++ MacRuby/trunk/perf/misc/tak.rb 2010-05-26 03:58:42 UTC (rev 4158) @@ -0,0 +1,11 @@ +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 + +perf_test('tak') { tak(18, 9, 0) } Deleted: MacRuby/trunk/perf/perf_algo.rb =================================================================== --- MacRuby/trunk/perf/perf_algo.rb 2010-05-26 02:10:25 UTC (rev 4157) +++ MacRuby/trunk/perf/perf_algo.rb 2010-05-26 03:58:42 UTC (rev 4158) @@ -1,355 +0,0 @@ -def fib(n) - if n < 3 - 1 - else - fib(n - 1) + fib(n - 2) - end -end - -perf_test('fib') { fib(37) } - -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 - -perf_test('tak') { tak(18, 9, 0) } - -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 - -perf_test('ack') { ack(3, 9) } - -def mandelbrot_i(x, y) - cr = y - 0.5 - ci = x - zi = 0.0 - zr = 0.0 - i = 0 - - while true - i += 1 - temp = zr * zi - zr2 = zr * zr - zi2 = zi * zi - zr = zr2 - zi2 + cr - zi = temp + temp + ci - return i if (zi2 + zr2 > 16) - return 0 if (i > 1000) - end -end - -def mandelbrot - y = -39 - while y < 39 - x = -39 - while x < 39 - i = mandelbrot_i(x / 40.0, y/40.0) - x += 1 - end - y += 1 - end -end - -perf_test('mandelbrot') { mandelbrot } - -module AOBench - # AO render benchmark - # Original program (C) Syoyo Fujita in Javascript (and other languages) - # http://lucille.atso-net.jp/blog/?p=642 - # http://lucille.atso-net.jp/blog/?p=711 - # Ruby(yarv2llvm) version by Hideki Miura - # http://github.com/miura1729/yarv2llvm/blob/a888d8ce6855e70b630a8673d4cfe075… - # Modified by Tomoyuki Chikanaga - # - - IMAGE_WIDTH = 64 # original value: 256 - IMAGE_HEIGHT = 64 # original value: 256 - NSUBSAMPLES = 2 - NAO_SAMPLES = 6 # original value: 8 - - class Vec - def initialize(x, y, z) - @x = x - @y = y - @z = z - end - - attr_accessor :x, :y, :z - - def vadd(b) - Vec.new(@x + b.x, @y + b.y, @z + b.z) - end - - def vsub(b) - Vec.new(@x - b.x, @y - b.y, @z - b.z) - end - - def vcross(b) - Vec.new(@y * b.z - @z * b.y, - @z * b.x - @x * b.z, - @x * b.y - @y * b.x) - end - - def vdot(b) - @x * b.x + @y * b.y + @z * b.z - end - - def vlength - Math.sqrt(@x * @x + @y * @y + @z * @z) - end - - def vnormalize! - len = vlength - if len > 1.0e-17 - r_len = 1.0 / len - @x *= r_len - @y *= r_len - @z *= r_len - end - self - end - end - - class Sphere - def initialize(center, radius) - @center = center - @radius_2 = radius * radius - end - - def intersect(ray, isect) - rs = ray.org.vsub(@center) - b = rs.vdot(ray.dir) - c = rs.vdot(rs) - @radius_2 - d = b * b - c - if d > 0.0 - t = - b - Math.sqrt(d) - - isect.cross(self, ray, t) - end - nil - end - - def normal_vec(pos) - pos.vsub((a)center).vnormalize! - end - end - - class Plane - def initialize(p, n) - @p = p - @n = n - end - - def intersect(ray, isect) - d = -@p.vdot(@n) - v = ray.dir.vdot(@n) - v0 = v - if v < 0.0 - v0 = -v - end - if v0 < 1.0e-17 - return - end - - t = -(ray.org.vdot(@n) + d) / v - - isect.cross(self, ray, t) - nil - end - - def normal_vec(pos) - @n - end - end - - class Ray - def initialize(org, dir) - @org = org - @dir = dir - end - attr_reader :org, :dir - end - - class Isect - def initialize - @t = Float::MAX - @hit = false - @pl = Vec.new(0.0, 0.0, 0.0) - @normal = Vec.new(0.0, 0.0, 0.0) - end - - attr_reader :normal - - def hit? - @hit - end - - def cross(geom, ray, dist) - if 0.0 < dist and dist < @t - @hit = true - @t = dist - @pl = Vec.new(ray.org.x + ray.dir.x * dist, - ray.org.y + ray.dir.y * dist, - ray.org.z + ray.dir.z * dist) - @normal = geom.normal_vec(@pl) - end - nil - end - - def surface(eps) - Vec.new((a)pl.x + eps * @normal.x, - @pl.y + eps * @normal.y, - @pl.z + eps * @normal.z) - end - end - - def self.clamp(f) - i = f * 255.5 - if i > 255.0 - i = 255.0 - end - if i < 0.0 - i = 0.0 - end - i.round - end - - def self.otherBasis(basis, n) - basis[2] = Vec.new(n.x, n.y, n.z) - basis[1] = Vec.new(0.0, 0.0, 0.0) - - if n.x < 0.6 and n.x > -0.6 - basis[1].x = 1.0 - elsif n.y < 0.6 and n.y > -0.6 - basis[1].y = 1.0 - elsif n.z < 0.6 and n.z > -0.6 - basis[1].z = 1.0 - else - basis[1].x = 1.0 - end - - basis[0] = basis[1].vcross(basis[2]) - basis[0].vnormalize! - - basis[1] = basis[2].vcross(basis[0]) - basis[1].vnormalize! - end - - class Scene - def initialize - @spheres = Array.new - @spheres[0] = Sphere.new(Vec.new(-2.0, 0.0, -3.5), 0.5) - @spheres[1] = Sphere.new(Vec.new(-0.5, 0.0, -3.0), 0.5) - @spheres[2] = Sphere.new(Vec.new(1.0, 0.0, -2.2), 0.5) - @plane = Plane.new(Vec.new(0.0, -0.5, 0.0), Vec.new(0.0, 1.0, 0.0)) - end - - def ambient_occlusion(isect) - basis = Array.new - AOBench.otherBasis(basis, isect.normal) - - ntheta = NAO_SAMPLES - nphi = NAO_SAMPLES - eps = 0.0001 - occlusion = 0.0 - - p0 = isect.surface(eps) - nphi.times do |j| - ntheta.times do |i| - r = rand - rr = Math.sqrt(1.0 - r) - phi = 2.0 * Math::PI * rand - x = Math.cos(phi) * rr - y = Math.sin(phi) * rr - z = Math.sqrt(r) - - rx = x * basis[0].x + y * basis[1].x + z * basis[2].x - ry = x * basis[0].y + y * basis[1].y + z * basis[2].y - rz = x * basis[0].z + y * basis[1].z + z * basis[2].z - - raydir = Vec.new(rx, ry, rz) - ray = Ray.new(p0, raydir) - - occisect = Isect.new - @spheres[0].intersect(ray, occisect) - @spheres[1].intersect(ray, occisect) - @spheres[2].intersect(ray, occisect) - @plane.intersect(ray, occisect) - if occisect.hit? - occlusion = occlusion + 1.0 - else - 0.0 - end - end - end - - occlusion = (ntheta * nphi - occlusion).to_f / (ntheta * nphi) - - occlusion - end - - def render(w, h, nsubsamples) - cnt = 0 - pixbuf = [] - nsf = nsubsamples.to_f - nsf_2 = nsf * nsf - h.times do |y| - w.times do |x| - rad = 0.0 - - # Subsmpling - nsubsamples.times do |v| - nsubsamples.times do |u| - - cnt = cnt + 1 - wf = w.to_f - hf = h.to_f - xf = x.to_f - yf = y.to_f - uf = u.to_f - vf = v.to_f - - px = (xf + (uf / nsf) - (wf / 2.0)) / (wf / 2.0) - py = -(yf + (vf / nsf) - (hf / 2.0)) / (hf / 2.0) - - eye = Vec.new(px, py, -1.0) - eye.vnormalize! - - ray = Ray.new(Vec.new(0.0, 0.0, 0.0), eye) - - isect = Isect.new - @spheres[0].intersect(ray, isect) - @spheres[1].intersect(ray, isect) - @spheres[2].intersect(ray, isect) - @plane.intersect(ray, isect) - if isect.hit? - rad += ambient_occlusion(isect) - end - end - end - - pixbuf << AOBench.clamp(rad / nsf_2) - end - end - end - end - - def self.test - Scene.new.render(IMAGE_WIDTH, IMAGE_HEIGHT, NSUBSAMPLES) - end -end - -perf_test('ao_bench') { AOBench.test } Added: MacRuby/trunk/perf/perf_misc.rb =================================================================== --- MacRuby/trunk/perf/perf_misc.rb (rev 0) +++ MacRuby/trunk/perf/perf_misc.rb 2010-05-26 03:58:42 UTC (rev 4158) @@ -0,0 +1 @@ +Dir.glob(File.join(File.dirname(__FILE__), "misc/*.rb")).each { |x| load x } Modified: MacRuby/trunk/perf/run.rb =================================================================== --- MacRuby/trunk/perf/run.rb 2010-05-26 02:10:25 UTC (rev 4157) +++ MacRuby/trunk/perf/run.rb 2010-05-26 03:58:42 UTC (rev 4158) @@ -14,12 +14,13 @@ exit 1 end else - perf_files << File.join(cwd, "perf_#{arg}.rb") + name, suite = arg.split(':', 2) + perf_files << [File.join(cwd, "perf_#{name}.rb"), suite] end end if perf_files.empty? - perf_files = Dir.glob(File.join(cwd, 'perf_*.rb')) + perf_files = Dir.glob(File.join(cwd, 'perf_*.rb')).map { |x| [x, nil] } end if rubies.empty? @@ -35,10 +36,11 @@ puts '', '-' * 80 booter = File.join(cwd, 'boot.rb') -perf_files.each do |file| +perf_files.each do |file, suite| results = {} + suite ||= '' rubies.each do |ruby| - output = `#{ruby} #{booter} #{n_iterations} #{file}`.strip + output = `#{ruby} #{booter} #{n_iterations} #{file} #{suite}`.strip output.split(/\n/).each do |line| title, times = line.split(/:/) best = times.split(/,/).min @@ -49,7 +51,10 @@ prefix = File.basename(file).scan(/perf_(\w+)\.rb/)[0][0] results.each do |title, res| print "#{prefix}:#{title}".ljust(20) - winner = res.size > 1 ? res.map { |_, best| best }.min : nil + winner = nil + if res.size > 1 + winner = res.map { |_, best| best.to_f }.min.to_s + end res.each do |_, best| s = best.ljust(20) if best == winner

1 0

[4157] MacRuby/trunk/dispatcher.cpp
by source_changes＠macosforge.org 26 May '10

26 May '10

Revision: 4157 http://trac.macosforge.org/projects/ruby/changeset/4157 Author: martinlagardette(a)apple.com Date: 2010-05-25 19:10:25 -0700 (Tue, 25 May 2010) Log Message: ----------- Do not raise "ArgumentError" in the case where the method has been undefined - Fixes #716 Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2010-05-26 02:06:02 UTC (rev 4156) +++ MacRuby/trunk/dispatcher.cpp 2010-05-26 02:10:25 UTC (rev 4157) @@ -944,17 +944,20 @@ if (new_sel != 0) { Method m = class_getInstanceMethod(klass, new_sel); if (m != NULL) { - unsigned expected_argc; - rb_vm_method_node_t *node = GET_CORE()->method_node_get(m); - if (node != NULL) { - expected_argc = node->arity.min; + IMP mimp = method_getImplementation(m); + if (!UNAVAILABLE_IMP(mimp)) { + unsigned expected_argc; + rb_vm_method_node_t *node = GET_CORE()->method_node_get(m); + if (node != NULL) { + expected_argc = node->arity.min; + } + else { + expected_argc = method_getNumberOfArguments(m); + expected_argc -= 2; // removing receiver and selector + } + rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", + argc, expected_argc); } - else { - expected_argc = method_getNumberOfArguments(m); - expected_argc -= 2; // removing receiver and selector - } - rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", - argc, expected_argc); } }

1 0