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

[3411] MacRuby/trunk/test_vm/hash.rb
by source_changes＠macosforge.org 02 Feb '10

02 Feb '10

Revision: 3411 http://trac.macosforge.org/projects/ruby/changeset/3411 Author: eloy.de.enige(a)gmail.com Date: 2010-02-02 07:26:50 -0800 (Tue, 02 Feb 2010) Log Message: ----------- Add test_vm test which shows that including a module into Hash causes breakage. Modified Paths: -------------- MacRuby/trunk/test_vm/hash.rb Modified: MacRuby/trunk/test_vm/hash.rb =================================================================== --- MacRuby/trunk/test_vm/hash.rb 2010-02-02 05:31:53 UTC (rev 3410) +++ MacRuby/trunk/test_vm/hash.rb 2010-02-02 15:26:50 UTC (rev 3411) @@ -1 +1,8 @@ -assert "lettuce\nbacon", '{:main_ingredient => "lettuce", :total => "bacon"}.each { |_,v| puts v }' \ No newline at end of file +assert "lettuce\nbacon", '{:main_ingredient => "lettuce", :total => "bacon"}.each { |_,v| puts v }' + +assert "42", %{ + module H; end + class Hash; include H; end + d = NSDictionary.dictionaryWithDictionary('answer' => 42) + p d['answer'] +} \ No newline at end of file

1 0

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

02 Feb '10

Revision: 3410 http://trac.macosforge.org/projects/ruby/changeset/3410 Author: lsansonetti(a)apple.com Date: 2010-02-01 21:31:53 -0800 (Mon, 01 Feb 2010) Log Message: ----------- let's attach more metadata Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/compiler.h Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-02-02 04:08:33 UTC (rev 3409) +++ MacRuby/trunk/compiler.cpp 2010-02-02 05:31:53 UTC (rev 3410) @@ -739,6 +739,16 @@ params.end(), "", bb); } +void +RoxorCompiler::attach_current_line_metadata(Instruction *insn) +{ + if (fname != NULL) { + DILocation loc = debug_info->CreateLocation(current_line, 0, + debug_compile_unit, DILocation(NULL)); + context.getMetadata().addMD(dbg_mdkind, loc.getNode(), insn); + } +} + Value * RoxorCompiler::compile_dispatch_call(std::vector<Value *> &params) { @@ -759,11 +769,7 @@ } Instruction *insn = compile_protected_call(dispatcherFunc, params); - if (fname != NULL) { - DILocation loc = debug_info->CreateLocation(current_line, 0, - debug_compile_unit, DILocation(NULL)); - context.getMetadata().addMD(dbg_mdkind, loc.getNode(), insn); - } + attach_current_line_metadata(insn); return insn; } @@ -3962,7 +3968,10 @@ (flags & DEFINE_OUTER) && dynamic_class ? 1 : 0)); - classVal = compile_protected_call(defineClassFunc, params); + Instruction *insn + = compile_protected_call(defineClassFunc, params); + attach_current_line_metadata(insn); + classVal = insn; } NODE *body = node->nd_body; @@ -4009,7 +4018,9 @@ std::vector<Value *> params; params.push_back(classVal); params.push_back(compile_const_pointer(NULL)); - val = compile_protected_call(f, params); + Instruction *insn = compile_protected_call(f, params); + attach_current_line_metadata(insn); + val = insn; dynamic_class = old_dynamic_class; compile_set_current_scope(classVal, defaultScope); Modified: MacRuby/trunk/compiler.h =================================================================== --- MacRuby/trunk/compiler.h 2010-02-02 04:08:33 UTC (rev 3409) +++ MacRuby/trunk/compiler.h 2010-02-02 05:31:53 UTC (rev 3410) @@ -356,6 +356,8 @@ void compile_keep_vars(BasicBlock *startBB, BasicBlock *mergeBB); SEL mid_to_sel(ID mid, int arity); + + void attach_current_line_metadata(Instruction *insn); }; #define context (RoxorCompiler::module->getContext())

1 0

[3409] MacRubyWebsite/trunk/lib/team.rb
by source_changes＠macosforge.org 02 Feb '10

