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

[3421] MacRuby/trunk
by source_changes＠macosforge.org 04 Feb '10

04 Feb '10

Revision: 3421 http://trac.macosforge.org/projects/ruby/changeset/3421 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-03 17:15:46 -0800 (Wed, 03 Feb 2010) Log Message: ----------- Add/pass spec for Dispatch methods Modified Paths: -------------- MacRuby/trunk/lib/dispatch/dispatch.rb MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb Modified: MacRuby/trunk/lib/dispatch/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-03 20:51:32 UTC (rev 3420) +++ MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-04 01:15:46 UTC (rev 3421) @@ -9,12 +9,6 @@ Dispatch::Queue.new("#{label}.%x" % obj.object_id) end - # Run the +&block+ asynchronously on a concurrent queue - # of the given (optional) +priority+ - def async(priority=nil, &block) - Dispatch::Queue.concurrent(priority).async &block - end - # Run the +&block+ synchronously on a concurrent queue # of the given (optional) +priority+ def sync(priority=nil, &block) @@ -22,6 +16,12 @@ end # Run the +&block+ asynchronously on a concurrent queue + # of the given (optional) +priority+ + def async(priority=nil, &block) + Dispatch::Queue.concurrent(priority).async &block + end + + # Run the +&block+ asynchronously on a concurrent queue # of the given (optional) +priority+ as part of the specified +grp+ def group(grp, priority=nil, &block) Dispatch::Queue.concurrent(priority).async(grp) &block @@ -52,5 +52,7 @@ block_given? ? notify(&block) : wait end end + + module_function :queue_for, :async, :sync, :group, :wrap, :fork end \ No newline at end of file Modified: MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb 2010-02-03 20:51:32 UTC (rev 3420) +++ MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb 2010-02-04 01:15:46 UTC (rev 3421) @@ -2,9 +2,38 @@ require 'dispatch' if MACOSX_VERSION >= 10.6 - describe "Dispatch methods" do - it "should do something" do - true.should == true + + $global = 0 + class Actee + def initialize(s); @s = s; end + def current_queue; Dispatch::Queue.current; end + def delay_set(n); sleep 0.01; $global = n; end + def increment(v); v+1; end + def to_s; @s; end + end + + describe "Dispatch method" do + before :each do + @actee = Actee.new("my_actee") end + + describe :sync do + it "should execute the block Synchronously" do + $global = 0 + Dispatch::sync { @actee.delay_set(42) } + $global.should == 42 + end + end + + describe :async do + it "should execute the block Asynchronously" do + $global = 0 + Dispatch::async { @actee.delay_set(42) } + $global.should == 0 + while $global == 0 do; end + $global.should == 42 + end + end + end end \ No newline at end of file

1 0

[3420] MacRuby/trunk
by source_changes＠macosforge.org 03 Feb '10

03 Feb '10

