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

[1053] MacRuby/branches/experimental/test_roxor.rb
by source_changes＠macosforge.org 22 Mar '09

22 Mar '09

Revision: 1053 http://trac.macosforge.org/projects/ruby/changeset/1053 Author: lsansonetti(a)apple.com Date: 2009-03-21 18:02:44 -0700 (Sat, 21 Mar 2009) Log Message: ----------- added a test case for a silly bug Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-22 00:49:07 UTC (rev 1052) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-22 01:02:44 UTC (rev 1053) @@ -849,6 +849,7 @@ assert ":ok", "def foo; p :ok if block_given?; end; foo {}" assert ":ok", "def foo; p :ok unless block_given?; end; foo" + assert ":ok", "def foo; p block_given?; end; def bar; foo; end; bar {}" assert ":ok", "def foo(&m); m.call; end; foo { p :ok }" assert ":ok", "def foo(&m); p :ok if m == nil; end; foo" @@ -1309,4 +1310,4 @@ assert ":ok", "File.open('#{__FILE__}', 'r') { p :ok }" -end \ No newline at end of file +end

1 0

[1052] MacRuby/branches/experimental
by source_changes＠macosforge.org 22 Mar '09

22 Mar '09

Revision: 1052 http://trac.macosforge.org/projects/ruby/changeset/1052 Author: lsansonetti(a)apple.com Date: 2009-03-21 17:49:07 -0700 (Sat, 21 Mar 2009) Log Message: ----------- fixed File.open by making sure IO.open calls alloc + initialize and that File#initialize is correctly implemented Modified Paths: -------------- MacRuby/branches/experimental/include/ruby/intern.h MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/include/ruby/intern.h =================================================================== --- MacRuby/branches/experimental/include/ruby/intern.h 2009-03-21 23:50:28 UTC (rev 1051) +++ MacRuby/branches/experimental/include/ruby/intern.h 2009-03-22 00:49:07 UTC (rev 1052) @@ -395,7 +395,6 @@ VALUE rb_io_printf(VALUE, SEL, int, VALUE *); VALUE rb_io_print(VALUE, SEL, int, VALUE *); VALUE rb_io_fdopen(int, int, const char*); -VALUE rb_file_open(const char*, const char*); VALUE rb_gets(void); void rb_write_error(const char*); void rb_write_error2(const char*, long); Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-21 23:50:28 UTC (rev 1051) +++ MacRuby/branches/experimental/io.c 2009-03-22 00:49:07 UTC (rev 1052) @@ -91,7 +91,8 @@ // return S_ISSOCK(sbuf.st_mode); // } -int convert_mode_string_to_fmode(VALUE rstr) +static int +convert_mode_string_to_fmode(VALUE rstr) { int fmode = 0; const char *m = RSTRING_PTR(rstr); @@ -312,6 +313,8 @@ static inline void prepare_io_from_fd(rb_io_t *io_struct, int fd, int mode) { + // TODO we should really get rid of these FMODE_* constants and instead always + // use the POSIX ones. CFReadStreamRef r = NULL; CFWriteStreamRef w = NULL; @@ -376,7 +379,7 @@ static VALUE prep_io(int fd, int mode, VALUE klass) { - VALUE io = io_alloc(rb_cIO, 0); + VALUE io = io_alloc(klass, 0); rb_io_t *io_struct = ExtractIOStruct(io); prepare_io_from_fd(io_struct, fd, mode); rb_objc_keep_for_exit_finalize((VALUE)io); @@ -2022,23 +2025,31 @@ */ static VALUE -rb_f_open(VALUE klass, SEL sel, int argc, VALUE *argv) +rb_file_open(VALUE io, int argc, VALUE *argv) { - // FIX THE HECK OUT OF ME!!!! - // TODO: Handle the pipes, subprocess, etc. // TODO: Take into account the provided file permissions. - // TODO: Handle files that don't exist. VALUE path, modes, permissions; rb_scan_args(argc, argv, "12", &path, &modes, &permissions); - if(NIL_P(modes)) { - modes = (VALUE)CFSTR("r"); + if (NIL_P(modes)) { + modes = (VALUE)CFSTR("r"); } StringValue(path); const char *filepath = RSTRING_PTR(path); int fd = open(filepath, convert_mode_string_to_oflags(modes)); - return prep_io(fd, convert_mode_string_to_fmode(modes), klass); + if (fd == -1) { + rb_sys_fail(NULL); + } + prepare_io_from_fd(ExtractIOStruct(io), fd, convert_mode_string_to_fmode(modes)); + return io; } +static VALUE +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); +} + /* * call-seq: * ios.reopen(other_IO) => ios @@ -2471,15 +2482,7 @@ static VALUE rb_file_initialize(VALUE io, SEL sel, int argc, VALUE *argv) { - // VALUE path, mode, permissions, io; - // rb_io_t *io_s; - // rb_scan_args(argc, argv, "12", &path, &mode, &permissions); - // // TODO: I completely ignore the mode and permissions here. Fix that. - // io = io_alloc(klass, sel); - // io_s = ExtractIOStruct(io); - // prepare_io_from_path(io_s, path, O_RDONLY | O_WRONLY); - // return io; - rb_notimplement(); + return rb_file_open(io, argc, argv); } /* @@ -2503,11 +2506,9 @@ static VALUE rb_io_s_new(VALUE klass, SEL sel, int argc, VALUE *argv) { - VALUE io = io_alloc(klass, sel); - return rb_io_initialize(io, sel, argc, argv); + return rb_class_new_instance(argc, argv, klass); } - static inline void argf_init(struct argf *p, VALUE v) { @@ -3122,10 +3123,10 @@ StringValue(fname); - const char *path = RSTRING_PTR(fname); - int fd = open(path, O_RDONLY); + const char *path = RSTRING_PTR(fname); + int fd = open(path, O_RDONLY); CFReadStreamRef readStream = _CFReadStreamCreateFromFileDescriptor(NULL, fd); - CFReadStreamOpen(readStream); + CFReadStreamOpen(readStream); if (!NIL_P(offset)) { long o = FIX2LONG(offset);

