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

[3223] MacRuby/trunk
by source_changes＠macosforge.org 09 Jan '10

09 Jan '10

Revision: 3223 http://trac.macosforge.org/projects/ruby/changeset/3223 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-08 17:32:07 -0800 (Fri, 08 Jan 2010) Log Message: ----------- Now pass all Dispatch::Source specs for ADD and OR Modified Paths: -------------- MacRuby/trunk/gcd.c MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2010-01-09 00:54:17 UTC (rev 3222) +++ MacRuby/trunk/gcd.c 2010-01-09 01:32:07 UTC (rev 3223) @@ -892,7 +892,7 @@ static VALUE rb_source_get_data(VALUE self, SEL sel) { - return LONG2NUM(dispatch_source_get_mask(RSource(self)->source)); + return LONG2NUM(dispatch_source_get_data(RSource(self)->source)); } /* @@ -1252,7 +1252,7 @@ rb_objc_define_method(cSource, "handle", rb_source_get_handle, 0); rb_objc_define_method(cSource, "mask", rb_source_get_mask, 0); rb_objc_define_method(cSource, "data", rb_source_get_data, 0); - rb_objc_define_method(cSource, "merge", rb_source_merge, 1); + rb_objc_define_method(cSource, "<<", rb_source_merge, 1); cTimer = rb_define_class_under(mDispatch, "Timer", cSource); rb_objc_define_method(cTimer, "initialize", rb_timer_init, -1); Modified: MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2010-01-09 00:54:17 UTC (rev 3222) +++ MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2010-01-09 01:32:07 UTC (rev 3223) @@ -42,10 +42,57 @@ end it "returns an instance of Dispatch::Source" do - src = Dispatch::Source.new(@type, 0, 0, @q) { true.should == true } + src = Dispatch::Source.new(@type, 0, 0, @q) { } src.should be_kind_of(Dispatch::Source) end + + it "should not be suspended" do + src = Dispatch::Source.new(@type, 0, 0, @q) { } + src.suspended?.should == false + end + + it "fires event handler on merge" do + @i = 0 + src = Dispatch::Source.new(@type, 0, 0, @q) {|s| @i = 42} + src << 42 + @q.sync { } + @i.should == 42 + end + + it "passes source to event handler" do + src = Dispatch::Source.new(@type, 0, 0, @q) do |source| + source.should be_kind_of(Dispatch::Source) + end + src << 42 + @q.sync { } + end + + it "passes data to source in event handler" do + @i = 0 + src = Dispatch::Source.new(@type, 0, 0, @q) do |source| + @i = source.data + end + src << 42 + @q.sync { } + @i.should == 42 + end + + + it "coalesces data for source in event handler" do + @i = 0 + src = Dispatch::Source.new(@type, 0, 0, @q) do |source| + @i = source.data + end + src.suspend! + src << 17 + src << 25 + src.resume! + @q.sync { } + @i.should == 42 + end + end + describe :DATA_OR do before :each do @@ -53,11 +100,45 @@ end it "returns an instance of Dispatch::Source" do - src = Dispatch::Source.new(@type, 0, 0, @q) { true.should == true } + src = Dispatch::Source.new(@type, 0, 0, @q) { } src.should be_kind_of(Dispatch::Source) end + + it "should not be suspended" do + src = Dispatch::Source.new(@type, 0, 0, @q) { } + src.suspended?.should == false + end + + + it "fires event handler on merge" do + @i = 0 + src = Dispatch::Source.new(@type, 0, 0, @q) {|s| @i = 42} + src << 42 + @q.sync { } + @i.should == 42 + end + + it "passes source to event handler" do + src = Dispatch::Source.new(@type, 0, 0, @q) do |source| + source.should be_kind_of(Dispatch::Source) + end + src << 42 + @q.sync { } + end + + it "coalesces data for source in event handler" do + @i = 0 + src = Dispatch::Source.new(@type, 0, 0, @q) do |source| + @i = source.data + end + src.suspend! + src << 0b000_010 + src << 0b101_000 + src.resume! + @q.sync { } + @i.should == 42 #0b101_010 + end end - end end

1 0

[3222] MacRuby/trunk/string.c
by source_changes＠macosforge.org 09 Jan '10

09 Jan '10