Revision: 3420 http://trac.macosforge.org/projects/ruby/changeset/3420 Author: martinlagardette(a)apple.com Date: 2010-02-03 12:51:32 -0800 (Wed, 03 Feb 2010) Log Message: ----------- - Adds the flip-flop operator (fixes #548) - Added some test_vm for the flip-flop too :-) Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/compiler.h MacRuby/trunk/spec/frozen/language/if_spec.rb MacRuby/trunk/spec/frozen/language/precedence_spec.rb Added Paths: ----------- MacRuby/trunk/test_vm/flip.rb Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-02-03 02:36:08 UTC (rev 3419) +++ MacRuby/trunk/compiler.cpp 2010-02-03 20:51:32 UTC (rev 3420) @@ -146,6 +146,8 @@ setCurrentClassFunc = NULL; getCacheFunc = NULL; debugTrapFunc = NULL; + getFFStateFunc = NULL; + setFFStateFunc = NULL; VoidTy = Type::getVoidTy(context); Int1Ty = Type::getInt1Ty(context); @@ -4518,6 +4520,21 @@ } break; + case NODE_FLIP2: + case NODE_FLIP3: + { + assert(node->nd_beg != NULL); + assert(node->nd_end != NULL); + + if (nd_type(node) == NODE_FLIP2) { + return compile_ff2(node); + } + else { + return compile_ff3(node); + } + } + break; + case NODE_BLOCK: { NODE *n = node; @@ -7299,3 +7316,149 @@ return f; } + +Value * +RoxorCompiler::compile_get_ffstate(GlobalVariable *ffstate) +{ + return new LoadInst(ffstate, "", bb); +} + +Value * +RoxorCompiler::compile_set_ffstate(Value *val, Value *expected, + GlobalVariable *ffstate, BasicBlock *mergeBB, Function *f) +{ + BasicBlock *valEqExpectedBB = BasicBlock::Create(context, + "value_equal_expected", f); + BasicBlock *valNotEqExpectedBB = BasicBlock::Create(context, + "value_not_equal_expected", f); + + Value *valueEqExpectedCond = new ICmpInst(*bb, ICmpInst::ICMP_EQ, val, + expected); + BranchInst::Create(valEqExpectedBB, valNotEqExpectedBB, + valueEqExpectedCond, bb); + + new StoreInst(trueVal, ffstate, valEqExpectedBB); + new StoreInst(falseVal, ffstate, valNotEqExpectedBB); + + BranchInst::Create(mergeBB, valEqExpectedBB); + BranchInst::Create(mergeBB, valNotEqExpectedBB); + + PHINode *pn = PHINode::Create(RubyObjTy, "", mergeBB); + pn->addIncoming(trueVal, valEqExpectedBB); + pn->addIncoming(falseVal, valNotEqExpectedBB); + + return pn; +} + +Value * +RoxorCompiler::compile_ff2(NODE *node) +{ + /* + * if ($state == true || nd_beg == true) + * $state = (nd_end == false) + * return true + * else + * return false + * end + */ + + GlobalVariable *ffstate = new GlobalVariable(*RoxorCompiler::module, + RubyObjTy, false, GlobalValue::InternalLinkage, falseVal, ""); + + Function *f = bb->getParent(); + + BasicBlock *stateNotTrueBB = BasicBlock::Create(context, + "state_not_true", f); + BasicBlock *stateOrBegIsTrueBB = BasicBlock::Create(context, + "state_or_beg_is_true", f); + BasicBlock *returnTrueBB = BasicBlock::Create(context, "return_true", f); + BasicBlock *returnFalseBB = BasicBlock::Create(context, "return_false", f); + BasicBlock *mergeBB = BasicBlock::Create(context, "merge", f); + + // `if $state == true` + Value *stateVal = compile_get_ffstate(ffstate); + Value *stateIsTrueCond = new ICmpInst(*bb, ICmpInst::ICMP_EQ, stateVal, + trueVal); + BranchInst::Create(stateOrBegIsTrueBB, stateNotTrueBB, stateIsTrueCond, + bb); + + // `or if nd_beg == true` + bb = stateNotTrueBB; + Value *beginValue = compile_node(node->nd_beg); + stateNotTrueBB = bb; + Value *begIsTrueCond = new ICmpInst(*bb, ICmpInst::ICMP_EQ, + beginValue, trueVal); + BranchInst::Create(stateOrBegIsTrueBB, returnFalseBB, begIsTrueCond, bb); + + // `$state = (nd_end == false)` + bb = stateOrBegIsTrueBB; + Value *endValue = compile_node(node->nd_end); + stateOrBegIsTrueBB = bb; + compile_set_ffstate(endValue, falseVal, ffstate, returnTrueBB, f); + + BranchInst::Create(mergeBB, returnTrueBB); + BranchInst::Create(mergeBB, returnFalseBB); + + bb = mergeBB; + PHINode *pn = PHINode::Create(RubyObjTy, "", mergeBB); + pn->addIncoming(trueVal, returnTrueBB); + pn->addIncoming(falseVal, returnFalseBB); + + return pn; +} + +Value * +RoxorCompiler::compile_ff3(NODE *node) +{ + /* + * if ($state == true) + * $state = (nd_end == false) + * return true + * else + * $state = (nd_beg == true) + * return $state + * end + */ + + GlobalVariable *ffstate = new GlobalVariable(*RoxorCompiler::module, + RubyObjTy, false, GlobalValue::InternalLinkage, falseVal, ""); + + Function *f = bb->getParent(); + + BasicBlock *stateIsTrueBB = BasicBlock::Create(context, "state_is_true", + f); + BasicBlock *stateIsFalseBB = BasicBlock::Create(context, "state_is_false", + f); + BasicBlock *returnTrueBB = BasicBlock::Create(context, "return_true", f); + BasicBlock *returnStateBB = BasicBlock::Create(context, "return_state", f); + BasicBlock *mergeBB = BasicBlock::Create(context, "merge", f); + + + // `if $state == true` + Value *stateVal = compile_get_ffstate(ffstate); + Value *stateIsTrueCond = new ICmpInst(*bb, ICmpInst::ICMP_EQ, stateVal, + trueVal); + BranchInst::Create(stateIsTrueBB, stateIsFalseBB, stateIsTrueCond, bb); + + // `$state = (nd_end == false)` + bb = stateIsTrueBB; + Value *endValue = compile_node(node->nd_end); + stateIsTrueBB = bb; + compile_set_ffstate(endValue, falseVal, ffstate, returnTrueBB, f); + + // `$state = (nd_beg == true)` + bb = stateIsFalseBB; + Value *beginValue = compile_node(node->nd_beg); + stateIsFalseBB = bb; + stateVal = compile_set_ffstate(beginValue, trueVal, ffstate, returnStateBB, f); + + BranchInst::Create(mergeBB, returnTrueBB); + BranchInst::Create(mergeBB, returnStateBB); + + bb = mergeBB; + PHINode *pn = PHINode::Create(RubyObjTy, "", mergeBB); + pn->addIncoming(trueVal, returnTrueBB); + pn->addIncoming(stateVal, returnStateBB); + + return pn; +} Modified: MacRuby/trunk/compiler.h =================================================================== --- MacRuby/trunk/compiler.h 2010-02-03 02:36:08 UTC (rev 3419) +++ MacRuby/trunk/compiler.h 2010-02-03 20:51:32 UTC (rev 3420) @@ -193,6 +193,9 @@ Function *setCurrentClassFunc; Function *getCacheFunc; Function *debugTrapFunc; + // flip-flop + Function *getFFStateFunc; + Function *setFFStateFunc; Constant *zeroVal; Constant *oneVal; @@ -357,6 +360,11 @@ SEL mid_to_sel(ID mid, int arity); + Value *compile_get_ffstate(GlobalVariable *ffstate); + Value *compile_set_ffstate(Value *val, Value *expected, GlobalVariable *ffstate, BasicBlock *mergeBB, Function *f); + Value *compile_ff2(NODE *current_node); + Value *compile_ff3(NODE *current_node); + void attach_current_line_metadata(Instruction *insn); }; Modified: MacRuby/trunk/spec/frozen/language/if_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/language/if_spec.rb 2010-02-03 02:36:08 UTC (rev 3419) +++ MacRuby/trunk/spec/frozen/language/if_spec.rb 2010-02-03 20:51:32 UTC (rev 3420) @@ -213,37 +213,35 @@ if false then 123; else 456; end.should == 456 end - # MacRuby TODO: causes a compile error - # - # describe "with a boolean range ('flip-flop' operator)" do - # before :each do - # ScratchPad.record [] - # end - # - # after :each do - # ScratchPad.clear - # end - # - # it "mimics an awk conditional with a single-element inclusive-end range" do - # 10.times { |i| ScratchPad << i if (i == 4)..(i == 4) } - # ScratchPad.recorded.should == [4] - # end - # - # it "mimics an awk conditional with a many-element inclusive-end range" do - # 10.times { |i| ScratchPad << i if (i == 4)..(i == 7) } - # ScratchPad.recorded.should == [4, 5, 6, 7] - # end - # - # it "mimics a sed conditional with a zero-element exclusive-end range" do - # 10.times { |i| ScratchPad << i if (i == 4)...(i == 4) } - # ScratchPad.recorded.should == [4, 5, 6, 7, 8, 9] - # end - # - # it "mimics a sed conditional with a many-element exclusive-end range" do - # 10.times { |i| ScratchPad << i if (i == 4)...(i == 5) } - # ScratchPad.recorded.should == [4, 5] - # end - # end + describe "with a boolean range ('flip-flop' operator)" do + before :each do + ScratchPad.record [] + end + + after :each do + ScratchPad.clear + end + + it "mimics an awk conditional with a single-element inclusive-end range" do + 10.times { |i| ScratchPad << i if (i == 4)..(i == 4) } + ScratchPad.recorded.should == [4] + end + + it "mimics an awk conditional with a many-element inclusive-end range" do + 10.times { |i| ScratchPad << i if (i == 4)..(i == 7) } + ScratchPad.recorded.should == [4, 5, 6, 7] + end + + it "mimics a sed conditional with a zero-element exclusive-end range" do + 10.times { |i| ScratchPad << i if (i == 4)...(i == 4) } + ScratchPad.recorded.should == [4, 5, 6, 7, 8, 9] + end + + it "mimics a sed conditional with a many-element exclusive-end range" do + 10.times { |i| ScratchPad << i if (i == 4)...(i == 5) } + ScratchPad.recorded.should == [4, 5] + end + end end describe "The postfix if form" do Modified: MacRuby/trunk/spec/frozen/language/precedence_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/language/precedence_spec.rb 2010-02-03 02:36:08 UTC (rev 3419) +++ MacRuby/trunk/spec/frozen/language/precedence_spec.rb 2010-02-03 20:51:32 UTC (rev 3420) @@ -330,15 +330,10 @@ lambda { eval("1...2...3") }.should raise_error(SyntaxError) end -# XXX: this is commented now due to a bug in compiler, which cannot -# distinguish between range and flip-flop operator so far. zenspider is -# currently working on a new lexer, which will be able to do that. -# As soon as it's done, these piece should be reenabled. -# -# it ".. ... have higher precedence than ? :" do -# (1..2 ? 3 : 4).should == 3 -# (1...2 ? 3 : 4).should == 3 -# end + it ".. ... have higher precedence than ? :" do + (1..2 ? 3 : 4).should == 3 + (1...2 ? 3 : 4).should == 3 + end it "? : is right-associative" do (true ? 2 : 3 ? 4 : 5).should == 2 Added: MacRuby/trunk/test_vm/flip.rb =================================================================== --- MacRuby/trunk/test_vm/flip.rb (rev 0) +++ MacRuby/trunk/test_vm/flip.rb 2010-02-03 20:51:32 UTC (rev 3420) @@ -0,0 +1,107 @@ +# flip-flop 2 should preserve its state accross different calls to the block it is in +# Test from Tomáš Matoušek of IronRuby +assert "0", %{ + def y *a; yield *a; end + $a = 0 + def test + $p = proc do |b, e| + if b..e + $a += 1 + else + $a -= 1 + end + end + + y false, &$p + y true, true, &$p + y false, &$p + y true, false, &$p + end + test + p $a +} + +# flip-flop 3 should preserve its state accross different calls to the block it is in +# Test from Tomáš Matoušek of IronRuby +assert "2", %{ + def y *a; yield *a; end + $a = 0 + def test + $p = proc do |b, e| + if b...e + $a += 1 + else + $a -= 1 + end + end + + y false, &$p + y true, true, &$p + y false, &$p + y true, false, &$p + end + test + p $a +} + +# General flip-flop test: +# Not only does it test the general use of a flip-flop operator, +# it also tests the `begin` and `end` block are only evaluated if needed +# Test from Tomáš Matoušek of IronRuby +assert "bfbetetetbetbfbfbf", %{ + F = false + T = true + x = X = '!' + B = [F,T,x,x,x,T,x,F,F] + E = [x,x,F,F,T,x,T,x,x] + + def b; step('b',B); end + def e; step('e',E); end + + def step name, value + r = value[$j] + putc name + $j += 1 + $continue = !r.nil? + r == X ? raise : r + end + + $j = 0 + $continue = true + while $continue + putc (b..e ? 't' : 'f') + end +} + +# Recursive flip-flop test +assert "dadbaddb", %{ + def y *a; yield *a; end + def test + $p = proc { |b, e| + if b..e + if e..b + putc 'a' + else + putc 'b' + end + else + if e..b + putc 'c' + else + putc 'd' + end + end + } + + y false, &$p + y true, true, &$p + y false, &$p + y true, false, &$p + y true, true, &$p + y false, &$p + y false, &$p + y true, false, &$p + puts + end + test +}

