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

[1287] MacRuby/branches/experimental/io.c
by source_changes＠macosforge.org 01 Apr '09

01 Apr '09

Revision: 1287 http://trac.macosforge.org/projects/ruby/changeset/1287 Author: vincent.isambart(a)gmail.com Date: 2009-04-01 05:49:41 -0700 (Wed, 01 Apr 2009) Log Message: ----------- this should fix ungetc Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-04-01 12:49:35 UTC (rev 1286) +++ MacRuby/branches/experimental/io.c 2009-04-01 12:49:41 UTC (rev 1287) @@ -967,8 +967,8 @@ data_read = MIN(io_struct->ungetc_buf_len, len); memcpy(buffer, &io_struct->ungetc_buf[io_struct->ungetc_buf_pos], data_read); - io_struct->ungetc_buf_len -= len; - io_struct->ungetc_buf_pos += len; + io_struct->ungetc_buf_len -= data_read; + io_struct->ungetc_buf_pos += data_read; if (io_struct->ungetc_buf_len == 0) { xfree(io_struct->ungetc_buf); io_struct->ungetc_buf = NULL; @@ -1658,29 +1658,26 @@ } if (len > io_struct->ungetc_buf_pos) { - const long delta = io_struct->ungetc_buf_len - - io_struct->ungetc_buf_pos; - // Reallocate the buffer. GC_WB(&io_struct->ungetc_buf, xrealloc(io_struct->ungetc_buf, - delta + len)); + io_struct->ungetc_buf_len + len)); // Shift the buffer. - memmove(&io_struct->ungetc_buf[delta], - &io_struct->ungetc_buf[io_struct->ungetc_buf_pos], delta); + memmove(&io_struct->ungetc_buf[len], + &io_struct->ungetc_buf[io_struct->ungetc_buf_pos], io_struct->ungetc_buf_len); + + io_struct->ungetc_buf_pos = len; } // Update position. io_struct->ungetc_buf_pos -= len; - if (io_struct->ungetc_buf_pos < 0) { - io_struct->ungetc_buf_pos = 0; - } + assert(io_struct->ungetc_buf_pos >= 0); - // Copy the bytes at the position. + // Copy the bytes at the new position. memcpy(&io_struct->ungetc_buf[io_struct->ungetc_buf_pos], bytes, len); // Update buffer size. - io_struct->ungetc_buf_len += len - io_struct->ungetc_buf_pos; + io_struct->ungetc_buf_len += len; return Qnil; }

1 0

[1286] MacRuby/branches/experimental/test_roxor.rb
by source_changes＠macosforge.org 01 Apr '09

01 Apr '09

Revision: 1286 http://trac.macosforge.org/projects/ruby/changeset/1286 Author: vincent.isambart(a)gmail.com Date: 2009-04-01 05:49:35 -0700 (Wed, 01 Apr 2009) Log Message: ----------- added one more failing ungetc test Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-04-01 12:26:52 UTC (rev 1285) +++ MacRuby/branches/experimental/test_roxor.rb 2009-04-01 12:49:35 UTC (rev 1286) @@ -1500,6 +1500,15 @@ assert "true", "p(Dir['*.c'].length > 1)" assert "true", "p(Dir.glob('*.c').length > 1)" assert '', "#!ruby\n;" # fails because of a bug in ungetc that makes ruby read "!\n;" + assert '"abcdef"', %{ + f = File.open('#{__FILE__}') + f.ungetc("\n") + f.ungetc("f") + f.ungetc("de") + f.ungetc("c") + f.ungetc("ab") + p f.gets.strip + } end

1 0

[1285] MacRuby/branches/experimental/test_roxor.rb
by source_changes＠macosforge.org 01 Apr '09

01 Apr '09

Revision: 1285 http://trac.macosforge.org/projects/ruby/changeset/1285 Author: vincent.isambart(a)gmail.com Date: 2009-04-01 05:26:52 -0700 (Wed, 01 Apr 2009) Log Message: ----------- added test failing because of a bug in ungetc Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-04-01 04:45:06 UTC (rev 1284) +++ MacRuby/branches/experimental/test_roxor.rb 2009-04-01 12:26:52 UTC (rev 1285) @@ -1499,6 +1499,7 @@ assert "true", "p(Dir['*.c'].length > 1)" assert "true", "p(Dir.glob('*.c').length > 1)" + assert '', "#!ruby\n;" # fails because of a bug in ungetc that makes ruby read "!\n;" end

1 0

[1284] MacRuby/branches/experimental/test_roxor.rb
by source_changes＠macosforge.org 01 Apr '09

01 Apr '09

Revision: 1284 http://trac.macosforge.org/projects/ruby/changeset/1284 Author: lsansonetti(a)apple.com Date: 2009-03-31 21:45:06 -0700 (Tue, 31 Mar 2009) Log Message: ----------- adding more failing tests Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-31 21:01:08 UTC (rev 1283) +++ MacRuby/branches/experimental/test_roxor.rb 2009-04-01 04:45:06 UTC (rev 1284) @@ -1065,7 +1065,14 @@ 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', %q{ + def foo() x=1; [proc { x }, proc {|z| x = z}]; end + a, b = foo + b.call(42) + p a.call + } end @@ -1304,6 +1311,11 @@ p foo } + assert '42', %q{ + def foo; x = 42; proc {}; end + p = foo; eval('p x', p.binding) + } + assert "42", %q{ class Foo; def foo; 42; end;

1 0