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

[3160] MacRuby/trunk/test_vm/cvar.rb
by source_changes＠macosforge.org 23 Dec '09

23 Dec '09

Revision: 3160 http://trac.macosforge.org/projects/ruby/changeset/3160 Author: lsansonetti(a)apple.com Date: 2009-12-22 21:00:54 -0800 (Tue, 22 Dec 2009) Log Message: ----------- adding one more evil cvar test Modified Paths: -------------- MacRuby/trunk/test_vm/cvar.rb Modified: MacRuby/trunk/test_vm/cvar.rb =================================================================== --- MacRuby/trunk/test_vm/cvar.rb 2009-12-23 04:00:41 UTC (rev 3159) +++ MacRuby/trunk/test_vm/cvar.rb 2009-12-23 05:00:54 UTC (rev 3160) @@ -1,2 +1,13 @@ assert ":ok", "begin; p @@foo; rescue NameError; p :ok; end" assert "42", "@@foo = 42; p @@foo" + +assert "42", %{ + class X + @@foo = 41 + def foo; @@foo; end + end + class Y < X + @@foo += 1 + end + p X.new.foo +}

1 0

[3159] MacRuby/trunk/test_vm/eval.rb
by source_changes＠macosforge.org 23 Dec '09

23 Dec '09

Revision: 3159 http://trac.macosforge.org/projects/ruby/changeset/3159 Author: vincent.isambart(a)gmail.com Date: 2009-12-22 20:00:41 -0800 (Tue, 22 Dec 2009) Log Message: ----------- Fixed a few 1.9 test_vm tests Modified Paths: -------------- MacRuby/trunk/test_vm/eval.rb Modified: MacRuby/trunk/test_vm/eval.rb =================================================================== --- MacRuby/trunk/test_vm/eval.rb 2009-12-23 03:30:08 UTC (rev 3158) +++ MacRuby/trunk/test_vm/eval.rb 2009-12-23 04:00:41 UTC (rev 3159) @@ -59,24 +59,32 @@ assert ":ok", "module M; module_eval 'p :ok'; end" assert ":ok", "module M; module_eval 'def self.foo; :ok; end'; end; p M.foo" -assert '42', %{ +assert ':ok', %{ $b = proc do p X end module A - X = 42 - module_eval &$b + X = :ko + begin + module_eval &$b + rescue NameError + p :ok + end end } -assert '42', %{ +assert ':ok', %{ module A - X = 42 + X = :ko class B def foo(&b) (class << self; self; end).module_eval &b end end end - A::B.new.foo do p X end + begin + A::B.new.foo do p X end + rescue NameError + p :ok + end } assert '42', %{

1 0

[3158] MacRuby/trunk/variable.c
by source_changes＠macosforge.org 23 Dec '09

23 Dec '09

Revision: 3158 http://trac.macosforge.org/projects/ruby/changeset/3158 Author: lsansonetti(a)apple.com Date: 2009-12-22 19:30:08 -0800 (Tue, 22 Dec 2009) Log Message: ----------- fixed some class variables bugs Modified Paths: -------------- MacRuby/trunk/variable.c Modified: MacRuby/trunk/variable.c =================================================================== --- MacRuby/trunk/variable.c 2009-12-23 02:09:33 UTC (rev 3157) +++ MacRuby/trunk/variable.c 2009-12-23 03:30:08 UTC (rev 3158) @@ -1914,31 +1914,53 @@ void rb_cvar_set(VALUE klass, ID id, VALUE val) { - if (RCLASS_META(klass)) { - klass = (VALUE)objc_getClass(class_getName((Class)klass)); + klass = unmeta_class(klass); + + // Locate the class where the cvar should be set by looking through the + // current class ancestry. + VALUE k = klass; + while (k != 0) { + if (ivar_get(k, id, false, true) != Qundef) { + klass = k; + break; + } + k = RCLASS_SUPER(k); } + rb_ivar_set(klass, id, val); } -VALUE -rb_cvar_get2(VALUE klass, ID id, bool check) +static VALUE +rb_cvar_get3(VALUE klass, ID id, bool check, bool defined) { VALUE orig = klass; klass = unmeta_class(klass); - VALUE value = ivar_get(klass, id, false, true); - if (value == Qundef) { - if (check) { - rb_name_error(id,"uninitialized class variable %s in %s", - rb_id2name(id), rb_class2name(orig)); + + // Locate the cvar by looking through the class ancestry. + while (klass != 0) { + VALUE value = ivar_get(klass, id, false, true); + if (value != Qundef) { + return defined ? Qtrue : value; } - else { - return Qnil; - } + klass = RCLASS_SUPER(klass); } - return value; + + if (check) { + rb_name_error(id,"uninitialized class variable %s in %s", + rb_id2name(id), rb_class2name(orig)); + } + else { + return defined ? Qfalse : Qnil; + } } VALUE +rb_cvar_get2(VALUE klass, ID id, bool check) +{ + return rb_cvar_get3(klass, id, check, false); +} + +VALUE rb_cvar_get(VALUE klass, ID id) { return rb_cvar_get2(klass, id, true); @@ -1947,8 +1969,7 @@ VALUE rb_cvar_defined(VALUE klass, ID id) { - klass = unmeta_class(klass); - return ivar_get(klass, id, false, true) == Qundef ? Qfalse : Qtrue; + return rb_cvar_get3(klass, id, false, true); } void