1 0

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

21 Mar '09

Revision: 1051 http://trac.macosforge.org/projects/ruby/changeset/1051 Author: eloy.de.enige(a)gmail.com Date: 2009-03-21 16:50:28 -0700 (Sat, 21 Mar 2009) Log Message: ----------- Call mspec correctly. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-21 23:49:52 UTC (rev 1050) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-21 23:50:28 UTC (rev 1051) @@ -13,7 +13,7 @@ desc "Run language examples" task :language 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" end namespace :workaround do

1 0

[1050] MacRuby/branches/experimental/test_roxor.rb
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1050 http://trac.macosforge.org/projects/ruby/changeset/1050 Author: eloy.de.enige(a)gmail.com Date: 2009-03-21 16:49:52 -0700 (Sat, 21 Mar 2009) Log Message: ----------- Added failing test for File.open with a string file mode. Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-21 23:25:58 UTC (rev 1049) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-21 23:49:52 UTC (rev 1050) @@ -1304,3 +1304,9 @@ assert '4', "def f(a, b, d, g); end; p method(:f).arity" end + +test "io" do + + assert ":ok", "File.open('#{__FILE__}', 'r') { p :ok }" + +end \ No newline at end of file

1 0

[1049] MacRuby/branches/experimental/roxor.cpp
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1049 http://trac.macosforge.org/projects/ruby/changeset/1049 Author: eloy.de.enige(a)gmail.com Date: 2009-03-21 16:25:58 -0700 (Sat, 21 Mar 2009) Log Message: ----------- Arg, reverted committed change to roxor debug. Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-21 23:22:43 UTC (rev 1048) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-21 23:25:58 UTC (rev 1049) @@ -1,7 +1,7 @@ /* ROXOR: the new MacRuby VM that rocks! */ #define ROXOR_COMPILER_DEBUG 0 -#define ROXOR_VM_DEBUG 1 +#define ROXOR_VM_DEBUG 0 #include <llvm/Module.h> #include <llvm/DerivedTypes.h>

1 0

