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

[1273] MacRuby/branches/experimental
by source_changes＠macosforge.org 30 Mar '09

30 Mar '09

Revision: 1273 http://trac.macosforge.org/projects/ruby/changeset/1273 Author: lsansonetti(a)apple.com Date: 2009-03-30 15:46:41 -0700 (Mon, 30 Mar 2009) Log Message: ----------- ported to rb_objc_define_method() Modified Paths: -------------- MacRuby/branches/experimental/file.c MacRuby/branches/experimental/gc.c MacRuby/branches/experimental/proc.c MacRuby/branches/experimental/transcode.c Modified: MacRuby/branches/experimental/file.c =================================================================== --- MacRuby/branches/experimental/file.c 2009-03-30 22:23:43 UTC (rev 1272) +++ MacRuby/branches/experimental/file.c 2009-03-30 22:46:41 UTC (rev 1273) @@ -4163,7 +4163,7 @@ rb_objc_define_method(rb_cStat, "blockdev?", rb_stat_b, 0); rb_objc_define_method(rb_cStat, "chardev?", rb_stat_c, 0); - rb_define_method(rb_cStat, "setuid?", rb_stat_suid, 0); - rb_define_method(rb_cStat, "setgid?", rb_stat_sgid, 0); - rb_define_method(rb_cStat, "sticky?", rb_stat_sticky, 0); + rb_objc_define_method(rb_cStat, "setuid?", rb_stat_suid, 0); + rb_objc_define_method(rb_cStat, "setgid?", rb_stat_sgid, 0); + rb_objc_define_method(rb_cStat, "sticky?", rb_stat_sticky, 0); } Modified: MacRuby/branches/experimental/gc.c =================================================================== --- MacRuby/branches/experimental/gc.c 2009-03-30 22:23:43 UTC (rev 1272) +++ MacRuby/branches/experimental/gc.c 2009-03-30 22:46:41 UTC (rev 1273) @@ -1105,7 +1105,7 @@ rb_global_variable(&nomem_error); nomem_error = rb_exc_new2(rb_eNoMemError, "failed to allocate memory"); - //rb_define_method(rb_mKernel, "hash", rb_obj_id, 0); + rb_objc_define_method(rb_mKernel, "hash", rb_obj_id, 0); rb_objc_define_method(rb_mKernel, "__id__", rb_obj_id, 0); rb_objc_define_method(rb_mKernel, "object_id", rb_obj_id, 0); Modified: MacRuby/branches/experimental/proc.c =================================================================== --- MacRuby/branches/experimental/proc.c 2009-03-30 22:23:43 UTC (rev 1272) +++ MacRuby/branches/experimental/proc.c 2009-03-30 22:46:41 UTC (rev 1273) @@ -209,7 +209,7 @@ } static VALUE -binding_dup(VALUE self) +binding_dup(VALUE self, SEL sel) { VALUE bindval = binding_alloc(rb_cBinding); #if 0 // TODO @@ -222,9 +222,9 @@ } static VALUE -binding_clone(VALUE self) +binding_clone(VALUE self, SEL sel) { - VALUE bindval = binding_dup(self); + VALUE bindval = binding_dup(self, 0); CLONESETUP(bindval, self); return bindval; } @@ -262,7 +262,7 @@ */ static VALUE -rb_f_binding(VALUE self) +rb_f_binding(VALUE self, SEL sel) { return rb_binding_new(); } @@ -286,7 +286,7 @@ VALUE rb_f_eval(VALUE self, SEL sel, int argc, VALUE *argv); static VALUE -bind_eval(int argc, VALUE *argv, VALUE bindval) +bind_eval(VALUE bindval, SEL sel, int argc, VALUE *argv) { VALUE args[4]; @@ -1762,9 +1762,9 @@ rb_cBinding = rb_define_class("Binding", rb_cObject); rb_undef_alloc_func(rb_cBinding); rb_undef_method(CLASS_OF(rb_cBinding), "new"); - rb_define_method(rb_cBinding, "clone", binding_clone, 0); - rb_define_method(rb_cBinding, "dup", binding_dup, 0); - rb_define_method(rb_cBinding, "eval", bind_eval, -1); - rb_define_global_function("binding", rb_f_binding, 0); + rb_objc_define_method(rb_cBinding, "clone", binding_clone, 0); + rb_objc_define_method(rb_cBinding, "dup", binding_dup, 0); + rb_objc_define_method(rb_cBinding, "eval", bind_eval, -1); + rb_objc_define_method(rb_mKernel, "binding", rb_f_binding, 0); } Modified: MacRuby/branches/experimental/transcode.c =================================================================== --- MacRuby/branches/experimental/transcode.c 2009-03-30 22:23:43 UTC (rev 1272) +++ MacRuby/branches/experimental/transcode.c 2009-03-30 22:46:41 UTC (rev 1273) @@ -400,7 +400,7 @@ */ static VALUE -str_encode_bang(int argc, VALUE *argv, VALUE str) +str_encode_bang(VALUE str, SEL sel, int argc, VALUE *argv) { VALUE newstr = str; int encidx = str_transcode(argc, argv, &newstr); @@ -437,7 +437,7 @@ #else // WITH_OBJC static VALUE -str_encode_bang(int argc, VALUE *argv, VALUE self) +str_encode_bang(VALUE str, SEL sel, int argc, VALUE *argv) { /* TODO */ return self; @@ -446,7 +446,7 @@ #endif static VALUE -str_encode(int argc, VALUE *argv, VALUE str) +str_encode(VALUE str, SEL sel, int argc, VALUE *argv) { str = rb_str_dup(str); return str_encode_bang(argc, argv, str); @@ -469,6 +469,6 @@ sym_ignore = ID2SYM(rb_intern("ignore")); #endif - rb_define_method(rb_cString, "encode", str_encode, -1); - rb_define_method(rb_cString, "encode!", str_encode_bang, -1); + rb_objc_define_method(rb_cString, "encode", str_encode, -1); + rb_objc_define_method(rb_cString, "encode!", str_encode_bang, -1); }

