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

[1914] MacRuby/branches/experimental
by source_changes＠macosforge.org 21 Jun '09

21 Jun '09

Revision: 1914 http://trac.macosforge.org/projects/ruby/changeset/1914 Author: vincent.isambart(a)gmail.com Date: 2009-06-20 18:45:04 -0700 (Sat, 20 Jun 2009) Log Message: ----------- added a failing test and its fix Modified Paths: -------------- MacRuby/branches/experimental/test_vm/block.rb MacRuby/branches/experimental/vm.cpp Modified: MacRuby/branches/experimental/test_vm/block.rb =================================================================== --- MacRuby/branches/experimental/test_vm/block.rb 2009-06-20 23:43:28 UTC (rev 1913) +++ MacRuby/branches/experimental/test_vm/block.rb 2009-06-21 01:45:04 UTC (rev 1914) @@ -532,3 +532,8 @@ } assert '[2, 3, 4]', "p [1, 2, 3].map(&:succ)" + +assert '42', %{ + b = proc { |x| if x then p x else b.call(42) end } + b.call(nil) +} Modified: MacRuby/branches/experimental/vm.cpp =================================================================== --- MacRuby/branches/experimental/vm.cpp 2009-06-20 23:43:28 UTC (rev 1913) +++ MacRuby/branches/experimental/vm.cpp 2009-06-21 01:45:04 UTC (rev 1914) @@ -2756,6 +2756,36 @@ extern "C" rb_vm_block_t * +rb_vm_dup_active_block(rb_vm_block_t *src_b) +{ + assert(src_b->flags & VM_BLOCK_ACTIVE); + + int block_size = sizeof(rb_vm_block_t) + + (sizeof(VALUE *) * src_b->dvars_size); + + rb_vm_block_t *new_b = (rb_vm_block_t *)xmalloc(block_size); + + memcpy(new_b, src_b, block_size); + GC_WB(&new_b->parent_block, src_b->parent_block); + new_b->flags = src_b->flags & ~VM_BLOCK_ACTIVE; + + rb_vm_local_t *src_l = src_b->locals; + rb_vm_local_t **new_l = &new_b->locals; + while (src_l != NULL) { + GC_WB(new_l, xmalloc(sizeof(rb_vm_local_t))); + (*new_l)->name = src_l->name; + GC_WB(&(*new_l)->value, src_l->value); + + new_l = &(*new_l)->next; + src_l = src_l->next; + } + *new_l = NULL; + + return new_b; +} + +extern "C" +rb_vm_block_t * rb_vm_prepare_block(void *llvm_function, NODE *node, VALUE self, rb_vm_var_uses **parent_var_uses, rb_vm_block_t *parent_block, @@ -2834,7 +2864,7 @@ for (int i = 0; i < lvars_size; ++i) { assert(l != NULL); l->name = va_arg(ar, ID); - l->value = va_arg(ar, VALUE *); + GC_WB(&l->value, va_arg(ar, VALUE *)); l = l->next; } } @@ -3273,7 +3303,9 @@ block_call: - assert(!(b->flags & VM_BLOCK_ACTIVE)); + if (b->flags & VM_BLOCK_ACTIVE) { + b = rb_vm_dup_active_block(b); + } b->flags |= VM_BLOCK_ACTIVE; VALUE v = Qnil; try {

1 0