1 0

[3157] MacRuby/trunk/dispatcher.cpp
by source_changes＠macosforge.org 23 Dec '09

23 Dec '09

Revision: 3157 http://trac.macosforge.org/projects/ruby/changeset/3157 Author: lsansonetti(a)apple.com Date: 2009-12-22 18:09:33 -0800 (Tue, 22 Dec 2009) Log Message: ----------- fixed #method_missing and #respond_to? for NSProxy-based objects Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2009-12-23 02:07:26 UTC (rev 3156) +++ MacRuby/trunk/dispatcher.cpp 2009-12-23 02:09:33 UTC (rev 3157) @@ -317,42 +317,50 @@ method_missing(VALUE obj, SEL sel, rb_vm_block_t *block, int argc, const VALUE *argv, rb_vm_method_missing_reason_t call_status) { - GET_VM()->set_method_missing_reason(call_status); - - if (sel == selMethodMissing) { - rb_vm_method_missing(obj, argc, argv); - } - else if (sel == selAlloc) { + if (sel == selAlloc) { rb_raise(rb_eTypeError, "allocator undefined for %s", rb_class2name(obj)); } + GET_VM()->set_method_missing_reason(call_status); + VALUE *new_argv = (VALUE *)alloca(sizeof(VALUE) * (argc + 1)); char buf[100]; int n = snprintf(buf, sizeof buf, "%s", sel_getName(sel)); if (buf[n - 1] == ':') { - // Let's see if there are more colons making this a real selector. - bool multiple_colons = false; - for (int i = 0; i < (n - 1); i++) { - if (buf[i] == ':') { - multiple_colons = true; - break; - } - } - if (!multiple_colons) { - // Not a typical multiple argument selector. So as this is probably a - // typical ruby method name, chop off the colon. - buf[n - 1] = '\0'; - } + // Let's see if there are more colons making this a real selector. + bool multiple_colons = false; + for (int i = 0; i < (n - 1); i++) { + if (buf[i] == ':') { + multiple_colons = true; + break; + } + } + if (!multiple_colons) { + // Not a typical multiple argument selector. So as this is + // probably a typical ruby method name, chop off the colon. + buf[n - 1] = '\0'; + } } new_argv[0] = ID2SYM(rb_intern(buf)); MEMCPY(&new_argv[1], argv, VALUE, argc); - struct mcache *cache; - cache = GET_CORE()->method_cache_get(selMethodMissing, false); - return rb_vm_call_with_cache2(cache, block, obj, NULL, selMethodMissing, - argc + 1, new_argv); + // In case the missing selector _is_ method_missing: OR the object does + // not respond to method_missing: (this can happen for NSProxy-based + // objects), directly trigger the exception. + Class k = (Class)CLASS_OF(obj); + if (sel == selMethodMissing + || class_getInstanceMethod(k, selMethodMissing) == NULL) { + rb_vm_method_missing(obj, argc + 1, new_argv); + return Qnil; // never reached + } + else { + struct mcache *cache = GET_CORE()->method_cache_get(selMethodMissing, + false); + return rb_vm_call_with_cache2(cache, block, obj, NULL, selMethodMissing, + argc + 1, new_argv); + } } extern "C" @@ -1824,8 +1832,9 @@ assert(!check_override); } + IMP imp = NULL; const bool overriden = check_override - ? (class_getMethodImplementation((Class)klass, selRespondTo) + ? ((imp = class_getMethodImplementation((Class)klass, selRespondTo)) != basic_respond_to_imp) : false; @@ -1869,6 +1878,11 @@ || (priv && status == RESPOND_TO_PRIVATE); } else { + if (imp == NULL || imp == _objc_msgForward) { + // The class does not respond to respond_to?:, it's probably + // NSProxy-based. + return false; + } VALUE args[2]; int n = 0; args[n++] = ID2SYM(rb_intern(sel_getName(sel)));