1 0

[1272] MacRuby/branches/experimental/spec/frozen/language
by source_changes＠macosforge.org 30 Mar '09

30 Mar '09

Revision: 1272 http://trac.macosforge.org/projects/ruby/changeset/1272 Author: eloy.de.enige(a)gmail.com Date: 2009-03-30 15:23:43 -0700 (Mon, 30 Mar 2009) Log Message: ----------- Fixed 1.8 compile failure in the 'symbol' spec. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/symbol_spec.rb Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/language/versions/symbol_1.8.rb MacRuby/branches/experimental/spec/frozen/language/versions/symbol_1.9.rb Modified: MacRuby/branches/experimental/spec/frozen/language/symbol_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/symbol_spec.rb 2009-03-30 20:42:51 UTC (rev 1271) +++ MacRuby/branches/experimental/spec/frozen/language/symbol_spec.rb 2009-03-30 22:23:43 UTC (rev 1272) @@ -49,20 +49,6 @@ c.inspect.should == ':Foo__9' end - ruby_version_is "" ... "1.9" do - it "must not be an empty string" do - lambda { eval ":''" }.should raise_error(SyntaxError) - end - end - - ruby_version_is "1.9" do - it "can be an empty string" do - c = :'' - c.class.should == Symbol - c.inspect.should == ':""' - end - end - it "can be created by the %s-delimited expression" do a, b = :'foo bar', %s{foo bar} b.class.should == Symbol @@ -80,3 +66,5 @@ } end end + +language_version __FILE__, 'symbol' \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/symbol_1.8.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/symbol_1.8.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/symbol_1.8.rb 2009-03-30 22:23:43 UTC (rev 1272) @@ -0,0 +1,5 @@ +describe "A Symbol literal" do + it "must not be an empty string" do + lambda { eval ":''" }.should raise_error(SyntaxError) + end +end \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/symbol_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/symbol_1.9.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/symbol_1.9.rb 2009-03-30 22:23:43 UTC (rev 1272) @@ -0,0 +1,7 @@ +describe "A Symbol literal" do + it "can be an empty string" do + c = :'' + c.class.should == Symbol + c.inspect.should == ':""' + end +end \ No newline at end of file

1 0

[1271] MacRuby/branches/experimental/rakelib/spec.rake
by source_changes＠macosforge.org 30 Mar '09

30 Mar '09