[1913] MacRuby/branches/experimental
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1913 http://trac.macosforge.org/projects/ruby/changeset/1913 Author: lsansonetti(a)apple.com Date: 2009-06-20 16:43:28 -0700 (Sat, 20 Jun 2009) Log Message: ----------- Symbol#to_proc: implemented Modified Paths: -------------- MacRuby/branches/experimental/include/ruby/intern.h MacRuby/branches/experimental/proc.c MacRuby/branches/experimental/string.c MacRuby/branches/experimental/test_vm/block.rb MacRuby/branches/experimental/vm.cpp MacRuby/branches/experimental/vm.h Modified: MacRuby/branches/experimental/include/ruby/intern.h =================================================================== --- MacRuby/branches/experimental/include/ruby/intern.h 2009-06-20 22:17:42 UTC (rev 1912) +++ MacRuby/branches/experimental/include/ruby/intern.h 2009-06-20 23:43:28 UTC (rev 1913) @@ -274,7 +274,6 @@ VALUE rb_class_new_instance(int, VALUE*, VALUE); VALUE rb_block_proc(void); VALUE rb_f_lambda(void); -VALUE rb_proc_new(VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE); VALUE rb_proc_call(VALUE, VALUE); int rb_proc_arity(VALUE); VALUE rb_binding_new(void); Modified: MacRuby/branches/experimental/proc.c =================================================================== --- MacRuby/branches/experimental/proc.c 2009-06-20 22:17:42 UTC (rev 1912) +++ MacRuby/branches/experimental/proc.c 2009-06-20 23:43:28 UTC (rev 1913) @@ -1350,16 +1350,6 @@ } #endif -VALUE -rb_proc_new( - VALUE (*func)(ANYARGS), /* VALUE yieldarg[, VALUE procarg] */ - VALUE val) -{ -// VALUE procval = rb_iterate(mproc, 0, func, val); -// return procval; - return Qnil; -} - /* * call-seq: * meth.to_proc => prc @@ -1432,11 +1422,14 @@ return Data_Wrap_Struct(rb_cBinding, NULL, NULL, binding); } -static VALUE curry(VALUE dummy, VALUE args, int argc, VALUE *argv); +//static VALUE curry(VALUE dummy, VALUE args, int argc, VALUE *argv); static VALUE make_curry_proc(VALUE proc, VALUE passed, VALUE arity) { + // TODO + return Qnil; +#if 0 #if WITH_OBJC VALUE args = rb_ary_new3(3, proc, passed, arity); #else @@ -1449,8 +1442,10 @@ rb_ary_freeze(passed); rb_ary_freeze(args); return rb_proc_new(curry, args); +#endif } +#if 0 static VALUE curry(VALUE dummy, VALUE args, int argc, VALUE *argv) { @@ -1468,9 +1463,10 @@ arity = rb_proc_call(proc, passed); return arity; } +#endif /* - * call-seq: + curry* call-seq: * prc.curry => a_proc * prc.curry(arity) => a_proc * Modified: MacRuby/branches/experimental/string.c =================================================================== --- MacRuby/branches/experimental/string.c 2009-06-20 22:17:42 UTC (rev 1912) +++ MacRuby/branches/experimental/string.c 2009-06-20 23:43:28 UTC (rev 1913) @@ -5065,18 +5065,6 @@ return sym; } -static VALUE -sym_call(VALUE args, VALUE sym, int argc, VALUE *argv) -{ - VALUE obj; - - if (argc < 1) { - rb_raise(rb_eArgError, "no receiver given"); - } - obj = argv[0]; - return rb_funcall3(obj, (ID)sym, argc - 1, argv + 1); -} - /* * call-seq: * sym.to_proc @@ -5089,7 +5077,9 @@ static VALUE sym_to_proc(VALUE sym, SEL sel) { - return rb_proc_new(sym_call, (VALUE)SYM2ID(sym)); + SEL msel = sel_registerName(rb_id2name(SYM2ID(sym))); + rb_vm_block_t *b = rb_vm_create_block_calling_sel(msel); + return rb_proc_alloc_with_block(rb_cProc, b); } ID Modified: MacRuby/branches/experimental/test_vm/block.rb =================================================================== --- MacRuby/branches/experimental/test_vm/block.rb 2009-06-20 22:17:42 UTC (rev 1912) +++ MacRuby/branches/experimental/test_vm/block.rb 2009-06-20 23:43:28 UTC (rev 1913) @@ -521,3 +521,14 @@ p :ok if foo == 42 p :ok if $!.nil? } + +assert ':ok', %{ + b = :foo.to_proc + begin + b.call + rescue ArgumentError + p :ok + end +} + +assert '[2, 3, 4]', "p [1, 2, 3].map(&:succ)" Modified: MacRuby/branches/experimental/vm.cpp =================================================================== --- MacRuby/branches/experimental/vm.cpp 2009-06-20 22:17:42 UTC (rev 1912) +++ MacRuby/branches/experimental/vm.cpp 2009-06-20 23:43:28 UTC (rev 1913) @@ -3088,8 +3088,6 @@ return GET_VM()->current_block(); } -extern "C" VALUE rb_proc_alloc_with_block(VALUE klass, rb_vm_block_t *proc); - extern "C" VALUE rb_vm_current_block_object(void) @@ -3187,6 +3185,31 @@ return b; } +static VALUE +rb_vm_block_call_sel(VALUE rcv, SEL sel, VALUE **dvars, rb_vm_block_t *b, + VALUE x) +{ + if (x == Qnil) { + rb_raise(rb_eArgError, "no receiver given"); + } + return rb_vm_call(x, (SEL)dvars[0], 0, NULL, false); +} + +extern "C" +rb_vm_block_t * +rb_vm_create_block_calling_sel(SEL sel) +{ + rb_vm_block_t *b = (rb_vm_block_t *)xmalloc(sizeof(rb_vm_block_t) + + sizeof(VALUE *)); + + b->arity = rb_vm_arity(1); + b->flags = VM_BLOCK_PROC; + b->imp = (IMP)rb_vm_block_call_sel; + b->dvars[0] = (VALUE *)sel; + + return b; +} + static inline VALUE rb_vm_block_eval0(rb_vm_block_t *b, VALUE self, int argc, const VALUE *argv) { Modified: MacRuby/branches/experimental/vm.h =================================================================== --- MacRuby/branches/experimental/vm.h 2009-06-20 22:17:42 UTC (rev 1912) +++ MacRuby/branches/experimental/vm.h 2009-06-20 23:43:28 UTC (rev 1913) @@ -285,8 +285,12 @@ GC_WB(&robj->slots[slot], val); } +// Defined in proc.c +VALUE rb_proc_alloc_with_block(VALUE klass, rb_vm_block_t *proc); + rb_vm_method_t *rb_vm_get_method(VALUE klass, VALUE obj, ID mid, int scope); rb_vm_block_t *rb_vm_create_block_from_method(rb_vm_method_t *method); +rb_vm_block_t *rb_vm_create_block_calling_sel(SEL sel); static inline rb_vm_block_t * rb_proc_get_block(VALUE proc)