1 0

[3419] MacRuby/trunk/gc.c
by source_changes＠macosforge.org 03 Feb '10

03 Feb '10

Revision: 3419 http://trac.macosforge.org/projects/ruby/changeset/3419 Author: lsansonetti(a)apple.com Date: 2010-02-02 18:36:08 -0800 (Tue, 02 Feb 2010) Log Message: ----------- GC.count: deleted implementation, marked as not-implemented Modified Paths: -------------- MacRuby/trunk/gc.c Modified: MacRuby/trunk/gc.c =================================================================== --- MacRuby/trunk/gc.c 2010-02-03 02:29:13 UTC (rev 3418) +++ MacRuby/trunk/gc.c 2010-02-03 02:36:08 UTC (rev 3419) @@ -1015,13 +1015,7 @@ * */ -static VALUE -gc_count(VALUE self) -{ - auto_statistics_t stats; - auto_zone_statistics(__auto_zone, &stats); - return UINT2NUM(stats.num_collections[0] + stats.num_collections[1]); -} +#define gc_count rb_f_notimplement /* * The <code>GC</code> module provides an interface to Ruby's mark and

1 0

[3418] MacRuby/trunk/rakelib/upstream_git_repo_tasks.rb
by source_changes＠macosforge.org 03 Feb '10