Revision: 1271 http://trac.macosforge.org/projects/ruby/changeset/1271 Author: eloy.de.enige(a)gmail.com Date: 2009-03-30 13:42:51 -0700 (Mon, 30 Mar 2009) Log Message: ----------- Run the core/io specs as part of spec:ci as well. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 20:42:44 UTC (rev 1270) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 20:42:51 UTC (rev 1271) @@ -37,7 +37,7 @@ initialize } - # + KNOWN_GOOD_CORE_IO_FILES = FileList["spec/frozen/core/io/{#{KNOWN_GOOD_CORE_IO.join(',')}}_spec.rb"] desc "Run all language known good spec files which should be fully green (does not use tags)" task :green do @@ -53,19 +53,17 @@ desc "Run continuous integration language examples (all known good examples)" task :ci do - sh "./mspec/bin/mspec ci -B ./spec/frozen/macruby.mspec spec/frozen/language" + sh "./mspec/bin/mspec ci -B ./spec/frozen/macruby.mspec spec/frozen/language #{KNOWN_GOOD_CORE_IO_FILES.join(' ')}" end desc "Try to run IO tests" task :gdbio do - files = FileList["spec/frozen/core/io/{#{KNOWN_GOOD_CORE_IO.join(',')}}_spec.rb"] - sh "gdb --args ./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run #{files.join(' ')}" + sh "gdb --args ./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run #{KNOWN_GOOD_CORE_IO_FILES.join(' ')}" end desc "Try to run IO tests" task :io do - files = FileList["spec/frozen/core/io/{#{KNOWN_GOOD_CORE_IO.join(',')}}_spec.rb"] - sh "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run -f s #{files.join(' ')}" + sh "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run -f s #{KNOWN_GOOD_CORE_IO_FILES.join(' ')}" end desc "Run language examples that are known to fail"

1 0

[1270] MacRuby/branches/experimental/spec/frozen/core/io/readchar_spec.rb
by source_changes＠macosforge.org 30 Mar '09

30 Mar '09

Revision: 1270 http://trac.macosforge.org/projects/ruby/changeset/1270 Author: eloy.de.enige(a)gmail.com Date: 2009-03-30 13:42:44 -0700 (Mon, 30 Mar 2009) Log Message: ----------- Fixed readchar example for 1.8/1.9. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/core/io/readchar_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/core/io/readchar_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/io/readchar_spec.rb 2009-03-30 18:48:58 UTC (rev 1269) +++ MacRuby/branches/experimental/spec/frozen/core/io/readchar_spec.rb 2009-03-30 20:42:44 UTC (rev 1270) @@ -11,15 +11,28 @@ @file.close unless @file.closed? end - it "returns the next byte from the stream" do - @file.readchar.should == 'V' - @file.readchar.should == 'o' - @file.readchar.should == 'i' - # read the rest of line - @file.readline.should == "ci la ligne une.\n" - @file.readchar.should == 'Q' + ruby_version_is "" ... "1.9" do + it "returns the next byte from the stream" do + @file.readchar.should == 86 + @file.readchar.should == 111 + @file.readchar.should == 105 + # read the rest of line + @file.readline.should == "ci la ligne une.\n" + @file.readchar.should == 81 + end end + ruby_version_is "1.9" do + it "returns the next character from the stream" do + @file.readchar.should == 'V' + @file.readchar.should == 'o' + @file.readchar.should == 'i' + # read the rest of line + @file.readline.should == "ci la ligne une.\n" + @file.readchar.should == 'Q' + end + end + it "raises EOFError when invoked at the end of the stream" do # read entire content @file.read

1 0

[1269] MacRuby/branches/experimental
by source_changes＠macosforge.org 30 Mar '09

30 Mar '09