1 0

[1912] MacRuby/branches/experimental/sample-macruby/HotCocoa/graphics/demo. rb
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1912 http://trac.macosforge.org/projects/ruby/changeset/1912 Author: lsansonetti(a)apple.com Date: 2009-06-20 15:17:42 -0700 (Sat, 20 Jun 2009) Log Message: ----------- adding HotCocoa::Graphics live demo Added Paths: ----------- MacRuby/branches/experimental/sample-macruby/HotCocoa/graphics/demo.rb Added: MacRuby/branches/experimental/sample-macruby/HotCocoa/graphics/demo.rb =================================================================== --- MacRuby/branches/experimental/sample-macruby/HotCocoa/graphics/demo.rb (rev 0) +++ MacRuby/branches/experimental/sample-macruby/HotCocoa/graphics/demo.rb 2009-06-20 22:17:42 UTC (rev 1912) @@ -0,0 +1,259 @@ +require 'hotcocoa' +require 'hotcocoa/graphics' +include HotCocoa +include Graphics +include Math + +class DemoView < NSView + include HotCocoa::Behaviors + + attr_accessor :selected_demo, :adjust + + def self.create + alloc.initWithFrame(NSZeroRect) + end + + DEMOS = [ + ['Particles', :draw_particles, true], + ['Randomize', :draw_randomize, true], + ['Rope Hair', :draw_rope_hair, false], + ['Rope Ribbon', :draw_rope_ribbon, false], + ['Spirograph', :draw_spirograph, true] + ] + + def self.demo_names + DEMOS.map { |x| x[0] } + end + + def initWithFrame(frame) + if super + @selected_demo = 0 + @adjust = 0 + self.layout = {} + return self + end + end + + def drawRect(rect) + canvas = Canvas.for_current_context + canvas.width = rect.size.width + canvas.height = rect.size.height + send(DEMOS[@selected_demo][1], canvas) + end + + def support_adjust? + DEMOS[@selected_demo][2] + end + + private + + def draw_particles(canvas) + canvas.background(Color.black) + + # load images and grab colors + @redcolors ||= Image.new('images/italy.jpg').saturation(1.9).colors(100) + @bluecolors ||= Image.new('images/v2.jpg').saturation(1.9).colors(100) + + # create flower head shape + head = Path.new.oval(0,0,10,10,:center) + petals = 3 + petals.times do + head.rotate(360/petals) + head.oval(0,10,5,5,:center) + head.oval(0,17,2,2,:center) + end + # randomize head attributes + head.randomize(:fill, @redcolors) + head.randomize(:stroke,@bluecolors) + head.randomize(:scale,0.2..2.0) + head.randomize(:rotation,0..360) + + # create particles + numparticles = 100 + @adjust + numframes = 100 + @adjust + particles = [] + numparticles.times do |i| + # start particle at random point at bottom of canvas + x = random(canvas.width/2 - 50,canvas.width/2 + 50) + p = Particle.new(x,0) + p.velocity_x = random(-0.5,0.5) # set initial x velocity + p.velocity_y = random(1.0,3.0) # set initial y velocity + p.acceleration = 0.1 # set drag or acceleration + particles[i] = p # add particle to array + end + + # animate particles + numframes.times do |frame| + numparticles.times do |i| + particles[i].move + end + end + + # draw particle trails and heads + numparticles.times do |i| + canvas.push + # choose a stem color + color = choose((a)bluecolors).a(0.7).analog(20,0.7) + canvas.stroke(color) + canvas.strokewidth(random(0.5,2.0)) + # draw the particle + particles[i].draw(canvas) + # go to the last particle position and draw the flower head + canvas.translate(particles[i].points[-1][0],particles[i].points[-1][1]) + canvas.draw(head) + canvas.pop + end + end + + def draw_randomize(canvas) + canvas.background(Color.white) + + # create a flower shape + shape = Path.new + petals = 5 + petals.times do + shape.petal(0, 0, 40, 100) # petal at x,y with width,height + shape.rotate(360 / petals) # rotate by 1/5th + end + + # randomize shape parameters + shape.randomize(:fill, Color.blue.complementary) + shape.randomize(:stroke, Color.blue.complementary) + shape.randomize(:strokewidth, 1.0..10.0) + shape.randomize(:rotation, 0..360) + shape.randomize(:scale, 0.5..1.0) + shape.randomize(:scalex, 0.5..1.0) + shape.randomize(:scaley, 0.5..1.0) + shape.randomize(:alpha, 0.5..1.0) + # shape.randomize(:hue, 0.5..0.8) + shape.randomize(:saturation, 0.0..1.0) + shape.randomize(:brightness, 0.0..1.0) + + r = 100 + (@adjust * 2) + r = -r..r + shape.randomize(:x, r) + shape.randomize(:y, r) + + # draw 50 flowers starting at the center of the canvas + canvas.translate(canvas.width / 2.0, canvas.height / 2.0) + canvas.draw(shape, 0, 0, 100 + (@adjust * 2)) + end + + def draw_rope_hair(canvas) + # choose a random color and set the background to a darker variant + clr = Color.random.a(0.5) + canvas.background(clr.copy.darken(0.6)) + + # create a new rope with 200 fibers + rope = Rope.new(canvas, :width => 100, :fibers => 200, :strokewidth => 0.4, + :roundness => 3.0) + + # randomly rotate the canvas from its center + canvas.translate(canvas.width/2, canvas.height/2) + canvas.rotate(random(0, 360)) + canvas.translate(-canvas.width/2, -canvas.height/2) + + # draw 20 ropes + ropes = 20 + ropes.times do + # rotate hue up to 20 deg left/right, vary brightness/saturation by up + # to 70% + canvas.stroke(clr.copy.analog(20, 0.8)) + rope.x0 = -100 # start rope off bottom left of canvas + rope.y0 = -100 + rope.x1 = canvas.width + 100 # end rope off top right of canvas + rope.y1 = canvas.height + 100 + rope.hair # draw rope in organic "hair" style + end + end + + def draw_rope_ribbon(canvas) + # choose a random color and set the background to a darker variant + clr = Color.random.a(0.5) + canvas.background(clr.copy.darken(0.6)) + + # create a new rope with 200 fibers + rope = Rope.new(canvas, :width => 500, :fibers => 200, :strokewidth => 1.0, + :roundness => 1.5) + + # randomly rotate the canvas from its center + canvas.translate(canvas.width/2, canvas.height/2) + canvas.rotate(random(0, 360)) + canvas.translate(-canvas.width/2, -canvas.height/2) + + # draw 20 ropes + ropes = 20 + ropes.times do |i| + # rotate hue up to 10 deg left/right, vary brightness/saturation by up + # to 70% + canvas.stroke(clr.copy.analog(10, 0.7)) + rope.x0 = -100 # start rope off bottom left of canvas + rope.y0 = -100 + rope.x1 = canvas.width + 200 # end rope off top right of canvas + rope.y1 = canvas.height + 200 + rope.ribbon # draw rope in smooth "ribbon" style + end + end + + def draw_spirograph(canvas) + canvas.background(Color.beige) + canvas.fill(Color.black) + canvas.font('Book Antiqua', 1.0) + canvas.translate(canvas.width/2, canvas.height/2) + + # rotate, draw text, repeat + 180.times do |i| + canvas.new_state do + canvas.rotate((i*2) + 120 + (@adjust * 2)) + canvas.translate(70 + (@adjust * 2),0) + canvas.text('going...', 80, 0) + canvas.rotate(i * 6) + canvas.text('Around and', 20, 0) + end + end + end +end + +application do + + w = window :title => 'HotCocoa::Graphics Demo!', :size => [480, 540] + + view = DemoView.create + view.layout = {:expand => [:width, :height]} + + s = slider :min => 0, :max => 100 + s.frameSize = [320, 30] + s.on_action do |s| + view.adjust = s.to_i + view.needsDisplay = true + end + + box = layout_view :mode => :horizontal, :size => [0, 30], :margin => 0 + box.layout = {:expand => :width} + box.default_layout = {:align => :center} + + p = popup :items => DemoView.demo_names + p.on_action do |p| + view.selected_demo = p.indexOfSelectedItem + s.intValue = 0 + view.adjust = 0 + s.enabled = view.support_adjust? + view.needsDisplay = true + end + box << p + + b = button :title => 'Refresh' + b.frameSize = [80, 32] + b.on_action { view.needsDisplay = true } + box << b + + b = button :title => 'Quit' + b.frameSize = [80, 32] + b.on_action { exit } + box << b + + w << s + w << box + w << view + +end