02 Feb '10

Revision: 3409 http://trac.macosforge.org/projects/ruby/changeset/3409 Author: lsansonetti(a)apple.com Date: 2010-02-01 20:08:33 -0800 (Mon, 01 Feb 2010) Log Message: ----------- added claudio Modified Paths: -------------- MacRubyWebsite/trunk/lib/team.rb Modified: MacRubyWebsite/trunk/lib/team.rb =================================================================== --- MacRubyWebsite/trunk/lib/team.rb 2010-02-02 03:23:01 UTC (rev 3408) +++ MacRubyWebsite/trunk/lib/team.rb 2010-02-02 04:08:33 UTC (rev 3409) @@ -16,11 +16,12 @@ Member.new("rich", "Rich Kilmer", "InfoEther, Inc.", "http://www.infoether.com", "rich(a)infoether.com"), Member.new("ben", "Ben Stiglitz", "Apple, Inc.", nil, "stig(a)apple.com"), Member.new("patrick", "Patrick Thomson", "Apple, Inc.", nil, "pthomson(a)apple.com"), - Member.new("eloy", "Eloy Duran", nil, nil, "eloy.de.enige(a)gmail.com"), + Member.new("eloy", "Eloy Duran", nil, "http://superalloy.nl/", "eloy.de.enige(a)gmail.com"), Member.new("vincent", "Vincent Isambart"), Member.new("matt", "Matt Aimonetti", "m|a agile consulting", "http://merbist.com", "mattaimonetti(a)gmail.com"), Member.new("ernie", "Ernest N. Prabhakar", "Apple, Inc", nil, "prabhaka(a)apple.com"), - Member.new("thibault", "Thibault Martin-Lagardette", "Apple, Inc", nil, "martinlagardette(a)apple.com") + Member.new("thibault", "Thibault Martin-Lagardette", "Apple, Inc", nil, "martinlagardette(a)apple.com"), + Member.new("claudio", "Claudio Poli", nil, "http://www.icoretech.org/", "claudio(a)icoretech.org") ] end

1 0

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

02 Feb '10