03 Feb '10

Revision: 3418 http://trac.macosforge.org/projects/ruby/changeset/3418 Author: lsansonetti(a)apple.com Date: 2010-02-02 18:29:13 -0800 (Tue, 02 Feb 2010) Log Message: ----------- do not try to access spec/frozen/upstream in case we build with buildit Modified Paths: -------------- MacRuby/trunk/rakelib/upstream_git_repo_tasks.rb Modified: MacRuby/trunk/rakelib/upstream_git_repo_tasks.rb =================================================================== --- MacRuby/trunk/rakelib/upstream_git_repo_tasks.rb 2010-02-03 02:16:45 UTC (rev 3417) +++ MacRuby/trunk/rakelib/upstream_git_repo_tasks.rb 2010-02-03 02:29:13 UTC (rev 3418) @@ -18,7 +18,8 @@ end def upstream_rev - @upstream_rev ||= ENV['REV'] || File.read(upstream_rev_file) + # The buildit build does not contain the spec/frozen/upstream file. + @upstream_rev ||= ENV['REV'] || (ENV['RC_BUILDIT'] ? '0' : File.read(upstream_rev_file)) end def define @@ -150,4 +151,4 @@ end end -end \ No newline at end of file +end

1 0

[3417] MacRuby/trunk/gc.c
by source_changes＠macosforge.org 03 Feb '10