Revision: 3222 http://trac.macosforge.org/projects/ruby/changeset/3222 Author: lsansonetti(a)apple.com Date: 2010-01-08 16:54:17 -0800 (Fri, 08 Jan 2010) Log Message: ----------- String#getbyte, String#setbyte: implemented in case the receiver is a bytestring Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-01-09 00:54:02 UTC (rev 3221) +++ MacRuby/trunk/string.c 2010-01-09 00:54:17 UTC (rev 3222) @@ -2291,21 +2291,20 @@ static VALUE rb_str_getbyte(VALUE str, SEL sel, VALUE index) { - // TODO -#if 0 + if (*(VALUE *)str != rb_cByteString) { + rb_raise(rb_eArgError, + "#getbyte is only implemented for ByteString objects"); + } + long pos = NUM2LONG(index); - long n = RSTRING_BYTELEN(str); - + const long n = rb_bytestring_length(str); if (pos < 0) { - pos += n; + pos += n; } - if (pos < 0 || n <= pos) { - return Qnil; + if (pos < 0 || pos >= n) { + return Qnil; } - - return INT2FIX((unsigned char)RSTRING_BYTEPTR(str)[pos]); -#endif - abort(); + return INT2FIX(rb_bytestring_byte_pointer(str)[pos]); } /* @@ -2317,25 +2316,27 @@ static VALUE rb_str_setbyte(VALUE str, SEL sel, VALUE index, VALUE value) { - // TODO promote to ByteString -#if 0 + if (*(VALUE *)str != rb_cByteString) { + rb_raise(rb_eArgError, + "#setbyte is only implemented for ByteString objects"); + } + long pos = NUM2LONG(index); - int byte = NUM2INT(value); - long n = RSTRING_BYTELEN(str); + const int byte = NUM2INT(value); + const long n = rb_bytestring_length(str); rb_str_modify(str); - if (pos < -n || n <= pos) + if (pos < -n || n <= pos) { rb_raise(rb_eIndexError, "index %ld out of string", pos); - if (pos < 0) + } + if (pos < 0) { pos += n; + } - RSTRING_BYTEPTR(str)[pos] = byte; - RSTRING_SYNC(str); + rb_bytestring_byte_pointer(str)[pos] = byte; return value; -#endif - abort(); }

1 0

[3221] MacRuby/trunk
by source_changes＠macosforge.org 09 Jan '10

09 Jan '10

Revision: 3221 http://trac.macosforge.org/projects/ruby/changeset/3221 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-08 16:54:02 -0800 (Fri, 08 Jan 2010) Log Message: ----------- Fixed specs; Dispatch::Source now passes minimal specs Modified Paths: -------------- MacRuby/trunk/gcd.c MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2010-01-09 00:15:21 UTC (rev 3220) +++ MacRuby/trunk/gcd.c 2010-01-09 00:54:02 UTC (rev 3221) @@ -798,8 +798,11 @@ 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); + assert(src->type != NULL); + uintptr_t c_handle = NUM2UINT(handle); + unsigned long c_mask = NUM2LONG(mask); + dispatch_queue_t c_queue = RQueue(queue)->queue; + src->source = dispatch_source_create(src->type, c_handle, c_mask, c_queue); assert(src->source != NULL); if (rb_block_given_p()) { Modified: MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2010-01-09 00:15:21 UTC (rev 3220) +++ MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2010-01-09 00:54:02 UTC (rev 3221) @@ -42,12 +42,22 @@ end it "returns an instance of Dispatch::Source" do - p @type - src = Dispatch::Source.new(@type, 1, 2, @q) { true.should == true } - p src + src = Dispatch::Source.new(@type, 0, 0, @q) { true.should == true } src.should be_kind_of(Dispatch::Source) end end + + describe :DATA_OR do + before :each do + @type = Dispatch::Source::DATA_OR + end + + it "returns an instance of Dispatch::Source" do + src = Dispatch::Source.new(@type, 0, 0, @q) { true.should == true } + src.should be_kind_of(Dispatch::Source) + 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 2010-01-09 00:15:21 UTC (rev 3220) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt 2010-01-09 00:54:02 UTC (rev 3221) @@ -1,2 +1 @@ -fails:Dispatch::Source of type DATA_ADD returns an instance of Dispatch::Source

1 0

[3220] MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt
by source_changes＠macosforge.org 09 Jan '10

09 Jan '10

Revision: 3220 http://trac.macosforge.org/projects/ruby/changeset/3220 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-08 16:15:21 -0800 (Fri, 08 Jan 2010) Log Message: ----------- Forgot to delete commented Dispatch::Semaphore tag Modified Paths: -------------- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt 2010-01-09 00:15:00 UTC (rev 3219) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt 2010-01-09 00:15:21 UTC (rev 3220) @@ -1,2 +1 @@ critical:Dispatch::Semaphore raises an ArgumentError if the count isn't specified -#fails:Dispatch::Semaphore wait returns false if explicit timeout DOES expire

1 0

[3219] MacRuby/trunk/string.c
by source_changes＠macosforge.org 09 Jan '10

09 Jan '10