Revision: 1269 http://trac.macosforge.org/projects/ruby/changeset/1269 Author: pthomson(a)apple.com Date: 2009-03-30 11:48:58 -0700 (Mon, 30 Mar 2009) Log Message: ----------- Added three more tests, one of which necessitated changing the spec (Ruby 1.8's readchar() returned an int, whereas 1.9 returns a one-character string. Are we using old specs? Modified Paths: -------------- MacRuby/branches/experimental/io.c MacRuby/branches/experimental/rakelib/spec.rake MacRuby/branches/experimental/spec/frozen/core/io/readchar_spec.rb Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-30 18:13:14 UTC (rev 1268) +++ MacRuby/branches/experimental/io.c 2009-03-30 18:48:58 UTC (rev 1269) @@ -2203,7 +2203,9 @@ if (fd == -1) { rb_sys_fail(NULL); } - prepare_io_from_fd(ExtractIOStruct(io), fd, convert_mode_string_to_fmode(modes)); + rb_io_t *io_struct = ExtractIOStruct(io); + prepare_io_from_fd(io_struct, fd, convert_mode_string_to_fmode(modes)); + GC_WB(&io_struct->path, path); return io; } Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 18:13:14 UTC (rev 1268) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 18:48:58 UTC (rev 1269) @@ -29,11 +29,16 @@ KNOWN_GOOD_CORE_IO = %w{ closed + fileno + inspect + readchar to_i to_io initialize } + # + desc "Run all language known good spec files which should be fully green (does not use tags)" task :green do files = FileList["spec/frozen/language/{#{KNOWN_GOOD.join(',')}}_spec.rb"] Modified: MacRuby/branches/experimental/spec/frozen/core/io/readchar_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/io/readchar_spec.rb 2009-03-30 18:13:14 UTC (rev 1268) +++ MacRuby/branches/experimental/spec/frozen/core/io/readchar_spec.rb 2009-03-30 18:48:58 UTC (rev 1269) @@ -12,12 +12,12 @@ end it "returns the next byte from the stream" do - @file.readchar.should == 86 - @file.readchar.should == 111 - @file.readchar.should == 105 + @file.readchar.should == 'V' + @file.readchar.should == 'o' + @file.readchar.should == 'i' # read the rest of line @file.readline.should == "ci la ligne une.\n" - @file.readchar.should == 81 + @file.readchar.should == 'Q' end it "raises EOFError when invoked at the end of the stream" do

1 0

[1268] MacRuby/branches/experimental
by source_changes＠macosforge.org 30 Mar '09

30 Mar '09

Revision: 1268 http://trac.macosforge.org/projects/ruby/changeset/1268 Author: pthomson(a)apple.com Date: 2009-03-30 11:13:14 -0700 (Mon, 30 Mar 2009) Log Message: ----------- Added another working spec. Modified Paths: -------------- MacRuby/branches/experimental/io.c MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-30 17:06:29 UTC (rev 1267) +++ MacRuby/branches/experimental/io.c 2009-03-30 18:13:14 UTC (rev 1268) @@ -2620,11 +2620,23 @@ rb_io_initialize(VALUE io, SEL sel, int argc, VALUE *argv) { VALUE file_descriptor, mode; - int mode_flags; - rb_io_t *io_struct = ExtractIOStruct(io); + int mode_flags, fd; + struct stat st; rb_scan_args(argc, argv, "11", &file_descriptor, &mode); + + rb_io_t *io_struct = ExtractIOStruct(io); + file_descriptor = rb_check_to_integer(file_descriptor, "to_int"); + if (NIL_P(file_descriptor)) { + rb_raise(rb_eTypeError, "can't convert %s into Integer", rb_obj_classname(file_descriptor)); + } + fd = FIX2INT(file_descriptor); + + if (fstat(fd, &st) < 0) { + rb_sys_fail(0); + } + mode_flags = (NIL_P(mode) ? FMODE_READABLE : convert_mode_string_to_fmode(mode)); - prepare_io_from_fd(io_struct, FIX2INT(file_descriptor), mode_flags); + prepare_io_from_fd(io_struct, fd, mode_flags); return io; } Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 17:06:29 UTC (rev 1267) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 18:13:14 UTC (rev 1268) @@ -31,6 +31,7 @@ closed to_i to_io + initialize } desc "Run all language known good spec files which should be fully green (does not use tags)" @@ -59,7 +60,7 @@ desc "Try to run IO tests" task :io do files = FileList["spec/frozen/core/io/{#{KNOWN_GOOD_CORE_IO.join(',')}}_spec.rb"] - sh "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run #{files.join(' ')}" + sh "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run -f s #{files.join(' ')}" end desc "Run language examples that are known to fail"

1 0

[1267] MacRuby/branches/experimental
by source_changes＠macosforge.org 30 Mar '09

30 Mar '09