03 Feb '10

Revision: 3417 http://trac.macosforge.org/projects/ruby/changeset/3417 Author: lsansonetti(a)apple.com Date: 2010-02-02 18:16:45 -0800 (Tue, 02 Feb 2010) Log Message: ----------- system auto_zone.h is now includeable Modified Paths: -------------- MacRuby/trunk/gc.c Modified: MacRuby/trunk/gc.c =================================================================== --- MacRuby/trunk/gc.c 2010-02-02 23:38:47 UTC (rev 3416) +++ MacRuby/trunk/gc.c 2010-02-03 02:16:45 UTC (rev 3417) @@ -9,7 +9,7 @@ * Copyright (C) 2000 Information-technology Promotion Agency, Japan */ -//#include "ruby/config.h" +#include "ruby/config.h" #if HAVE_AUTO_ZONE_H # include <auto_zone.h>

1 0

[3416] MacRuby/trunk/process.c
by source_changes＠macosforge.org 02 Feb '10

02 Feb '10

Revision: 3416 http://trac.macosforge.org/projects/ruby/changeset/3416 Author: pthomson(a)apple.com Date: 2010-02-02 15:38:47 -0800 (Tue, 02 Feb 2010) Log Message: ----------- Put an rb_notimplement() in check_exec_redirect_fd instead of just abort()ing. Modified Paths: -------------- MacRuby/trunk/process.c Modified: MacRuby/trunk/process.c =================================================================== --- MacRuby/trunk/process.c 2010-02-02 23:08:20 UTC (rev 3415) +++ MacRuby/trunk/process.c 2010-02-02 23:38:47 UTC (rev 3416) @@ -1268,7 +1268,7 @@ } return INT2FIX(fd); #endif - abort(); + rb_notimplement(); } static void