Revision: 3219 http://trac.macosforge.org/projects/ruby/changeset/3219 Author: lsansonetti(a)apple.com Date: 2010-01-08 16:15:00 -0800 (Fri, 08 Jan 2010) Log Message: ----------- rb_str_dup(): in case the receiver is not a pure CF string, send -mutableCopy Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-01-09 00:11:43 UTC (rev 3218) +++ MacRuby/trunk/string.c 2010-01-09 00:15:00 UTC (rev 3219) @@ -325,17 +325,21 @@ rb_str_dup_imp(VALUE str, SEL sel) { VALUE dup; + VALUE klass = *(VALUE *)str; - if (*(VALUE *)str == rb_cByteString) { + if (klass == rb_cByteString) { dup = rb_bytestring_copy(str); } - else { + else if (klass == rb_cCFString) { dup = (VALUE)CFStringCreateMutableCopy(NULL, 0, (CFStringRef)str); CFMakeCollectable((CFTypeRef)dup); if (*(VALUE *)str != rb_cSymbol) { *(VALUE *)dup = *(VALUE *)str; } } + else { + dup = (VALUE)objc_msgSend((void *)str, selMutableCopy); + } if (OBJ_TAINTED(str)) { OBJ_TAINT(dup);

1 0

[3218] MacRuby/trunk/spec/macruby
by source_changes＠macosforge.org 09 Jan '10

09 Jan '10

Revision: 3218 http://trac.macosforge.org/projects/ruby/changeset/3218 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-08 16:11:43 -0800 (Fri, 08 Jan 2010) Log Message: ----------- Bad Dispatch::Semaphore spec, cleaning up Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt Modified: MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb 2010-01-08 23:29:13 UTC (rev 3217) +++ MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb 2010-01-09 00:11:43 UTC (rev 3218) @@ -37,7 +37,6 @@ it "returns false if explicit timeout DOES expire" do @sema0.wait(0.01).should == false - @sema1.wait(0.01).should == false end it "returns true if explicit timeout does NOT expire" do Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt 2010-01-08 23:29:13 UTC (rev 3217) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt 2010-01-09 00:11:43 UTC (rev 3218) @@ -1,2 +1,2 @@ critical:Dispatch::Semaphore raises an ArgumentError if the count isn't specified -fails:Dispatch::Semaphore wait returns false if explicit timeout DOES expire +#fails:Dispatch::Semaphore wait returns false if explicit timeout DOES expire

1 0

[3217] MacRuby/trunk/thread.c
by source_changes＠macosforge.org 08 Jan '10

08 Jan '10

Revision: 3217 http://trac.macosforge.org/projects/ruby/changeset/3217 Author: lsansonetti(a)apple.com Date: 2010-01-08 15:29:13 -0800 (Fri, 08 Jan 2010) Log Message: ----------- implement Thread.kill and Thread.exit Modified Paths: -------------- MacRuby/trunk/thread.c Modified: MacRuby/trunk/thread.c =================================================================== --- MacRuby/trunk/thread.c 2010-01-08 22:54:52 UTC (rev 3216) +++ MacRuby/trunk/thread.c 2010-01-08 23:29:13 UTC (rev 3217) @@ -325,10 +325,9 @@ */ static VALUE -rb_thread_s_kill(VALUE obj, VALUE th) +rb_thread_s_kill(VALUE obj, SEL sel, VALUE th) { - // TODO - return Qnil; + return rb_thread_kill(th, 0); } /* @@ -344,8 +343,7 @@ static VALUE rb_thread_exit(void) { - // TODO - return Qnil; + return rb_thread_kill(rb_vm_current_thread(), 0); } /* @@ -1526,8 +1524,8 @@ rb_objc_define_method(*(VALUE *)rb_cThread, "main", rb_thread_s_main, 0); rb_objc_define_method(*(VALUE *)rb_cThread, "current", thread_s_current, 0); rb_objc_define_method(*(VALUE *)rb_cThread, "stop", rb_thread_stop, 0); - rb_define_singleton_method(rb_cThread, "kill", rb_thread_s_kill, 1); - rb_define_singleton_method(rb_cThread, "exit", rb_thread_exit, 0); + rb_objc_define_method(*(VALUE *)rb_cThread, "kill", rb_thread_s_kill, 1); + rb_objc_define_method(*(VALUE *)rb_cThread, "exit", rb_thread_exit, 0); rb_objc_define_method(*(VALUE *)rb_cThread, "pass", thread_s_pass, 0); rb_objc_define_method(*(VALUE *)rb_cThread, "list", rb_thread_list, 0); rb_objc_define_method(*(VALUE *)rb_cThread, "abort_on_exception", rb_thread_s_abort_exc, 0);

1 0

[3216] MacRuby/trunk/gc.c
by source_changes＠macosforge.org 08 Jan '10