1 0

[1911] MacRuby/branches/experimental/lib/hotcocoa/graphics
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1911 http://trac.macosforge.org/projects/ruby/changeset/1911 Author: lsansonetti(a)apple.com Date: 2009-06-20 15:17:22 -0700 (Sat, 20 Jun 2009) Log Message: ----------- optimized a few code paths of HotCocoa::Graphics Modified Paths: -------------- MacRuby/branches/experimental/lib/hotcocoa/graphics/canvas.rb MacRuby/branches/experimental/lib/hotcocoa/graphics/color.rb MacRuby/branches/experimental/lib/hotcocoa/graphics/elements/particle.rb MacRuby/branches/experimental/lib/hotcocoa/graphics/path.rb Modified: MacRuby/branches/experimental/lib/hotcocoa/graphics/canvas.rb =================================================================== --- MacRuby/branches/experimental/lib/hotcocoa/graphics/canvas.rb 2009-06-20 12:14:56 UTC (rev 1910) +++ MacRuby/branches/experimental/lib/hotcocoa/graphics/canvas.rb 2009-06-20 22:17:22 UTC (rev 1911) @@ -259,7 +259,7 @@ x = x - w / 2 y = y - h / 2 end - CGContextAddRect(@ctx, [x, y, w, h]) + CGContextAddRect(@ctx, NSMakeRect(x, y, w, h)) CGContextDrawPath(@ctx, KCGPathFillStroke) end @@ -270,7 +270,7 @@ x = x - w / 2 y = y - w / 2 end - CGContextAddEllipseInRect(@ctx, [x, y, w, h]) + CGContextAddEllipseInRect(@ctx, NSMakeRect(x, y, w, h)) CGContextDrawPath(@ctx, KCGPathFillStroke) # apply fill and stroke end @@ -294,14 +294,14 @@ def radial(gradient, sx=@width/2, sy=@height/2, er=@width/2, ex=sx, ey=sy, sr=0.0) #options = KCGGradientDrawsBeforeStartLocation #options = KCGGradientDrawsAfterEndLocation - CGContextDrawRadialGradient(@ctx, gradient.gradient, [sx, sy], sr, [ex, ey], er, gradient.pre + gradient.post) + CGContextDrawRadialGradient(@ctx, gradient.gradient, NSMakePoint(sx, sy), sr, NSMakePoint(ex, ey), er, gradient.pre + gradient.post) end # draw an axial(linear) gradient starting at sx,sy and ending at ex,ey def gradient(gradient=Gradient.new, start_x=@width/2, start_y=0, end_x=@width/2, end_y=@height) #options = KCGGradientDrawsBeforeStartLocation #options = KCGGradientDrawsAfterEndLocation - CGContextDrawLinearGradient(@ctx, gradient.gradient, [start_x, start_y], [end_x, end_y], gradient.pre + gradient.post) + CGContextDrawLinearGradient(@ctx, gradient.gradient, NSMakePoint(start_x, start_y), NSMakePoint(end_x, end_y), gradient.pre + gradient.post) end # draw a cartesian coordinate grid for reference @@ -339,7 +339,7 @@ # draw a line starting at x1,y1 and ending at x2,y2 def line(x1, y1, x2, y2) - CGContextAddLines(@ctx, [[x1, y1], [x2, y2]], 2) + CGContextAddLines(@ctx, [NSPoint.new(x1, y1), NSPoint.new(x2, y2)], 2) CGContextDrawPath(@ctx, KCGPathStroke) # apply stroke endpath Modified: MacRuby/branches/experimental/lib/hotcocoa/graphics/color.rb =================================================================== --- MacRuby/branches/experimental/lib/hotcocoa/graphics/color.rb 2009-06-20 12:14:56 UTC (rev 1910) +++ MacRuby/branches/experimental/lib/hotcocoa/graphics/color.rb 2009-06-20 22:17:22 UTC (rev 1911) @@ -194,7 +194,13 @@ [330, 298], [345, 329], [360, 0 ] ] - + + COLORNAMES.each_key do |name| + (class << self; self; end).define_method(name) do + named(name) + end + end + # create a color with the specified name def self.named(name) if COLORNAMES[name] @@ -236,11 +242,6 @@ nearest end - # if the method name is not recognized, try creating a color with that name - def self.method_missing(name, *args) - Color.named(name.to_s.downcase) - end - # return a copy of this color def copy Color.new(r, g, b, a) Modified: MacRuby/branches/experimental/lib/hotcocoa/graphics/elements/particle.rb =================================================================== --- MacRuby/branches/experimental/lib/hotcocoa/graphics/elements/particle.rb 2009-06-20 12:14:56 UTC (rev 1910) +++ MacRuby/branches/experimental/lib/hotcocoa/graphics/elements/particle.rb 2009-06-20 22:17:22 UTC (rev 1911) @@ -36,7 +36,7 @@ @velocity_y=velocity_y # append the point to the array - @points = [[@x, @y]] + @points = [NSPoint.new(@x, @y)] @stroke = Color.white end @@ -56,7 +56,7 @@ # draw a line from the old position to the new #CANVAS.line(@previous_x,@previous_y,@x,@y); - @points.push([@x, @y]) + @points.push(NSPoint.new(@x, @y)) # grow old @age += 1 @@ -72,4 +72,4 @@ end end -end \ No newline at end of file +end Modified: MacRuby/branches/experimental/lib/hotcocoa/graphics/path.rb =================================================================== --- MacRuby/branches/experimental/lib/hotcocoa/graphics/path.rb 2009-06-20 12:14:56 UTC (rev 1910) +++ MacRuby/branches/experimental/lib/hotcocoa/graphics/path.rb 2009-06-20 22:17:22 UTC (rev 1911) @@ -132,8 +132,7 @@ # return the current point def currentpoint - point = CGPathGetCurrentPoint(@path) - [point.x, point.y] + CGPathGetCurrentPoint(@path) end # true if the path contains the current point # doesn't work? @@ -206,7 +205,7 @@ # draw a line from x1,x2 to x2,y2 def line(x1, y1, x2, y2) - CGPathAddLines(@path, @transform, [[x1, y1], [x2, y2]]) + CGPathAddLines(@path, @transform, [NSMakePoint(x1, y1), NSMakePoint(x2, y2)]) self end @@ -323,4 +322,4 @@ end -end \ No newline at end of file +end