1 0

[3415] MacRuby/trunk
by source_changes＠macosforge.org 02 Feb '10

02 Feb '10

Revision: 3415 http://trac.macosforge.org/projects/ruby/changeset/3415 Author: lsansonetti(a)apple.com Date: 2010-02-02 15:08:20 -0800 (Tue, 02 Feb 2010) Log Message: ----------- fix bleeding edge build Modified Paths: -------------- MacRuby/trunk/array.c MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2010-02-02 23:07:59 UTC (rev 3414) +++ MacRuby/trunk/array.c 2010-02-02 23:08:20 UTC (rev 3415) @@ -276,9 +276,12 @@ } else { mask = rb_objc_flag_get_mask((void *)ary); +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 + // XXX we shouldn't need to do that and follow the new hash refactoring if (!_CFArrayIsMutable((void *)ary)) { mask |= FL_FREEZE; } +#endif } if ((mask & FL_FREEZE) == FL_FREEZE) { rb_raise(rb_eRuntimeError, "can't modify frozen/immutable array"); Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-02-02 23:07:59 UTC (rev 3414) +++ MacRuby/trunk/vm.cpp 2010-02-02 23:08:20 UTC (rev 3415) @@ -174,6 +174,17 @@ return mm->getGOTBase(); } +#if LLVM_TOT + void SetDlsymTable(void *ptr) { + mm->SetDlsymTable(ptr); + } + + void *getDlsymTable() const { + return mm->getDlsymTable(); + } +#endif + + uint8_t *startFunctionBody(const Function *F, uintptr_t &ActualSize) { return mm->startFunctionBody(F, ActualSize);

1 0

[3414] MacRuby/trunk/rakelib/builder/options.rb
by source_changes＠macosforge.org 02 Feb '10

02 Feb '10

Revision: 3414 http://trac.macosforge.org/projects/ruby/changeset/3414 Author: lsansonetti(a)apple.com Date: 2010-02-02 15:07:59 -0800 (Tue, 02 Feb 2010) Log Message: ----------- make life easier for bleeding edge people Modified Paths: -------------- MacRuby/trunk/rakelib/builder/options.rb Modified: MacRuby/trunk/rakelib/builder/options.rb =================================================================== --- MacRuby/trunk/rakelib/builder/options.rb 2010-02-02 20:58:45 UTC (rev 3413) +++ MacRuby/trunk/rakelib/builder/options.rb 2010-02-02 23:07:59 UTC (rev 3414) @@ -22,15 +22,22 @@ ARCHS = if s = ENV['RC_ARCHS'] - $stderr.puts "getting archs from RC_ARCHS!" + $stderr.puts "Getting archs from RC_ARCHS!" s.strip.split(/\s+/) else b.option('archs', `arch`.include?('ppc') ? 'ppc' : %w{i386 x86_64}) { |x| x.split(',') } end +llvm_default_path = '/usr/local' +if `sw_vers -productVersion`.strip.to_f >= 10.7 and File.exist?('/AppleInternal') + $stderr.puts "Welcome bleeding-edge adventurer!" + llvm_default_path = '/Developer/usr/local' + ENV['LLVM_TOT'] = '1' +end + RUBY_INSTALL_NAME = b.option('ruby_install_name', 'macruby') RUBY_SO_NAME = b.option('ruby_so_name', RUBY_INSTALL_NAME) -LLVM_PATH = b.option('llvm_path', '/usr/local') +LLVM_PATH = b.option('llvm_path', llvm_default_path) FRAMEWORK_NAME = b.option('framework_name', 'MacRuby') FRAMEWORK_INSTDIR = b.option('framework_instdir', '/Library/Frameworks') SYM_INSTDIR = b.option('sym_instdir', '/usr/local')