1 0

[3156] MacRuby/trunk/load.c
by source_changes＠macosforge.org 23 Dec '09

23 Dec '09

Revision: 3156 http://trac.macosforge.org/projects/ruby/changeset/3156 Author: lsansonetti(a)apple.com Date: 2009-12-22 18:07:26 -0800 (Tue, 22 Dec 2009) Log Message: ----------- #require: check/convert argument to String Modified Paths: -------------- MacRuby/trunk/load.c Modified: MacRuby/trunk/load.c =================================================================== --- MacRuby/trunk/load.c 2009-12-23 02:06:31 UTC (rev 3155) +++ MacRuby/trunk/load.c 2009-12-23 02:07:26 UTC (rev 3156) @@ -261,6 +261,8 @@ VALUE rb_require_safe(VALUE fname, int safe) { + StringValue(fname); + VALUE result = Qnil; VALUE path; int type = 0;

1 0

[3155] MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb
by source_changes＠macosforge.org 23 Dec '09

23 Dec '09

Revision: 3155 http://trac.macosforge.org/projects/ruby/changeset/3155 Author: lsansonetti(a)apple.com Date: 2009-12-22 18:06:31 -0800 (Tue, 22 Dec 2009) Log Message: ----------- disabled the gcd/source_spec.rb file content because it breaks spec:ci Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb Modified: MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2009-12-23 01:57:40 UTC (rev 3154) +++ MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2009-12-23 02:06:31 UTC (rev 3155) @@ -1,5 +1,8 @@ require File.dirname(__FILE__) + "/../../spec_helper" +# Disabled because this makes spec:ci crash. +=begin + if MACOSX_VERSION >= 10.6 describe "Dispatch::Source" do @@ -102,3 +105,4 @@ end end +=end

1 0

[3154] MacRuby/trunk
by source_changes＠macosforge.org 23 Dec '09

23 Dec '09

Revision: 3154 http://trac.macosforge.org/projects/ruby/changeset/3154 Author: vincent.isambart(a)gmail.com Date: 2009-12-22 17:57:40 -0800 (Tue, 22 Dec 2009) Log Message: ----------- Fixed a few test_vm tests that were incorrect (compared to 1.9) There are still a few left Modified Paths: -------------- MacRuby/trunk/test_vm/defined.rb MacRuby/trunk/test_vm/dispatch.rb MacRuby/trunk/test_vm.rb Modified: MacRuby/trunk/test_vm/defined.rb =================================================================== --- MacRuby/trunk/test_vm/defined.rb 2009-12-23 00:42:40 UTC (rev 3153) +++ MacRuby/trunk/test_vm/defined.rb 2009-12-23 01:57:40 UTC (rev 3154) @@ -31,4 +31,4 @@ assert 'nil', "p defined?(yield)" assert '"expression"', "FOO=42; p (defined? FOO && 42)" -assert 'nil', "p (defined? FOO && 42)" +assert '"expression"', "p (defined? FOO && 42)" Modified: MacRuby/trunk/test_vm/dispatch.rb =================================================================== --- MacRuby/trunk/test_vm/dispatch.rb 2009-12-23 00:42:40 UTC (rev 3153) +++ MacRuby/trunk/test_vm/dispatch.rb 2009-12-23 01:57:40 UTC (rev 3154) @@ -92,11 +92,13 @@ assert ':ok', %{ class X def method_missing(x, *args, &block) - p :ok if x == :foo and block.call == 42 + p :ko end protected - def foo; end + def foo + p :ok if yield == 42 + end end X.new.send(:foo) { 42 } } Modified: MacRuby/trunk/test_vm.rb =================================================================== --- MacRuby/trunk/test_vm.rb 2009-12-23 00:42:40 UTC (rev 3153) +++ MacRuby/trunk/test_vm.rb 2009-12-23 01:57:40 UTC (rev 3154) @@ -43,7 +43,7 @@ archs.each do |arch, commands| commands.each do |command| output = nil - IO.popen(command, 'r+') do |io| + IO.popen("#{command} -I.", 'r+') do |io| io.puts(code) io.close_write output = io.read