Revision: 3408 http://trac.macosforge.org/projects/ruby/changeset/3408 Author: lsansonetti(a)apple.com Date: 2010-02-01 19:23:01 -0800 (Mon, 01 Feb 2010) Log Message: ----------- we now require LLVM revision 89156, everyone to your compiler stations! Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/89156 Modified Paths: -------------- MacRuby/trunk/README.rdoc MacRuby/trunk/compiler.cpp MacRuby/trunk/compiler.h MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/README.rdoc =================================================================== --- MacRuby/trunk/README.rdoc 2010-02-02 02:49:43 UTC (rev 3407) +++ MacRuby/trunk/README.rdoc 2010-02-02 03:23:01 UTC (rev 3408) @@ -24,9 +24,9 @@ * LLVM ToT, compiled for both i386 and x86_64. LLVM is a moving target and breaks periodically. We recommend to install - revision 82747. + revision 89156. - $ svn co -r 82747 https://llvm.org/svn/llvm-project/llvm/trunk llvm-trunk + $ svn co -r 89156 https://llvm.org/svn/llvm-project/llvm/trunk llvm-trunk $ cd llvm-trunk $ ./configure --enable-bindings=none $ UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-02-02 02:49:43 UTC (rev 3407) +++ MacRuby/trunk/compiler.cpp 2010-02-02 03:23:01 UTC (rev 3408) @@ -12,9 +12,7 @@ # define DW_LANG_Ruby 0x15 // TODO: Python is 0x14, request a real number #endif -#if LLVM_TOT -# include <llvm/LLVMContext.h> -#endif +#include <llvm/LLVMContext.h> #include "llvm.h" #include "ruby/ruby.h" @@ -187,13 +185,11 @@ level = 0; #endif -#if LLVM_TOT dbg_mdkind = context.getMetadata().getMDKind("dbg"); if (dbg_mdkind == 0) { dbg_mdkind = context.getMetadata().registerMDKind("dbg"); } assert(dbg_mdkind != 0); -#endif } RoxorAOTCompiler::RoxorAOTCompiler(void) @@ -764,13 +760,9 @@ Instruction *insn = compile_protected_call(dispatcherFunc, params); if (fname != NULL) { -#if LLVM_TOT DILocation loc = debug_info->CreateLocation(current_line, 0, debug_compile_unit, DILocation(NULL)); context.getMetadata().addMD(dbg_mdkind, loc.getNode(), insn); -#else - debug_info->InsertStopPoint(debug_compile_unit, current_line, 0, bb); -#endif } return insn; } @@ -1148,11 +1140,7 @@ Instruction *slot_insn = dyn_cast<Instruction>(slot); if (slot_insn != NULL) { -#if LLVM_TOT Instruction *insn = slot_insn->clone(); -#else - Instruction *insn = slot_insn->clone(context); -#endif BasicBlock::InstListType &list = bb->getInstList(); list.insert(list.end(), insn); return insn; @@ -1886,18 +1874,8 @@ Intrinsic::eh_exception); Value *eh_ptr = CallInst::Create(eh_exception_f, "", bb); -#if LLVM_TOT Function *eh_selector_f = Intrinsic::getDeclaration(module, Intrinsic::eh_selector); -#else -# if __LP64__ - Function *eh_selector_f = Intrinsic::getDeclaration(module, - Intrinsic::eh_selector_i64); -# else - Function *eh_selector_f = Intrinsic::getDeclaration(module, - Intrinsic::eh_selector_i32); -# endif -#endif std::vector<Value *> params; params.push_back(eh_ptr); @@ -1924,18 +1902,8 @@ if (eh_type != typeid(void)) { // TODO: this doesn't work yet, the type id must be a GlobalVariable... -#if LLVM_TOT Function *eh_typeid_for_f = Intrinsic::getDeclaration(module, Intrinsic::eh_typeid_for); -#else -# if __LP64__ - Function *eh_typeid_for_f = Intrinsic::getDeclaration(module, - Intrinsic::eh_typeid_for_i64); -# else - Function *eh_typeid_for_f = Intrinsic::getDeclaration(module, - Intrinsic::eh_typeid_for_i32); -# endif -#endif std::vector<Value *> params; params.push_back(compile_const_pointer((void *)&eh_type)); @@ -2994,11 +2962,7 @@ Instruction *slot_insn = dyn_cast<Instruction>(ivar_slot); if (slot_insn != NULL) { -#if LLVM_TOT Instruction *insn = slot_insn->clone(); -#else - Instruction *insn = slot_insn->clone(context); -#endif list.insert(list_iter, insn); params.push_back(insn); } Modified: MacRuby/trunk/compiler.h =================================================================== --- MacRuby/trunk/compiler.h 2010-02-02 02:49:43 UTC (rev 3407) +++ MacRuby/trunk/compiler.h 2010-02-02 03:23:01 UTC (rev 3408) @@ -222,9 +222,7 @@ const Type *IntTy; const PointerType *Int32PtrTy; -#if LLVM_TOT unsigned dbg_mdkind; -#endif void compile_node_error(const char *msg, NODE *node); Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-02-02 02:49:43 UTC (rev 3407) +++ MacRuby/trunk/vm.cpp 2010-02-02 03:23:01 UTC (rev 3408) @@ -33,9 +33,7 @@ #include <llvm/Support/PrettyStackTrace.h> // Including PST to disable it #include <llvm/Intrinsics.h> #include <llvm/Bitcode/ReaderWriter.h> -#if LLVM_TOT -# include <llvm/LLVMContext.h> -#endif +#include <llvm/LLVMContext.h> using namespace llvm; #if ROXOR_COMPILER_DEBUG @@ -176,17 +174,6 @@ return mm->getGOTBase(); } -#if LLVM_TOT -#else - 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); @@ -206,7 +193,6 @@ FunctionEnd)); } -#if LLVM_TOT void deallocateFunctionBody(void *data) { mm->deallocateFunctionBody(data); } @@ -214,11 +200,6 @@ void deallocateExceptionTable(void *data) { mm->deallocateExceptionTable(data); } -#else - void deallocateMemForFunction(const Function *F) { - mm->deallocateMemForFunction(F); - } -#endif uint8_t* startExceptionTable(const Function* F, uintptr_t &ActualSize) { @@ -247,20 +228,10 @@ for (std::vector<EmittedFunctionDetails::LineStart>::const_iterator iter = Details.LineStarts.begin(); iter != Details.LineStarts.end(); ++iter) { DebugLocTuple dlt = Details.MF->getDebugLocTuple(iter->Loc); if (path.size() == 0) { -#if LLVM_TOT DICompileUnit unit(dlt.Scope); path.append(unit.getDirectory()); path.append("/"); path.append(unit.getFilename()); -#else - DICompileUnit unit(dlt.CompileUnit); - std::string dir, file; - unit.getDirectory(dir); - unit.getFilename(file); - path.append(dir); - path.append("/"); - path.append(file); -#endif } RoxorFunction::Line line(iter->Address, dlt.Line);