Revision: 1267 http://trac.macosforge.org/projects/ruby/changeset/1267 Author: pthomson(a)apple.com Date: 2009-03-30 10:06:29 -0700 (Mon, 30 Mar 2009) Log Message: ----------- Got two additional specs working. Modified Paths: -------------- MacRuby/branches/experimental/io.c MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-30 16:51:22 UTC (rev 1266) +++ MacRuby/branches/experimental/io.c 2009-03-30 17:06:29 UTC (rev 1267) @@ -366,10 +366,10 @@ static bool rb_io_is_open(rb_io_t *io_struct) { - return (io_struct->readStream == NULL - || CFReadStreamGetStatus(io_struct->readStream) == kCFStreamStatusOpen) - && (io_struct->writeStream == NULL - || CFWriteStreamGetStatus(io_struct->writeStream) == kCFStreamStatusOpen); + // Either the readStream or the writeStream must be not null and open. + return ((io_struct->readStream == NULL) ? + (io_struct->writeStream != NULL && CFWriteStreamGetStatus(io_struct->writeStream) == kCFStreamStatusOpen) : + (CFReadStreamGetStatus(io_struct->readStream) == kCFStreamStatusOpen)); } static bool @@ -863,6 +863,9 @@ rb_io_fileno(VALUE io, SEL sel) { rb_io_t *io_struct = ExtractIOStruct(io); + if(!rb_io_is_open(io_struct)) { + rb_raise(rb_eIOError, "closed stream"); + } return INT2FIX(io_struct->fd); } Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 16:51:22 UTC (rev 1266) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 17:06:29 UTC (rev 1267) @@ -29,6 +29,8 @@ KNOWN_GOOD_CORE_IO = %w{ closed + to_i + to_io } desc "Run all language known good spec files which should be fully green (does not use tags)"

1 0

[1266] MacRuby/branches/experimental/rakelib/spec.rake
by source_changes＠macosforge.org 30 Mar '09

30 Mar '09

Revision: 1266 http://trac.macosforge.org/projects/ruby/changeset/1266 Author: pthomson(a)apple.com Date: 2009-03-30 09:51:22 -0700 (Mon, 30 Mar 2009) Log Message: ----------- Whoops - included a broken test in the known good ones. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 16:33:45 UTC (rev 1265) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 16:51:22 UTC (rev 1266) @@ -29,7 +29,6 @@ KNOWN_GOOD_CORE_IO = %w{ closed - tell } desc "Run all language known good spec files which should be fully green (does not use tags)"

1 0

[1265] MacRuby/branches/experimental
by source_changes＠macosforge.org 30 Mar '09

30 Mar '09