08 Jan '10

Revision: 3216 http://trac.macosforge.org/projects/ruby/changeset/3216 Author: lsansonetti(a)apple.com Date: 2010-01-08 14:54:52 -0800 (Fri, 08 Jan 2010) Log Message: ----------- load config.h before Modified Paths: -------------- MacRuby/trunk/gc.c Modified: MacRuby/trunk/gc.c =================================================================== --- MacRuby/trunk/gc.c 2010-01-08 21:33:33 UTC (rev 3215) +++ MacRuby/trunk/gc.c 2010-01-08 22:54:52 UTC (rev 3216) @@ -9,12 +9,13 @@ * Copyright (C) 2000 Information-technology Promotion Agency, Japan */ +#include "ruby/config.h" + #if HAVE_AUTO_ZONE_H # include <auto_zone.h> #else # include "auto_zone_1060.h" #endif -#define AUTO_ZONE_INCLUDED 1 #include "ruby/ruby.h" #include "ruby/signal.h"

1 0

[3215] MacRuby/trunk/TODO
by source_changes＠macosforge.org 08 Jan '10

08 Jan '10

Revision: 3215 http://trac.macosforge.org/projects/ruby/changeset/3215 Author: lsansonetti(a)apple.com Date: 2010-01-08 13:33:33 -0800 (Fri, 08 Jan 2010) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2010-01-08 21:32:21 UTC (rev 3214) +++ MacRuby/trunk/TODO 2010-01-08 21:33:33 UTC (rev 3215) @@ -1,7 +1,9 @@ For 0.5 beta 3: -[ ] HotCocoa should be extracted as a gem -[X] HotCocoa samples should all work +[ ] HotCocoa + [X] samples should work + [X] should be removed from the repository + [ ] should be gemified on github and pre-bundled with the installers [X] backtracing information (line numbers) should be accurate [/] frozen, stable and documented GCD API [X] non-ASCII regexp

1 0

[3214] MacRuby/trunk
by source_changes＠macosforge.org 08 Jan '10

08 Jan '10

Revision: 3214 http://trac.macosforge.org/projects/ruby/changeset/3214 Author: lsansonetti(a)apple.com Date: 2010-01-08 13:32:21 -0800 (Fri, 08 Jan 2010) Log Message: ----------- removing hotcocoa from the repository Removed Paths: ------------- MacRuby/trunk/bin/hotcocoa MacRuby/trunk/lib/hotcocoa/ MacRuby/trunk/lib/hotcocoa.rb MacRuby/trunk/sample-macruby/HotCocoa/ Deleted: MacRuby/trunk/bin/hotcocoa =================================================================== --- MacRuby/trunk/bin/hotcocoa 2010-01-08 21:28:02 UTC (rev 3213) +++ MacRuby/trunk/bin/hotcocoa 2010-01-08 21:32:21 UTC (rev 3214) @@ -1,31 +0,0 @@ -#!/usr/bin/env ruby - -project_name = ARGV.shift - -if project_name.nil? or project_name == "--help" or project_name =="-h" - puts "Usage: hotcocoa <project name>" - exit -end - -if File.exist?(project_name) - if File.extname(project_name) == ".rb" - file_to_copy = project_name - project_name = project_name[0..-4] - else - puts %{Error: "#{project_name}" already exists in this directory.} - exit - end -else - file_to_copy = nil -end - -require 'hotcocoa/template' -HotCocoa::Template.copy_to(project_name, project_name.split("_").collect(&:capitalize).join(" ")) - -if file_to_copy - lib_dir = File.join(project_name, "lib") - File.open(File.join(lib_dir, "application.rb"), "w") do |file| - file.write File.read(file_to_copy) - end -end - Deleted: MacRuby/trunk/lib/hotcocoa.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa.rb 2010-01-08 21:28:02 UTC (rev 3213) +++ MacRuby/trunk/lib/hotcocoa.rb 2010-01-08 21:32:21 UTC (rev 3214) @@ -1,24 +0,0 @@ -framework 'Cocoa' - -module HotCocoa - - Views = {} - -end - -require 'hotcocoa/object_ext' -require 'hotcocoa/kernel_ext' -require 'hotcocoa/mappings' -require 'hotcocoa/behaviors' -require 'hotcocoa/mapping_methods' -require 'hotcocoa/mapper' -require 'hotcocoa/layout_view' -require 'hotcocoa/delegate_builder' -require 'hotcocoa/notification_listener' -require 'hotcocoa/data_sources/table_data_source' -require 'hotcocoa/data_sources/combo_box_data_source' -require 'hotcocoa/plist' -require 'hotcocoa/kvo_accessors' -require 'hotcocoa/attributed_string' - -HotCocoa::Mappings.reload

1 0