1 0

[3407] MacRuby/trunk/lib/dispatch/actor.rb
by source_changes＠macosforge.org 02 Feb '10

02 Feb '10

Revision: 3407 http://trac.macosforge.org/projects/ruby/changeset/3407 Author: lsansonetti(a)apple.com Date: 2010-02-01 18:49:43 -0800 (Mon, 01 Feb 2010) Log Message: ----------- no puts please Modified Paths: -------------- MacRuby/trunk/lib/dispatch/actor.rb Modified: MacRuby/trunk/lib/dispatch/actor.rb =================================================================== --- MacRuby/trunk/lib/dispatch/actor.rb 2010-02-02 01:39:11 UTC (rev 3406) +++ MacRuby/trunk/lib/dispatch/actor.rb 2010-02-02 02:49:43 UTC (rev 3407) @@ -38,7 +38,7 @@ def method_missing(symbol, *args, &block) if block_given? or not @group.nil? - puts "\nAsync #{symbol.inspect}" + #puts "\nAsync #{symbol.inspect}" callback = @callback @q.async(@group) do retval = __getobj__.__send__(symbol, *args) @@ -48,7 +48,7 @@ @group = nil if not @group.nil? return nil else - puts "\nSync #{symbol.inspect}" if symbol != :__ + #puts "\nSync #{symbol.inspect}" if symbol != :__ @retval = nil @q.sync { @retval = __getobj__.__send__(symbol, *args) } return @retval

1 0

[3406] MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb
by source_changes＠macosforge.org 02 Feb '10

02 Feb '10

Revision: 3406 http://trac.macosforge.org/projects/ruby/changeset/3406 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-01 17:39:11 -0800 (Mon, 01 Feb 2010) Log Message: ----------- Resolved actor spec conflicts Modified Paths: -------------- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb Modified: MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-02 01:35:49 UTC (rev 3405) +++ MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-02 01:39:11 UTC (rev 3406) @@ -42,7 +42,6 @@ t0 = Time.now @actor.delay_set(42) t1 = Time.now - puts "Elapsed: #{(t1-t0)}" $global.should == 42 end @@ -72,10 +71,22 @@ $global.should == 42 end - it "should used default callback queue when called Asynchronously" do - true.should == true + it "should use default callback queue when called Asynchronously" do + @qs = "" + @actor.increment(41) {|rv| @qs = Dispatch::Queue.current.to_s} + while @qs == "" do; end + @qs.should =~ /com.apple.root.default/ end + it "should use initial callback queue if any, when called Asynchronously" do + qn = Dispatch::Queue.new("custom") + @actor2 = Dispatch::Actor.new(@actee, qn) + @qs = "" + @actor2.increment(41) {|rv| @qs = Dispatch::Queue.current.to_s} + while @qs == "" do; end + @qs.should == qn.label + end + it "should use callback queue specified by _on, but only once" do true.should == true end

1 0

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

02 Feb '10