1 0

[1910] MacRuby/branches/experimental/spec/frozen/tags/macruby/core
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1910 http://trac.macosforge.org/projects/ruby/changeset/1910 Author: eloy.de.enige(a)gmail.com Date: 2009-06-20 05:14:56 -0700 (Sat, 20 Jun 2009) Log Message: ----------- Removed tags of passing examples. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/io/popen_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/Float_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/global_variables_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/instance_eval_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/local_variables_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/p_tags.txt Removed Paths: ------------- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/dir/pwd_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/private_methods_tags.txt Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/dir/pwd_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/dir/pwd_tags.txt 2009-06-20 12:14:36 UTC (rev 1909) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/dir/pwd_tags.txt 2009-06-20 12:14:56 UTC (rev 1910) @@ -1 +0,0 @@ -fails:Dir.pwd returns the current working directory Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/io/popen_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/io/popen_tags.txt 2009-06-20 12:14:36 UTC (rev 1909) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/io/popen_tags.txt 2009-06-20 12:14:56 UTC (rev 1910) @@ -1,2 +1,2 @@ critical:IO::popen writes to a write-only pipe -fails:IO::popen reads and writes to a read/write pipe \ No newline at end of file +fails:IO::popen reads and writes to a read/write pipe Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/Float_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/Float_tags.txt 2009-06-20 12:14:36 UTC (rev 1909) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/Float_tags.txt 2009-06-20 12:14:56 UTC (rev 1910) @@ -24,7 +24,6 @@ critical:Kernel#Float raises an ArgumentError if there's a decimal point on the right side of the 'E' fails:Kernel.Float is a private method fails:Kernel#Float is a private method -fails:Kernel#Float raises a TypeError if #to_f is not provided fails:Kernel.Float otherwise, converts the given argument to a Float by calling #to_f fails:Kernel.Float returns the identical NaN if to_f is called and it returns NaN fails:Kernel.Float returns the identical Infinity if to_f is called and it returns Infinity Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/global_variables_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/global_variables_tags.txt 2009-06-20 12:14:36 UTC (rev 1909) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/global_variables_tags.txt 2009-06-20 12:14:56 UTC (rev 1910) @@ -1,2 +1 @@ fails:Kernel.global_variables is a private method -fails:Kernel.global_variables finds subset starting with std Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/instance_eval_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/instance_eval_tags.txt 2009-06-20 12:14:36 UTC (rev 1909) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/instance_eval_tags.txt 2009-06-20 12:14:56 UTC (rev 1910) @@ -5,4 +5,3 @@ fails:Kernel#instance_eval sets class variables in the receiver fails:Kernel#instance_eval raises a TypeError when defining methods on an immediate fails:Kernel#instance_eval raises a TypeError when defining methods on numerics -fails:Kernel#instance_eval has access to receiver's instance variables \ No newline at end of file Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/local_variables_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/local_variables_tags.txt 2009-06-20 12:14:36 UTC (rev 1909) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/local_variables_tags.txt 2009-06-20 12:14:56 UTC (rev 1910) @@ -1,3 +1,2 @@ fails:Kernel.local_variables is a private method -fails:Kernel.local_variables contains locals as they are added fails:Kernel.local_variables is accessable from bindings Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/p_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/p_tags.txt 2009-06-20 12:14:36 UTC (rev 1909) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/p_tags.txt 2009-06-20 12:14:56 UTC (rev 1910) @@ -1,3 +1,3 @@ fails:Kernel#p is a private method fails:Kernel#p prints obj.inspect followed by system record separator for each argument given -fails:Kernel#p is not affected by setting $\, $/ or $, +critical:Kernel#p is not affected by setting $\, $/ or $, Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/private_methods_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/private_methods_tags.txt 2009-06-20 12:14:36 UTC (rev 1909) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/kernel/private_methods_tags.txt 2009-06-20 12:14:56 UTC (rev 1910) @@ -1,2 +0,0 @@ -fails:Kernel#private_methods returns a list of the names of privately accessible methods in the object -fails:Kernel#private_methods returns a list of the names of privately accessible methods in the object and its ancestors and mixed-in modules

