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

[1283] MacRuby/branches/experimental/bench.rb
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 1283 http://trac.macosforge.org/projects/ruby/changeset/1283 Author: lsansonetti(a)apple.com Date: 2009-03-31 14:01:08 -0700 (Tue, 31 Mar 2009) Log Message: ----------- added Method#call tests Modified Paths: -------------- MacRuby/branches/experimental/bench.rb Modified: MacRuby/branches/experimental/bench.rb =================================================================== --- MacRuby/branches/experimental/bench.rb 2009-03-31 20:55:46 UTC (rev 1282) +++ MacRuby/branches/experimental/bench.rb 2009-03-31 21:01:08 UTC (rev 1283) @@ -208,4 +208,24 @@ end end + # Method + bm.report('3000000 Method#call w/ 0 arg') do + o = Class1.new + m = o.method(:method1) + i=0 + while i<3000000 + m.call + i+=1 + end + end + bm.report('3000000 Method#call w/ 1 arg') do + o = Class1.new + m = o.method(:method2) + i=0 + while i<3000000 + m.call(i) + i+=1 + end + end + end

1 0

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

31 Mar '09

Revision: 1282 http://trac.macosforge.org/projects/ruby/changeset/1282 Author: lsansonetti(a)apple.com Date: 2009-03-31 13:55:46 -0700 (Tue, 31 Mar 2009) Log Message: ----------- added a failing test Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-31 11:05:18 UTC (rev 1281) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-31 20:55:46 UTC (rev 1282) @@ -1064,8 +1064,9 @@ } assert '42', "x=42; 1.times { 1.times { 1.times { p x } } }" + assert '42', "def f; 1.times { yield 42 }; end; f {|x| p x}" + assert '42', "def foo; x = 42; proc { x }; end; p foo.call" - assert '42', "def f; 1.times { yield 42 }; end; f {|x| p x}" end test "exception" do

1 0

[1281] MacRuby/branches/experimental/parse.y
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 1281 http://trac.macosforge.org/projects/ruby/changeset/1281 Author: vincent.isambart(a)gmail.com Date: 2009-03-31 04:05:18 -0700 (Tue, 31 Mar 2009) Log Message: ----------- x=42; 1.times { 1.times { p x } } should now work Modified Paths: -------------- MacRuby/branches/experimental/parse.y Modified: MacRuby/branches/experimental/parse.y =================================================================== --- MacRuby/branches/experimental/parse.y 2009-03-31 09:55:27 UTC (rev 1280) +++ MacRuby/branches/experimental/parse.y 2009-03-31 11:05:18 UTC (rev 1281) @@ -8899,12 +8899,41 @@ dyna_pop_gen(struct parser_params *parser) { struct vtable *tmp; + struct vtable *prev_vars = NULL, *prev_args = NULL; + prev_vars = lvtbl->vars->prev; + prev_args = lvtbl->args->prev; + + if ((prev_vars != NULL) && (prev_vars->prev != NULL)) { + // copy vars in the outer block if they are not already there + // and if they are in an even outer scope + int i; + for (i = 0; i < lvtbl->vars->pos; ++i) { + struct vtable *pprev_vars = NULL, *pprev_args = NULL; + ID id = lvtbl->vars->tbl[i]; + + if (vtable_included(prev_vars, id) || vtable_included(prev_args, id)) { + continue; + } + + pprev_vars = prev_vars->prev; + pprev_args = prev_args->prev; + while (pprev_vars != NULL) { + if (vtable_included(pprev_vars, id) || vtable_included(pprev_args, id)) { + vtable_add(prev_vars, id); + break; + } + pprev_vars = pprev_vars->prev; + pprev_args = pprev_args->prev; + } + } + } + tmp = lvtbl->args; - GC_WB(&lvtbl->args, lvtbl->args->prev); + GC_WB(&lvtbl->args, prev_args); vtable_free(tmp); tmp = lvtbl->vars; - GC_WB(&lvtbl->vars, lvtbl->vars->prev); + GC_WB(&lvtbl->vars, prev_vars); vtable_free(tmp); }

1 0

[1280] MacRuby/branches/experimental/spec/frozen/core/io/getc_spec.rb
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 1280 http://trac.macosforge.org/projects/ruby/changeset/1280 Author: eloy.de.enige(a)gmail.com Date: 2009-03-31 02:55:27 -0700 (Tue, 31 Mar 2009) Log Message: ----------- Fixed the IO#getc spec to work on 1.8 _and_ 1.9. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/core/io/getc_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/core/io/getc_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/io/getc_spec.rb 2009-03-31 09:45:07 UTC (rev 1279) +++ MacRuby/branches/experimental/spec/frozen/core/io/getc_spec.rb 2009-03-31 09:55:27 UTC (rev 1280) @@ -11,15 +11,28 @@ @file.close unless @file.closed? end - it "returns the next byte from the stream" do - @file.getc.should == 'V' - @file.getc.should == 'o' - @file.getc.should == 'i' - # read the rest of line - @file.readline.should == "ci la ligne une.\n" - @file.getc.should == 'Q' + ruby_version_is "" ... "1.9" do + it "returns the next byte from the stream" do + @file.getc.should == 86 + @file.getc.should == 111 + @file.getc.should == 105 + # read the rest of line + @file.readline.should == "ci la ligne une.\n" + @file.getc.should == 81 + end end + ruby_version_is "1.9" do + it "returns the next character from the stream" do + @file.getc.should == 'V' + @file.getc.should == 'o' + @file.getc.should == 'i' + # read the rest of line + @file.readline.should == "ci la ligne une.\n" + @file.getc.should == 'Q' + end + end + it "returns nil when invoked at the end of the stream" do # read entire content @file.read