Revision: 3405 http://trac.macosforge.org/projects/ruby/changeset/3405 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-01 17:35:49 -0800 (Mon, 01 Feb 2010) Log Message: ----------- Tested asynchronous execution via 'sleep' Modified Paths: -------------- MacRuby/trunk/lib/dispatch/actor.rb MacRuby/trunk/spec/macruby/core/gcd/queue_spec.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 01:35:46 UTC (rev 3404) +++ MacRuby/trunk/lib/dispatch/actor.rb 2010-02-02 01:35:49 UTC (rev 3405) @@ -15,15 +15,10 @@ def initialize(delegate, callback=nil) super(delegate) @default_callback = callback || Dispatch::Queue.concurrent + @callback = @default_callback @q = Dispatch::Queue.new("dispatch.actor.#{delegate}.#{object_id}") - __reset!__ end - - def __reset!__ - @callback = @default_callback - @group = nil - end - + # Specify the +callback+ queue for the next async request def _on_(callback) @callback = callback @@ -43,13 +38,17 @@ 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? end - return __reset!__ + @callback = @default_callback if not @callback == @default_callback + @group = nil if not @group.nil? + return nil else + puts "\nSync #{symbol.inspect}" if symbol != :__ @retval = nil @q.sync { @retval = __getobj__.__send__(symbol, *args) } return @retval Modified: MacRuby/trunk/spec/macruby/core/gcd/queue_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/queue_spec.rb 2010-02-02 01:35:46 UTC (rev 3404) +++ MacRuby/trunk/spec/macruby/core/gcd/queue_spec.rb 2010-02-02 01:35:49 UTC (rev 3405) @@ -78,7 +78,8 @@ describe :async do it "accepts a block and yields it asynchronously" do @i = 0 - @q.async { @i = 42 } + @q.async { sleep 0.01; @i = 42 } + @i.should == 0 while @i == 0 do; end @i.should == 42 end @@ -92,7 +93,7 @@ describe :sync do it "accepts a block and yields it synchronously" do @i = 0 - @q.sync { @i = 42 } + @q.sync { sleep 0.01; @i = 42 } @i.should == 42 end Modified: MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-02 01:35:46 UTC (rev 3404) +++ MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-02 01:35:49 UTC (rev 3405) @@ -3,10 +3,12 @@ if MACOSX_VERSION >= 10.6 + $global = 0 class Actee def initialize(s); @s = s; end def current_queue; Dispatch::Queue.current; end - def wait(n); sleep n; end + def delay_set(n); sleep 0.01; $global = n; end + def increment(v); v+1; end def to_s; @s; end end @@ -36,14 +38,41 @@ end it "should call actee Synchronously if block is NOT given" do - true.should == true + $global = 0 + t0 = Time.now + @actor.delay_set(42) + t1 = Time.now + puts "Elapsed: #{(t1-t0)}" + $global.should == 42 end + it "should return value when called Synchronously" do + @actor.increment(41).should == 42 + end + + it "should return nil when called Asynchronously" do + @v = 0 + v = @actor.increment(41) {|rv| @v = rv} + v.should.nil? + end + + it "should provide return value to block when called Asynchronously" do + @v = 0 + @actor.increment(41) {|rv| @v = rv} + while @v == 0 do; end + @v.should == 42 + end + it "should call actee Asynchronously if block IS given" do - true.should == true + $global = 0 + $global.should == 0 + @actor.delay_set(42) { } + $global.should == 0 + while $global == 0 do; end + $global.should == 42 end - it "should used default callback when called Asynchronously" do + it "should used default callback queue when called Asynchronously" do true.should == true end

1 0

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

02 Feb '10