1 0

[1909] MacRuby/branches/experimental/spec/macruby.mspec
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1909 http://trac.macosforge.org/projects/ruby/changeset/1909 Author: eloy.de.enige(a)gmail.com Date: 2009-06-20 05:14:36 -0700 (Sat, 20 Jun 2009) Log Message: ----------- Give MSpec the full path to miniruby as the target. Modified Paths: -------------- MacRuby/branches/experimental/spec/macruby.mspec Modified: MacRuby/branches/experimental/spec/macruby.mspec =================================================================== --- MacRuby/branches/experimental/spec/macruby.mspec 2009-06-20 08:50:04 UTC (rev 1908) +++ MacRuby/branches/experimental/spec/macruby.mspec 2009-06-20 12:14:36 UTC (rev 1909) @@ -45,9 +45,7 @@ set :optional, [get(:ffi)] # The default implementation to run the specs. - # TODO: this needs to be more sophisticated since the - # executable is not consistently named. - set :target, './miniruby' + set :target, File.expand_path('../../miniruby', __FILE__) set :tags_patterns, [ [%r(language/), 'tags/macruby/language/'],

1 0

[1908] MacRuby/branches/experimental
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1908 http://trac.macosforge.org/projects/ruby/changeset/1908 Author: lsansonetti(a)apple.com Date: 2009-06-20 01:50:04 -0700 (Sat, 20 Jun 2009) Log Message: ----------- Boxed#[], Boxed#[]=: implemented Modified Paths: -------------- MacRuby/branches/experimental/bridgesupport.cpp MacRuby/branches/experimental/spec/macruby/core/struct_spec.rb Modified: MacRuby/branches/experimental/bridgesupport.cpp =================================================================== --- MacRuby/branches/experimental/bridgesupport.cpp 2009-06-20 05:35:41 UTC (rev 1907) +++ MacRuby/branches/experimental/bridgesupport.cpp 2009-06-20 08:50:04 UTC (rev 1908) @@ -378,6 +378,38 @@ } static VALUE +rb_vm_struct_aref(VALUE rcv, SEL sel, VALUE index) +{ + const long idx = NUM2LONG(index); + + rb_vm_bs_boxed_t *bs_boxed = locate_bs_boxed(CLASS_OF(rcv), true); + if (idx < 0 || (unsigned long)idx >= bs_boxed->as.s->fields_count) { + rb_raise(rb_eArgError, "given index %ld out of bounds", idx); + } + + VALUE *rcv_data; + Data_Get_Struct(rcv, VALUE, rcv_data); + + return rcv_data[idx]; +} + +static VALUE +rb_vm_struct_aset(VALUE rcv, SEL sel, VALUE index, VALUE val) +{ + const long idx = NUM2LONG(index); + + rb_vm_bs_boxed_t *bs_boxed = locate_bs_boxed(CLASS_OF(rcv), true); + if (idx < 0 || (unsigned long)idx >= bs_boxed->as.s->fields_count) { + rb_raise(rb_eArgError, "given index %ld out of bounds", idx); + } + + char buf[100]; + snprintf(buf, sizeof buf, "%s=:", bs_boxed->as.s->fields[idx].name); + + return rb_vm_call(rcv, sel_registerName(buf), 1, &val, false); +} + +static VALUE rb_vm_struct_dup(VALUE rcv, SEL sel) { VALUE klass = CLASS_OF(rcv); @@ -479,6 +511,10 @@ (void *)rb_vm_struct_inspect, 0); rb_objc_define_method(boxed->klass, "to_a", (void *)rb_vm_struct_to_a, 0); + rb_objc_define_method(boxed->klass, "[]", + (void *)rb_vm_struct_aref, 1); + rb_objc_define_method(boxed->klass, "[]=", + (void *)rb_vm_struct_aset, 2); } else { // Opaque methods. Modified: MacRuby/branches/experimental/spec/macruby/core/struct_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/macruby/core/struct_spec.rb 2009-06-20 05:35:41 UTC (rev 1907) +++ MacRuby/branches/experimental/spec/macruby/core/struct_spec.rb 2009-06-20 08:50:04 UTC (rev 1908) @@ -225,4 +225,34 @@ o.should == [NSPoint.new(1, 2), NSSize.new(3, 4)] o.map { |x| x.to_a }.flatten.should == [1, 2, 3, 4] end + + it "allows its elements to be retrieved using #[]" do + p = NSPoint.new(1, 2) + p[0].should == 1 + p[1].should == 2 + p.x = 42 + p.y = 4242 + p[0].should == 42 + p[1].should == 4242 + + lambda { p[-1] }.should raise_error(ArgumentError) + lambda { p[2] }.should raise_error(ArgumentError) + end + + it "allows its elements to be set using #[]=" do + p = NSPoint.new + p[0] = 1 + p[1] = 2 + p.x.should == 1 + p.y.should == 2 + + lambda { p[-1] = 42 }.should raise_error(ArgumentError) + lambda { p[2] = 42 }.should raise_error(ArgumentError) + + r = NSRect.new + r[0] = p + r.origin.should == p + r[1] = [3, 4] + r.size.should == NSSize.new(3, 4) + end end