Revision: 1265 http://trac.macosforge.org/projects/ruby/changeset/1265 Author: pthomson(a)apple.com Date: 2009-03-30 09:33:45 -0700 (Mon, 30 Mar 2009) Log Message: ----------- Enabled one core/io test. Modified Paths: -------------- MacRuby/branches/experimental/include/ruby/ruby.h MacRuby/branches/experimental/io.c MacRuby/branches/experimental/rakelib/spec.rake MacRuby/branches/experimental/spec/frozen/core/io/shared/pos.rb Modified: MacRuby/branches/experimental/include/ruby/ruby.h =================================================================== --- MacRuby/branches/experimental/include/ruby/ruby.h 2009-03-30 12:56:11 UTC (rev 1264) +++ MacRuby/branches/experimental/include/ruby/ruby.h 2009-03-30 16:33:45 UTC (rev 1265) @@ -1108,7 +1108,7 @@ } #define NATIVE(obj) (rb_is_native((VALUE)obj)) -#define CONDITION_TO_BOOLEAN(c) (c ? Qtrue : Qfalse) +#define CONDITION_TO_BOOLEAN(c) ((c) ? Qtrue : Qfalse) VALUE rb_box_fixnum(VALUE); Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-30 12:56:11 UTC (rev 1264) +++ MacRuby/branches/experimental/io.c 2009-03-30 16:33:45 UTC (rev 1265) @@ -372,6 +372,22 @@ || CFWriteStreamGetStatus(io_struct->writeStream) == kCFStreamStatusOpen); } +static bool +rb_io_is_closed_for_reading(rb_io_t *io_struct) +{ + if (io_struct->readStream == NULL) return true; + CFStreamStatus s = CFReadStreamGetStatus(io_struct->readStream); + return ((s == kCFStreamStatusNotOpen) || (s == kCFStreamStatusClosed)); +} + +static bool +rb_io_is_closed_for_writing(rb_io_t *io_struct) +{ + if (io_struct->writeStream == NULL) return true; + CFStreamStatus s = CFWriteStreamGetStatus(io_struct->writeStream); + return ((s == kCFStreamStatusNotOpen) || (s == kCFStreamStatusClosed)); +} + /* * call-seq: * IO.try_convert(obj) -> io or nil @@ -1760,7 +1776,8 @@ static VALUE rb_io_closed(VALUE io, SEL sel) { - rb_notimplement(); + rb_io_t *ios = ExtractIOStruct(io); + return CONDITION_TO_BOOLEAN(rb_io_is_closed_for_writing(ios) && rb_io_is_closed_for_reading(ios)); } /* @@ -2191,7 +2208,13 @@ rb_f_open(VALUE klass, SEL sel, int argc, VALUE *argv) { VALUE io = rb_class_new_instance(argc, argv, rb_cFile); - return rb_file_open(io, argc, argv); + io = rb_file_open(io, argc, argv); + if (rb_block_given_p()) { + VALUE ret = rb_vm_yield(1, &io); + rb_io_close_m(io, 0); + return ret; + } + return io; } /* Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 12:56:11 UTC (rev 1264) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 16:33:45 UTC (rev 1265) @@ -27,6 +27,11 @@ while } + KNOWN_GOOD_CORE_IO = %w{ + closed + tell + } + desc "Run all language known good spec files which should be fully green (does not use tags)" task :green do files = FileList["spec/frozen/language/{#{KNOWN_GOOD.join(',')}}_spec.rb"] @@ -44,6 +49,18 @@ sh "./mspec/bin/mspec ci -B ./spec/frozen/macruby.mspec spec/frozen/language" end + desc "Try to run IO tests" + task :gdbio do + files = FileList["spec/frozen/core/io/{#{KNOWN_GOOD_CORE_IO.join(',')}}_spec.rb"] + sh "gdb --args ./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run #{files.join(' ')}" + end + + desc "Try to run IO tests" + task :io do + files = FileList["spec/frozen/core/io/{#{KNOWN_GOOD_CORE_IO.join(',')}}_spec.rb"] + sh "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run #{files.join(' ')}" + end + desc "Run language examples that are known to fail" task :fails do sh "./mspec/bin/mspec run -g fails -B ./spec/frozen/macruby.mspec spec/frozen/language" Modified: MacRuby/branches/experimental/spec/frozen/core/io/shared/pos.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/io/shared/pos.rb 2009-03-30 12:56:11 UTC (rev 1264) +++ MacRuby/branches/experimental/spec/frozen/core/io/shared/pos.rb 2009-03-30 16:33:45 UTC (rev 1265) @@ -1,4 +1,4 @@ -describe :io_pos, :shared => true do +describe(:io_pos, {:shared => true}) do before :each do @fname = 'test.txt' File.open @fname, 'w' do |f| f.write "123" end

1 0

[1264] MacRuby/branches/experimental/spec/frozen/language/for_spec.rb
by source_changes＠macosforge.org 30 Mar '09

30 Mar '09

Revision: 1264 http://trac.macosforge.org/projects/ruby/changeset/1264 Author: vincent.isambart(a)gmail.com Date: 2009-03-30 05:56:11 -0700 (Mon, 30 Mar 2009) Log Message: ----------- forgot to uncomment a working spec Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/for_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/language/for_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/for_spec.rb 2009-03-30 12:51:26 UTC (rev 1263) +++ MacRuby/branches/experimental/spec/frozen/language/for_spec.rb 2009-03-30 12:56:11 UTC (rev 1264) @@ -141,18 +141,16 @@ j.should == 13 end - # MacRuby TODO: This does not compile yet. - # - # it "repeats current iteration with 'redo'" do - # j = 0 - # for i in 1..3 - # j += i - # - # redo if i == 2 && j < 4 - # end - # - # j.should == 8 - # end + it "repeats current iteration with 'redo'" do + j = 0 + for i in 1..3 + j += i + + redo if i == 2 && j < 4 + end + + j.should == 8 + end end language_version __FILE__, "for" \ No newline at end of file

1 0