Revision: 3404 http://trac.macosforge.org/projects/ruby/changeset/3404 Author: lsansonetti(a)apple.com Date: 2010-02-01 17:35:46 -0800 (Mon, 01 Feb 2010) Log Message: ----------- follow LLVM ToT Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/compiler.h MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-02-02 01:35:45 UTC (rev 3403) +++ MacRuby/trunk/compiler.cpp 2010-02-02 01:35:46 UTC (rev 3404) @@ -12,6 +12,10 @@ # define DW_LANG_Ruby 0x15 // TODO: Python is 0x14, request a real number #endif +#if LLVM_TOT +# include <llvm/LLVMContext.h> +#endif + #include "llvm.h" #include "ruby/ruby.h" #include "ruby/encoding.h" @@ -182,6 +186,14 @@ #if ROXOR_COMPILER_DEBUG level = 0; #endif + +#if LLVM_TOT + dbg_mdkind = context.getMetadata().getMDKind("dbg"); + if (dbg_mdkind == 0) { + dbg_mdkind = context.getMetadata().registerMDKind("dbg"); + } + assert(dbg_mdkind != 0); +#endif } RoxorAOTCompiler::RoxorAOTCompiler(void) @@ -752,7 +764,13 @@ Instruction *insn = compile_protected_call(dispatcherFunc, params); if (fname != NULL) { +#if LLVM_TOT + DILocation loc = debug_info->CreateLocation(current_line, 0, + debug_compile_unit, DILocation(NULL)); + context.getMetadata().addMD(dbg_mdkind, loc.getNode(), insn); +#else debug_info->InsertStopPoint(debug_compile_unit, current_line, 0, bb); +#endif } return insn; } Modified: MacRuby/trunk/compiler.h =================================================================== --- MacRuby/trunk/compiler.h 2010-02-02 01:35:45 UTC (rev 3403) +++ MacRuby/trunk/compiler.h 2010-02-02 01:35:46 UTC (rev 3404) @@ -222,6 +222,10 @@ const Type *IntTy; const PointerType *Int32PtrTy; +#if LLVM_TOT + unsigned dbg_mdkind; +#endif + void compile_node_error(const char *msg, NODE *node); virtual Constant * Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-02-02 01:35:45 UTC (rev 3403) +++ MacRuby/trunk/vm.cpp 2010-02-02 01:35:46 UTC (rev 3404) @@ -176,6 +176,8 @@ return mm->getGOTBase(); } +#if LLVM_TOT +#else void SetDlsymTable(void *ptr) { mm->SetDlsymTable(ptr); } @@ -183,6 +185,7 @@ void *getDlsymTable() const { return mm->getDlsymTable(); } +#endif uint8_t *startFunctionBody(const Function *F, uintptr_t &ActualSize) {

1 0

[3403] MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb
by source_changes＠macosforge.org 02 Feb '10

02 Feb '10

Revision: 3403 http://trac.macosforge.org/projects/ruby/changeset/3403 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-01 17:35:45 -0800 (Mon, 01 Feb 2010) Log Message: ----------- Dispatch::Actor should invoke actee methods on a private serial queue Modified Paths: -------------- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb Modified: MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-02 01:35:42 UTC (rev 3402) +++ MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-02 01:35:45 UTC (rev 3403) @@ -6,12 +6,13 @@ class Actee def initialize(s); @s = s; end def current_queue; Dispatch::Queue.current; end + def wait(n); sleep n; end def to_s; @s; end end describe "Dispatch::Actor" do before :each do - @actee = Actee.new("my actee") + @actee = Actee.new("my_actee") @actor = Dispatch::Actor.new(@actee) end @@ -31,7 +32,7 @@ it "should invoke actee methods on a private serial queue" do q = @actor.current_queue - q.label.should =~ "queue" + q.label.should =~ /dispatch.actor/ end it "should call actee Synchronously if block is NOT given" do

1 0

[3402] MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb
by source_changes＠macosforge.org 02 Feb '10

02 Feb '10

Revision: 3402 http://trac.macosforge.org/projects/ruby/changeset/3402 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-01 17:35:42 -0800 (Mon, 01 Feb 2010) Log Message: ----------- Rewrote Actor on top of SimpleDelegator Modified Paths: -------------- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb Modified: MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-02 01:35:36 UTC (rev 3401) +++ MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-02 01:35:42 UTC (rev 3402) @@ -30,7 +30,8 @@ end it "should invoke actee methods on a private serial queue" do - true.should == true + q = @actor.current_queue + q.label.should =~ "queue" end it "should call actee Synchronously if block is NOT given" do

1 0