1 0

[3413] MacRuby/trunk
by source_changes＠macosforge.org 02 Feb '10

02 Feb '10

Revision: 3413 http://trac.macosforge.org/projects/ruby/changeset/3413 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-02 12:58:45 -0800 (Tue, 02 Feb 2010) Log Message: ----------- Completed Dispatch::Actor spec, removed debug messages Modified Paths: -------------- MacRuby/trunk/lib/dispatch/actor.rb MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb Modified: MacRuby/trunk/lib/dispatch/actor.rb =================================================================== --- MacRuby/trunk/lib/dispatch/actor.rb 2010-02-02 20:58:43 UTC (rev 3412) +++ MacRuby/trunk/lib/dispatch/actor.rb 2010-02-02 20:58:45 UTC (rev 3413) @@ -1,13 +1,12 @@ require 'delegate' module Dispatch - # Create an Actor that serializes or asynchronizes access to a delegate. + # Serialize or asynchronize access to a delegate object. # Forwards method invocations to the passed object via a private serial queue, # and optionally calls back asynchronously (if given a block or group). # # Note that this will NOT work for methods that themselves expect a block. # For those, use e.g., the Enumerable p_* methods insteads. - # class Actor < SimpleDelegator # Create an Actor to wrap the given +delegate+, @@ -19,40 +18,42 @@ end # Specify the +callback+ queue for async requests + # => self to allow chaining def _on_(callback) @callback = callback self end - # Specify the +group+ for async requests + # Specify the +group+ for both private async requests def _with_(group) @group = group self + # => self to allow chaining end - # Wait until the internal private queue has completed execution - # then returns the +delegate+ object + # Wait until the internal private queue has completed pending executions + # then return the +delegate+ object def _done_ @q.sync { } __getobj__ end - + + # Calls the +delegate+ object asychronously if there is a block or group, + # else synchronously def method_missing(symbol, *args, &block) if block_given? or not @group.nil? - #puts "\nAsync #{symbol.inspect}" callback = @callback @q.async(@group) do retval = __getobj__.__send__(symbol, *args) - callback.async { block.call(retval) } if not callback.nil? + callback.async { block.call(retval) } if not block.nil? end return nil else - #puts "\nSync #{symbol.inspect}" if symbol != :__ @retval = nil @q.sync { @retval = __getobj__.__send__(symbol, *args) } return @retval end end - + end end Modified: MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-02 20:58:43 UTC (rev 3412) +++ MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-02 20:58:45 UTC (rev 3413) @@ -39,9 +39,7 @@ it "should call actee Synchronously if block is NOT given" do $global = 0 - t0 = Time.now @actor.delay_set(42) - t1 = Time.now $global.should == 42 end @@ -49,6 +47,14 @@ @actor.increment(41).should == 42 end + it "should call actee Asynchronously if block IS given" do + $global = 0 + @actor.delay_set(42) { } + $global.should == 0 + while $global == 0 do; end + $global.should == 42 + end + it "should return nil when called Asynchronously" do @v = 0 v = @actor.increment(41) {|rv| @v = rv} @@ -62,15 +68,6 @@ @v.should == 42 end - it "should call actee Asynchronously if block IS given" do - $global = 0 - $global.should == 0 - @actor.delay_set(42) { } - $global.should == 0 - while $global == 0 do; end - $global.should == 42 - end - it "should use default callback queue when called Asynchronously" do @qs = "" @actor.increment(41) {|rv| @qs = Dispatch::Queue.current.to_s} @@ -87,16 +84,30 @@ @qs.should == qn.label end - it "should use callback queue specified by _on" do - true.should == true + it "should use callback queue specified by _on_" do + qn = Dispatch::Queue.new("custom") + @qs = "" + @actor._on_(qn).increment(41) {|rv| @qs = Dispatch::Queue.current.to_s} + while @qs == "" do; end + @qs.should == qn.label end - it "should invoke actee async with group specified by _with" do - true.should == true + it "should invoke actee async when group specified by _with_" do + $global = 0 + g = Dispatch::Group.new + @actor._with_(g).delay_set(42) + $global.should == 0 + g.wait + $global.should == 42 end - it "should return actee when called with _done" do - true.should == true + it "should complete work and return actee when called with _done" do + $global = 0 + @actor.delay_set(42) { } + $global.should == 0 + actee = @actor._done_ + $global.should == 42 + actee.should == @actee end end