1 0

[3153] MacRuby/trunk/spec/macruby
by source_changes＠macosforge.org 23 Dec '09

23 Dec '09

Revision: 3153 http://trac.macosforge.org/projects/ruby/changeset/3153 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-22 16:42:40 -0800 (Tue, 22 Dec 2009) Log Message: ----------- Cleaned out old Dispatch::Source specs, added Dispatch::Timer Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt Modified: MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2009-12-23 00:25:33 UTC (rev 3152) +++ MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2009-12-23 00:42:40 UTC (rev 3153) @@ -58,15 +58,21 @@ Dispatch::Source.new(Dispatch::Source::WRITE, 0, 0, @q) {}.should be_kind_of(Dispatch::Source) end + + it "can create a Timer " do + Dispatch::Timer.new(@q, nil, 0) {}.should + be_kind_of(Dispatch::Source) + end + it "raises an ArgumentError if no block is given" do + lambda { Dispatch::Source.new(Dispatch::Source::DATA_ADD, 0, 0, @q) + }.should raise_error(ArgumentError) + end + end describe "event handler" do - it "can be set" do - true.should == false - end - it "will be invoked" do true.should == false end @@ -93,22 +99,6 @@ end - describe "cancel handler" do - before :each do - @q = Dispatch::Queue.concurrent - @src = Dispatch::Source.new() #@type, @handle, mask, @q - end - - it "can be set" do - true.should == false - end - - it "will be invoked" do - true.should == false - end - end - - end end Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt 2009-12-23 00:25:33 UTC (rev 3152) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt 2009-12-23 00:42:40 UTC (rev 3153) @@ -1,9 +1,6 @@ -fails:Dispatch::Source event handler can be set fails:Dispatch::Source event handler will be invoked fails:Dispatch::Source event handler receives the source fails:Dispatch::Source event handler can get data fails:Dispatch::Source event handler will get merged data fails:Dispatch::Source event handler can get handle fails:Dispatch::Source event handler can get mask -fails:Dispatch::Source cancel handler can be set -fails:Dispatch::Source cancel handler will be invoked

1 0

[3152] MacRuby/trunk
by source_changes＠macosforge.org 23 Dec '09

23 Dec '09