[1048] MacRuby/branches/experimental
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1048 http://trac.macosforge.org/projects/ruby/changeset/1048 Author: eloy.de.enige(a)gmail.com Date: 2009-03-21 16:22:43 -0700 (Sat, 21 Mar 2009) Log Message: ----------- Moved current rake spec:language into spec:workaround:language and added a new spec:language which uses the spec/frozen/macruby.mspec script. This does not yet work, so use spec:workaround:language for now. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-21 23:11:15 UTC (rev 1047) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-21 23:22:43 UTC (rev 1048) @@ -8,14 +8,20 @@ # TODO: Still fails at another require statment. # It seems to spawns yet another process which also needs the proper laod path. # Anyways load paths are currently broken on roxor. Will find out a tmp workaround tonight. - sh "#{MSPEC}-ci -B spec/frozen/macruby.mspec" + sh "#{MSPEC} ci -B spec/frozen/macruby.mspec spec/frozen/language" end desc "Run language examples" task :language do - #sh "#{MSPEC} spec/frozen/language/**/*_spec.rb" - Dir.glob('spec/frozen/language/**/*_spec.rb').each do |spec| - sh "#{MSPEC}-run #{spec}" + sh "./mspec/bin/mspec ci -B spec/frozen/macruby.mspec spec/frozen/language" + end + + namespace :workaround do + desc "Run language examples with a workaround which uses mspec-run on each individual spec" + task :language do + Dir.glob('spec/frozen/language/**/*_spec.rb').each do |spec| + sh "#{MSPEC}-run #{spec}" + end end end Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-21 23:11:15 UTC (rev 1047) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-21 23:22:43 UTC (rev 1048) @@ -1,7 +1,7 @@ /* ROXOR: the new MacRuby VM that rocks! */ #define ROXOR_COMPILER_DEBUG 0 -#define ROXOR_VM_DEBUG 0 +#define ROXOR_VM_DEBUG 1 #include <llvm/Module.h> #include <llvm/DerivedTypes.h>

1 0

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

21 Mar '09

Revision: 1047 http://trac.macosforge.org/projects/ruby/changeset/1047 Author: eloy.de.enige(a)gmail.com Date: 2009-03-21 16:11:15 -0700 (Sat, 21 Mar 2009) Log Message: ----------- Added spec:1.9:language rake task which runs mspec-ci with the configuration in spec/frozen/ruby.1.9.mspec. The ci specs exclude the specs tagged as fails on 1.9 Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-21 13:57:04 UTC (rev 1046) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-21 23:11:15 UTC (rev 1047) @@ -18,4 +18,11 @@ sh "#{MSPEC}-run #{spec}" end end + + namespace :"1.9" do + desc "Run Ruby 1.9 language examples" + task :language do + sh "./mspec/bin/mspec ci -B spec/frozen/ruby.1.9.mspec spec/frozen/language" + end + end end \ No newline at end of file

1 0

[1046] MacRuby/branches/experimental/mspec/lib/mspec.rb
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1046 http://trac.macosforge.org/projects/ruby/changeset/1046 Author: eloy.de.enige(a)gmail.com Date: 2009-03-21 06:57:04 -0700 (Sat, 21 Mar 2009) Log Message: ----------- Cleaning. Modified Paths: -------------- MacRuby/branches/experimental/mspec/lib/mspec.rb Modified: MacRuby/branches/experimental/mspec/lib/mspec.rb =================================================================== --- MacRuby/branches/experimental/mspec/lib/mspec.rb 2009-03-21 08:03:57 UTC (rev 1045) +++ MacRuby/branches/experimental/mspec/lib/mspec.rb 2009-03-21 13:57:04 UTC (rev 1046) @@ -8,11 +8,4 @@ # If the implementation on which the specs are run cannot # load pp from the standard library, add a pp.rb file that # defines the #pretty_inspect method on Object or Kernel. -# require 'pp' - -# TODO: Need to check if this is enough. -# module Kernel -# def pretty_inspect(obj) -# puts obj.inspect -# end -# end \ No newline at end of file +# require 'pp' \ No newline at end of file

1 0