1 0

[1907] MacRuby/branches/experimental/hash.c
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1907 http://trac.macosforge.org/projects/ruby/changeset/1907 Author: lsansonetti(a)apple.com Date: 2009-06-19 22:35:41 -0700 (Fri, 19 Jun 2009) Log Message: ----------- re-oops Modified Paths: -------------- MacRuby/branches/experimental/hash.c Modified: MacRuby/branches/experimental/hash.c =================================================================== --- MacRuby/branches/experimental/hash.c 2009-06-20 05:29:50 UTC (rev 1906) +++ MacRuby/branches/experimental/hash.c 2009-06-20 05:35:41 UTC (rev 1907) @@ -2483,7 +2483,7 @@ void Init_Hash(void) { - selDefault = sel_registerName("default"); + selDefault = sel_registerName("default:"); defaultCache = rb_vm_get_call_cache(selDefault); id_hash = rb_intern("hash");

1 0

[1906] MacRuby/branches/experimental/hash.c
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1906 http://trac.macosforge.org/projects/ruby/changeset/1906 Author: lsansonetti(a)apple.com Date: 2009-06-19 22:29:50 -0700 (Fri, 19 Jun 2009) Log Message: ----------- oops Modified Paths: -------------- MacRuby/branches/experimental/hash.c Modified: MacRuby/branches/experimental/hash.c =================================================================== --- MacRuby/branches/experimental/hash.c 2009-06-20 05:20:37 UTC (rev 1905) +++ MacRuby/branches/experimental/hash.c 2009-06-20 05:29:50 UTC (rev 1906) @@ -475,7 +475,7 @@ if (!CFDictionaryGetValueIfPresent((CFDictionaryRef)hash, (const void *)RB2OC(key), (const void **)&val)) { - return rb_vm_call_with_cache(defaultCache, hash, selDefault, 0, NULL); + return rb_vm_call_with_cache(defaultCache, hash, selDefault, 1, &key); } val = OC2RB(val); return val;