1 0

[1279] MacRuby/branches/experimental/spec/frozen/tags/macruby
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 1279 http://trac.macosforge.org/projects/ruby/changeset/1279 Author: eloy.de.enige(a)gmail.com Date: 2009-03-31 02:45:07 -0700 (Tue, 31 Mar 2009) Log Message: ----------- Added tags for 4 failing examples in the IO#putc spec. Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/io/ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/io/putc_tags.txt Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/core/io/putc_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/io/putc_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/core/io/putc_tags.txt 2009-03-31 09:45:07 UTC (rev 1279) @@ -0,0 +1,4 @@ +fails:IO#putc writes Numerics that fit in a C char +fails:IO#putc writes the first byte of a String +fails:IO#putc writes the first byte of an object's string representation +fails:IO#putc write the first byte of Numerics that don't fit in a C char \ No newline at end of file

1 0

[1278] MacRuby/branches/experimental/spec/frozen/tags/macruby/core/
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 1278 http://trac.macosforge.org/projects/ruby/changeset/1278 Author: eloy.de.enige(a)gmail.com Date: 2009-03-31 02:43:33 -0700 (Tue, 31 Mar 2009) Log Message: ----------- Removed all 1.9 core tags from macruby tags. Removed Paths: ------------- MacRuby/branches/experimental/spec/frozen/tags/macruby/core/

1 0

[1277] MacRuby/branches/experimental/spec/frozen/core/kernel/eval_spec.rb
by source_changes＠macosforge.org 31 Mar '09

31 Mar '09

Revision: 1277 http://trac.macosforge.org/projects/ruby/changeset/1277 Author: lsansonetti(a)apple.com Date: 2009-03-30 19:01:28 -0700 (Mon, 30 Mar 2009) Log Message: ----------- added a new spec: eval should be aliasable Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/core/kernel/eval_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/core/kernel/eval_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/kernel/eval_spec.rb 2009-03-30 23:42:49 UTC (rev 1276) +++ MacRuby/branches/experimental/spec/frozen/core/kernel/eval_spec.rb 2009-03-31 02:01:28 UTC (rev 1277) @@ -157,6 +157,13 @@ eval("eval '__FILE__', binding", binding).should == __FILE__ eval("eval '__FILE__', binding", binding, 'success').should == 'success' end + + it "can be aliased" do + alias aliased_eval eval + x = 2 + aliased_eval('x += 40') + x.should == 42 + end end describe "Kernel.eval" do

1 0

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

30 Mar '09

Revision: 1276 http://trac.macosforge.org/projects/ruby/changeset/1276 Author: lsansonetti(a)apple.com Date: 2009-03-30 16:42:49 -0700 (Mon, 30 Mar 2009) Log Message: ----------- fixed the build (sorry guys) Modified Paths: -------------- MacRuby/branches/experimental/transcode.c Modified: MacRuby/branches/experimental/transcode.c =================================================================== --- MacRuby/branches/experimental/transcode.c 2009-03-30 23:10:32 UTC (rev 1275) +++ MacRuby/branches/experimental/transcode.c 2009-03-30 23:42:49 UTC (rev 1276) @@ -440,7 +440,7 @@ str_encode_bang(VALUE str, SEL sel, int argc, VALUE *argv) { /* TODO */ - return self; + return str; } #endif @@ -449,13 +449,13 @@ str_encode(VALUE str, SEL sel, int argc, VALUE *argv) { str = rb_str_dup(str); - return str_encode_bang(argc, argv, str); + return str_encode_bang(str, 0, argc, argv); } VALUE rb_str_transcode(VALUE str, VALUE to) { - return str_encode(1, &to, str); + return str_encode(str, 0, 1, &to); } void

1 0

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

30 Mar '09