[1045] MacRuby/branches/experimental
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1045 http://trac.macosforge.org/projects/ruby/changeset/1045 Author: vincent.isambart(a)gmail.com Date: 2009-03-21 01:03:57 -0700 (Sat, 21 Mar 2009) Log Message: ----------- Fixed block arguments and corrected the last test not passing in Ruby 1.9 in test_roxor.rb Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-21 06:49:26 UTC (rev 1044) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-21 08:03:57 UTC (rev 1045) @@ -5075,9 +5075,9 @@ int dvars_size = b->dvars_size; rb_vm_arity_t arity = b->arity; - if (dvars_size > 0 || argc < arity.min || argc > b->arity.max) { + if (dvars_size > 0 || argc < arity.min || argc > arity.max) { VALUE *new_argv; - if (argc == 1 && TYPE(argv[0]) == T_ARRAY && arity.max > 1) { + if (argc == 1 && TYPE(argv[0]) == T_ARRAY && (arity.min > 1 || (arity.min == 1 && arity.min != arity.max))) { // Expand the array long ary_len = RARRAY_LEN(argv[0]); new_argv = (VALUE *)alloca(sizeof(VALUE) * ary_len); Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-21 06:49:26 UTC (rev 1044) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-21 08:03:57 UTC (rev 1045) @@ -891,7 +891,7 @@ assert "42", "n = 0; 100.times { |i| next if i % 2 == 0; n += 1; }; p n - 8" assert "42", "p 100.times { break 42 }" assert "42", "p proc { next 42 }.call" - assert "42", "p proc { break 42 }.call" + assert "42", "begin p proc { break 24 }.call rescue LocalJumpError; p 42 end" assert "42", "p [42].map { |x| x }.map { |y| y }[0]"

1 0

[1044] MacRuby/branches/experimental/test_roxor.rb
by source_changes＠macosforge.org 21 Mar '09

21 Mar '09

Revision: 1044 http://trac.macosforge.org/projects/ruby/changeset/1044 Author: vincent.isambart(a)gmail.com Date: 2009-03-20 23:49:26 -0700 (Fri, 20 Mar 2009) Log Message: ----------- added a test for the what seems to cause the infinite loop in mspec and also other tests (most do not pass yet) for block parameters Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-21 05:25:26 UTC (rev 1043) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-21 06:49:26 UTC (rev 1044) @@ -684,6 +684,12 @@ assert ":ok", "def foo(*args, &block); :ok; end; p foo" assert ":ok", "def foo(x, *args, &block); x; end; p foo(:ok)" + assert ":ok", %{ + def foo(&block) p(block ? :ko : :ok) end + def bar(&block) block.call() end + bar { foo } + } + assert "[1, nil, :c]", "def f(a, b = :b, c = :c) [a, b, c] end; p f(1, nil)" assert "[1, :b, :c, 2]\n[1, 2, :c, 3]\n[1, 2, 3, 4]", %{ def f(a, b = :b, c = :c, d) [a, b, c, d] end @@ -816,6 +822,30 @@ def foo; yield([1, 2]); end foo { |*rest| p rest } } + assert "[1, [2]]", %q{ + def foo; yield([1, 2]); end + foo { |a, *rest| p [a, rest] } + } + assert "[[1, 2], []]", %q{ + def foo; yield([1, 2]); end + foo { |a = 42, *rest| p [a, rest] } + } + assert "[1, 2, []]", %q{ + def foo; yield([1, 2]); end + foo { |a = 42, *rest, b| p [a, b, rest] } + } + assert "[1, 2, []]", %q{ + def foo; yield([1, 2]); end + foo { |a, b = 42, *rest| p [a, b, rest] } + } + assert "[[1, 2], 42, []]", %q{ + def foo; yield([1, 2]); end + foo { |a = 42, b = 42, *rest| p [a, b, rest] } + } + assert "[[1, 2], []]", %q{ + def foo; yield([1, 2]); end + foo { |a = 42, *rest| p [a, rest] } + } assert ":ok", "def foo; p :ok if block_given?; end; foo {}" assert ":ok", "def foo; p :ok unless block_given?; end; foo"

1 0