1 0

[1905] MacRuby/branches/experimental
by source_changes＠macosforge.org 20 Jun '09

20 Jun '09

Revision: 1905 http://trac.macosforge.org/projects/ruby/changeset/1905 Author: lsansonetti(a)apple.com Date: 2009-06-19 22:20:37 -0700 (Fri, 19 Jun 2009) Log Message: ----------- introduce a cache to avoid optimizing+JITing the same function twice Modified Paths: -------------- MacRuby/branches/experimental/vm.cpp MacRuby/branches/experimental/vm.h Modified: MacRuby/branches/experimental/vm.cpp =================================================================== --- MacRuby/branches/experimental/vm.cpp 2009-06-20 05:06:56 UTC (rev 1904) +++ MacRuby/branches/experimental/vm.cpp 2009-06-20 05:20:37 UTC (rev 1905) @@ -284,6 +284,11 @@ IMP RoxorVM::compile(Function *func) { + std::map<Function *, IMP>::iterator iter = JITcache.find(func); + if (iter != JITcache.end()) { + return iter->second; + } + #if ROXOR_COMPILER_DEBUG if (verifyModule(*RoxorCompiler::module)) { printf("Error during module verification\n"); @@ -296,6 +301,7 @@ // Optimize & compile. optimize(func); IMP imp = (IMP)ee->getPointerToFunction(func); + JITcache[func] = imp; #if ROXOR_COMPILER_DEBUG uint64_t elapsed = mach_absolute_time() - start; Modified: MacRuby/branches/experimental/vm.h =================================================================== --- MacRuby/branches/experimental/vm.h 2009-06-20 05:06:56 UTC (rev 1904) +++ MacRuby/branches/experimental/vm.h 2009-06-20 05:20:37 UTC (rev 1905) @@ -429,6 +429,7 @@ ExecutionEngine *iee; FunctionPassManager *fpm; bool running; + std::map<Function *, IMP> JITcache; std::map<IMP, rb_vm_method_node_t *> ruby_imps; std::map<SEL, struct mcache *> mcache;

1 0