Revision: 1275 http://trac.macosforge.org/projects/ruby/changeset/1275 Author: pthomson(a)apple.com Date: 2009-03-30 16:10:32 -0700 (Mon, 30 Mar 2009) Log Message: ----------- Added several more passing specs. By the way, type 'rake spec:io' to run them. Modified Paths: -------------- MacRuby/branches/experimental/io.c MacRuby/branches/experimental/rakelib/spec.rake MacRuby/branches/experimental/spec/frozen/core/io/getc_spec.rb MacRuby/branches/experimental/spec/frozen/core/io/readline_spec.rb Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-30 23:01:50 UTC (rev 1274) +++ MacRuby/branches/experimental/io.c 2009-03-30 23:10:32 UTC (rev 1275) @@ -663,7 +663,6 @@ { rb_io_t *io_struct = ExtractIOStruct(io); rb_io_assert_readable(io_struct); - rb_io_assert_writable(io_struct); // TODO: make this work with IO::SEEK_CUR, SEEK_END, etc. rb_io_read_stream_set_offset(io_struct->readStream, FIX2LONG(offset)); @@ -1210,7 +1209,7 @@ VALUE sep, limit; rb_scan_args(argc, argv, "02", &sep, &limit); rb_io_t *io_struct = ExtractIOStruct(io); - + rb_io_assert_readable(io_struct); if (rb_io_eof(io, 0) == Qtrue) { return Qnil; } @@ -2028,7 +2027,7 @@ FILE *process = macruby_popen(StringValueCStr(process_name), RSTRING_PTR(mode), &popen_pid); if (process == NULL) { - rb_raise(rb_eIOError, "system call to popen() failed"); + rb_sys_fail("call to popen() failed."); } VALUE io = prep_io(fileno(process), convert_mode_string_to_fmode(mode), klass); Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 23:01:50 UTC (rev 1274) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-30 23:10:32 UTC (rev 1275) @@ -30,8 +30,11 @@ KNOWN_GOOD_CORE_IO = %w{ closed fileno + io inspect + putc readchar + readline to_i to_io initialize @@ -56,12 +59,12 @@ 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" + desc "Run IO test with GDB enabled" task :gdbio do 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" + desc "Run the IO tests that pass" task :io do sh "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run -f s #{KNOWN_GOOD_CORE_IO_FILES.join(' ')}" end Modified: MacRuby/branches/experimental/spec/frozen/core/io/getc_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/io/getc_spec.rb 2009-03-30 23:01:50 UTC (rev 1274) +++ MacRuby/branches/experimental/spec/frozen/core/io/getc_spec.rb 2009-03-30 23:10:32 UTC (rev 1275) @@ -12,12 +12,12 @@ end it "returns the next byte from the stream" do - @file.getc.should == 86 - @file.getc.should == 111 - @file.getc.should == 105 + @file.getc.should == 'V' + @file.getc.should == 'o' + @file.getc.should == 'i' # read the rest of line @file.readline.should == "ci la ligne une.\n" - @file.getc.should == 81 + @file.getc.should == 'Q' end it "returns nil when invoked at the end of the stream" do Modified: MacRuby/branches/experimental/spec/frozen/core/io/readline_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/io/readline_spec.rb 2009-03-30 23:01:50 UTC (rev 1274) +++ MacRuby/branches/experimental/spec/frozen/core/io/readline_spec.rb 2009-03-30 23:10:32 UTC (rev 1275) @@ -31,7 +31,7 @@ it "raises EOFError on end of stream" do testfile = File.dirname(__FILE__) + '/fixtures/gets.txt' File.open(testfile, 'r') do |f| - lambda { loop { f.readline } }.should raise_error(EOFError) + lambda { while true; f.readline; end }.should raise_error(EOFError) end end

1 0

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

30 Mar '09

Revision: 1274 http://trac.macosforge.org/projects/ruby/changeset/1274 Author: lsansonetti(a)apple.com Date: 2009-03-30 16:01:50 -0700 (Mon, 30 Mar 2009) Log Message: ----------- fixed the eval tests Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-30 22:46:41 UTC (rev 1273) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-30 23:01:50 UTC (rev 1274) @@ -1270,15 +1270,15 @@ end -=begin test "eval" do assert "42", "p eval('40 + 2')" assert "42", "def foo; 42; end; p eval('foo')" assert "42", "x = 40; p eval('x + 2')" assert "42", "x = 0; eval('x = 42'); p x" - assert "42", "eval('x = 42'); p x" + assert ":ok", "eval('x = 42'); begin; p x; rescue NameError; p :ok; end" + assert "42", %q{ def foo(b); x = 42; eval('x', b); end p foo(nil) @@ -1298,11 +1298,18 @@ } assert "42", %q{ + def foo; x = 123; bar {}; x; end + def bar(&b); eval('x = 42', b.binding); end + p foo + } + + assert "42", %q{ class Foo; def foo; 42; end; def bar(s, b); eval(s, b); end; end - p Foo.new.bar('p foo', nil) + def foo; 123; end + Foo.new.bar('p foo', nil) } assert "42", %q{ @@ -1311,7 +1318,7 @@ def bar(s, b); eval(s, b); end; end def foo; 42; end - p Foo.new.bar('p foo', binding) + Foo.new.bar('p foo', binding) } assert "42", "class A; def foo; @x; end; end; x = A.new; x.instance_eval { @x = 42 }; p x.foo" @@ -1320,7 +1327,6 @@ assert ":ok", "module M; module_eval 'def self.foo; :ok; end'; end; p M.foo" end -=end test "regexp" do

1 0