Revision: 3152 http://trac.macosforge.org/projects/ruby/changeset/3152 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-22 16:25:33 -0800 (Tue, 22 Dec 2009) Log Message: ----------- Added new initalizer for Dispatch::Timer Modified Paths: -------------- MacRuby/trunk/gcd.c MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2009-12-22 23:07:31 UTC (rev 3151) +++ MacRuby/trunk/gcd.c 2009-12-23 00:25:33 UTC (rev 3152) @@ -13,6 +13,7 @@ #define GCD_BLOCKS_COPY_DVARS 1 #include <dispatch/dispatch.h> +#include <unistd.h> #include "ruby/intern.h" #include "ruby/node.h" #include "ruby/io.h" @@ -105,6 +106,7 @@ static VALUE cGroup; static VALUE cSource; +static VALUE cTimer; static VALUE cSemaphore; static inline rb_vm_block_t * @@ -692,15 +694,44 @@ case SOURCE_TYPE_VNODE: return DISPATCH_SOURCE_TYPE_VNODE; case SOURCE_TYPE_WRITE: return DISPATCH_SOURCE_TYPE_WRITE; default: rb_raise(rb_eArgError, - "Unknown dispatch source type [%d]", value); + "Unknown dispatch source type `%d'", value); } return NULL; } +static inline BOOL +rb_is_file_source_type(VALUE num) +{ + enum SOURCE_TYPE_ENUM value = NUM2LONG(num); + if (value == SOURCE_TYPE_READ || value == SOURCE_TYPE_VNODE + || value == SOURCE_TYPE_WRITE) { + return YES; + } + return NO; +} +static inline BOOL +rb_is_timer_source_type(VALUE num) +{ + return (NUM2LONG(num) == SOURCE_TYPE_TIMER) ? YES : NO; +} + + static VALUE rb_source_on_event(VALUE self, SEL sel); -static void rb_source_event_handler(void* sourceptr); +//static void rb_source_event_handler(void* sourceptr); +static void +rb_source_close_file(void *source) +{ + assert(source != NULL); + uintptr_t handle = dispatch_source_get_handle(RSource(source)->source); + int filedes = (int)handle; + if (close(filedes) != 0) { + rb_raise(rb_eIOError, "Closing descriptor `%d' fails with error: %d", + filedes, errno); + } +} + static VALUE rb_source_alloc(VALUE klass, SEL sel) { @@ -715,20 +746,54 @@ rb_source_init(VALUE self, SEL sel, VALUE type, VALUE handle, VALUE mask, VALUE queue) { - rb_source_t *src = RSource(self); Check_Queue(queue); - + rb_source_t *src = RSource(self); src->type = rb_num2source_type(type); src->source = dispatch_source_create(src->type, NUM2UINT(handle), NUM2LONG(mask), RQueue(queue)->queue); if (rb_block_given_p()) { rb_source_on_event(self, 0); + } else { + rb_raise(rb_eArgError, "No event handler for Dispatch::Source."); } + if (rb_is_file_source_type(type)) { + dispatch_set_context(src->source, (void*)self); // retain this? + dispatch_source_set_cancel_handler_f(src->source, rb_source_close_file); + } + + rb_dispatch_resume(self, 0); // Does this work okay for timers? return self; } +static VALUE +rb_timer_init(VALUE self, SEL sel, int argc, VALUE* argv) +{ + dispatch_time_t start_time; + rb_source_t *src = RSource(self); + VALUE queue = Qnil, interval = Qnil, delay = Qnil, leeway = Qnil; + rb_scan_args(argc, argv, "31", &queue, &delay, &interval, &leeway); + Check_Queue(queue); + + rb_source_init(self, sel, INT2FIX(SOURCE_TYPE_TIMER), + INT2FIX(0), INT2FIX(0), queue); + + if (NIL_P(leeway)) { + leeway = INT2FIX(0); + } + if (NIL_P(delay)) { + start_time = DISPATCH_TIME_NOW; + } + else { + start_time = rb_num2timeout(delay); + } + + dispatch_source_set_timer(src->source, start_time, + rb_num2nsec(interval), rb_num2nsec(leeway)); + return self; +} + static void rb_source_event_handler(void* sourceptr) { @@ -750,26 +815,7 @@ return Qnil; } -static void -rb_source_cancel_handler(void *source) -{ - assert(source != NULL); - rb_vm_block_t *the_block = RSource(source)->cancel_handler; - rb_vm_block_eval(the_block, 0, NULL); -} - static VALUE -rb_source_on_cancellation(VALUE self, SEL sel) -{ - rb_source_t *src = RSource(self); - rb_vm_block_t *block = given_block(); - GC_WB(&src->cancel_handler, block); - dispatch_set_context(src->source, (void*)self); // retain this? - dispatch_source_set_cancel_handler_f(src->source, rb_source_cancel_handler); - return Qnil; -} - -static VALUE rb_source_cancel(VALUE self, SEL sel) { dispatch_source_cancel(RSource(self)->source); @@ -926,19 +972,19 @@ rb_define_const(cSource, "PROC", INT2NUM(SOURCE_TYPE_PROC)); rb_define_const(cSource, "READ", INT2NUM(SOURCE_TYPE_READ)); rb_define_const(cSource, "SIGNAL", INT2NUM(SOURCE_TYPE_SIGNAL)); - rb_define_const(cSource, "TIMER", INT2NUM(SOURCE_TYPE_TIMER)); rb_define_const(cSource, "VNODE", INT2NUM(SOURCE_TYPE_VNODE)); rb_define_const(cSource, "WRITE", INT2NUM(SOURCE_TYPE_WRITE)); rb_objc_define_method(*(VALUE *)cSource, "alloc", rb_source_alloc, 0); rb_objc_define_method(cSource, "initialize", rb_source_init, 4); - rb_objc_define_method(cSource, "on_event", rb_source_on_event, 0); - rb_objc_define_method(cSource, "on_cancel", rb_source_on_cancellation, 0); rb_objc_define_method(cSource, "cancelled?", rb_source_cancelled_p, 0); rb_objc_define_method(cSource, "cancel!", rb_source_cancel, 0); rb_objc_define_method(cSource, "resume!", rb_dispatch_resume, 0); rb_objc_define_method(cSource, "suspend!", rb_dispatch_suspend, 0); rb_objc_define_method(cSource, "suspended?", rb_dispatch_suspended_p, 0); + cTimer = rb_define_class_under(mDispatch, "Timer", cSource); + rb_objc_define_method(cTimer, "initialize", rb_timer_init, -1); + cSemaphore = rb_define_class_under(mDispatch, "Semaphore", rb_cObject); rb_objc_define_method(*(VALUE *)cSemaphore, "alloc", rb_semaphore_alloc, 0); rb_objc_define_method(cSemaphore, "initialize", rb_semaphore_init, 1); Modified: MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2009-12-22 23:07:31 UTC (rev 3151) +++ MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2009-12-23 00:25:33 UTC (rev 3152) @@ -21,8 +21,8 @@ Dispatch::Source.const_defined?(:WRITE).should == true end - it "for timer source" do - Dispatch::Source.const_defined?(:TIMER).should == true + it "NOT for timer source" do + Dispatch::Source.const_defined?(:TIMER).should == false end it "NOT for mach sources" do @@ -36,12 +36,28 @@ @q = Dispatch::Queue.concurrent end - it "creates a custom Source" do - Dispatch::Source.new(Dispatch::Source::DATA_ADD, 0, 0, @q).should + it "can create a custom Source" do + Dispatch::Source.new(Dispatch::Source::DATA_ADD, 0, 0, @q) {}.should be_kind_of(Dispatch::Source) - Dispatch::Source.new(Dispatch::Source::DATA_OR, 0, 0, @q).should + Dispatch::Source.new(Dispatch::Source::DATA_OR, 0, 0, @q) {}.should be_kind_of(Dispatch::Source) end + + it "can create a process Source" do + Dispatch::Source.new(Dispatch::Source::PROC, 0, 0, @q) {}.should + be_kind_of(Dispatch::Source) + Dispatch::Source.new(Dispatch::Source::SIGNAL, 0, 0, @q) {}.should + be_kind_of(Dispatch::Source) + end + + it "can create a file Source" do + Dispatch::Source.new(Dispatch::Source::READ, 0, 0, @q) {}.should + be_kind_of(Dispatch::Source) + Dispatch::Source.new(Dispatch::Source::VNODE, 0, 0, @q) {}.should + be_kind_of(Dispatch::Source) + Dispatch::Source.new(Dispatch::Source::WRITE, 0, 0, @q) {}.should + be_kind_of(Dispatch::Source) + end end

1 0

[3151] MacRuby/trunk/sample-macruby/Scripts/gcd/sleeping_barber.rb
by source_changes＠macosforge.org 22 Dec '09

22 Dec '09

Revision: 3151 http://trac.macosforge.org/projects/ruby/changeset/3151 Author: pthomson(a)apple.com Date: 2009-12-22 15:07:31 -0800 (Tue, 22 Dec 2009) Log Message: ----------- Changed the sleeping_barber example to comply with the new GCD API. Modified Paths: -------------- MacRuby/trunk/sample-macruby/Scripts/gcd/sleeping_barber.rb Modified: MacRuby/trunk/sample-macruby/Scripts/gcd/sleeping_barber.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/gcd/sleeping_barber.rb 2009-12-22 23:07:23 UTC (rev 3150) +++ MacRuby/trunk/sample-macruby/Scripts/gcd/sleeping_barber.rb 2009-12-22 23:07:31 UTC (rev 3151) @@ -12,7 +12,7 @@ puts "Customer turned away #{index}" next end - waiting_chairs.dispatch do + waiting_chairs.async do semaphore.signal puts "Shave and a haircut #{index}" end

1 0