1 0

[3412] MacRuby/trunk
by source_changes＠macosforge.org 02 Feb '10

02 Feb '10

Revision: 3412 http://trac.macosforge.org/projects/ruby/changeset/3412 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-02 12:58:43 -0800 (Tue, 02 Feb 2010) Log Message: ----------- Make Dispatch::Actor set persistent queue/group Modified Paths: -------------- MacRuby/trunk/lib/dispatch/actor.rb MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb Modified: MacRuby/trunk/lib/dispatch/actor.rb =================================================================== --- MacRuby/trunk/lib/dispatch/actor.rb 2010-02-02 15:26:50 UTC (rev 3411) +++ MacRuby/trunk/lib/dispatch/actor.rb 2010-02-02 20:58:43 UTC (rev 3412) @@ -14,19 +14,20 @@ # optionally specifying the default +callback+ queue def initialize(delegate, callback=nil) super(delegate) - @default_callback = callback || Dispatch::Queue.concurrent - @callback = @default_callback + @callback = callback || Dispatch::Queue.concurrent @q = Dispatch::Queue.new("dispatch.actor.#{delegate}.#{object_id}") end - # Specify the +callback+ queue for the next async request + # Specify the +callback+ queue for async requests def _on_(callback) @callback = callback + self end - # Specify the +group+ for the next async request + # Specify the +group+ for async requests def _with_(group) @group = group + self end # Wait until the internal private queue has completed execution @@ -44,8 +45,6 @@ retval = __getobj__.__send__(symbol, *args) callback.async { block.call(retval) } if not callback.nil? end - @callback = @default_callback if not @callback == @default_callback - @group = nil if not @group.nil? return nil else #puts "\nSync #{symbol.inspect}" if symbol != :__ Modified: MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-02 15:26:50 UTC (rev 3411) +++ MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-02 20:58:43 UTC (rev 3412) @@ -78,7 +78,7 @@ @qs.should =~ /com.apple.root.default/ end - it "should use initial callback queue if any, when called Asynchronously" do + it "should use specified callback queue when called Asynchronously" do qn = Dispatch::Queue.new("custom") @actor2 = Dispatch::Actor.new(@actee, qn) @qs = "" @@ -87,25 +87,17 @@ @qs.should == qn.label end - it "should use callback queue specified by _on, but only once" do + it "should use callback queue specified by _on" do true.should == true end - it "should invoke actee once with group specified by _with" do + it "should invoke actee async with group specified by _with" do true.should == true end - it "should invoke actee Asynchronously when group specified by _with" do - true.should == true - end - it "should return actee when called with _done" do true.should == true end - - it "should return an actor for Dispatch.wrap" do - true.should == true - end - end + end \ No newline at end of file

1 0