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

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

30 Mar '09

Revision: 1263 http://trac.macosforge.org/projects/ruby/changeset/1263 Author: vincent.isambart(a)gmail.com Date: 2009-03-30 05:51:26 -0700 (Mon, 30 Mar 2009) Log Message: ----------- I should have kept a little more of Laurent's code for 'for'. Now it should work fine. Modified Paths: -------------- MacRuby/branches/experimental/parse.y Modified: MacRuby/branches/experimental/parse.y =================================================================== --- MacRuby/branches/experimental/parse.y 2009-03-30 12:32:34 UTC (rev 1262) +++ MacRuby/branches/experimental/parse.y 2009-03-30 12:51:26 UTC (rev 1263) @@ -2905,10 +2905,13 @@ } } - tbl = ALLOC_N(ID, vtable_size(lvtbl->vars) + 3); + int args_count = vtable_size(lvtbl->args); + int vars_count = vtable_size(lvtbl->vars); + tbl = ALLOC_N(ID, args_count + vars_count + 3); tbl[0] = 1; tbl[1] = id; - tbl[2] = vtable_size(lvtbl->vars); - vtable_tblcpy(tbl+3, lvtbl->vars); + tbl[2] = args_count + vars_count; + vtable_tblcpy(tbl+3, lvtbl->args); + vtable_tblcpy(tbl+3+args_count, lvtbl->vars); scope = NEW_NODE(NODE_SCOPE, tbl, $8, args); $$ = NEW_FOR(0, $5, scope);

1 0

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

30 Mar '09

Revision: 1262 http://trac.macosforge.org/projects/ruby/changeset/1262 Author: vincent.isambart(a)gmail.com Date: 2009-03-30 05:32:34 -0700 (Mon, 30 Mar 2009) Log Message: ----------- added a failing 'for' test Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-30 12:18:02 UTC (rev 1261) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-30 12:32:34 UTC (rev 1262) @@ -514,6 +514,14 @@ assert "42", "a=[20,10,5,5,1,1]; n = 0; for i in a; n+=i; end; p n" assert "42", "a=[1,1,1,42]; for i in a; end; p i" + assert '42', %{ + def f(x) + for y in 1..1 + p x + end + end + f(42) + } assert "42", "x = while true; break 42; end; p x" assert "nil", "x = while true; break; end; p x"

1 0

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

30 Mar '09

Revision: 1261 http://trac.macosforge.org/projects/ruby/changeset/1261 Author: vincent.isambart(a)gmail.com Date: 2009-03-30 05:18:02 -0700 (Mon, 30 Mar 2009) Log Message: ----------- added a failing test (yield in a block) It's at least one the reasons some for specs fail Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-30 11:53:26 UTC (rev 1260) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-30 12:18:02 UTC (rev 1261) @@ -1057,6 +1057,7 @@ 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}" end test "exception" do

1 0

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

30 Mar '09

Revision: 1260 http://trac.macosforge.org/projects/ruby/changeset/1260 Author: vincent.isambart(a)gmail.com Date: 2009-03-30 04:53:26 -0700 (Mon, 30 Mar 2009) Log Message: ----------- 'for' now mostly works I brought a few changes to parse.y from 1.9 and fixed it to work with MR. I also uncommented the 'for' statements in the specs because they are now compiling (and most are working fine). There is still one commented out spec that does not compile (node not implemented). Modified Paths: -------------- MacRuby/branches/experimental/parse.y MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/spec/frozen/language/for_spec.rb MacRuby/branches/experimental/spec/frozen/tags/macruby/language/for_tags.txt Modified: MacRuby/branches/experimental/parse.y =================================================================== --- MacRuby/branches/experimental/parse.y 2009-03-30 03:02:03 UTC (rev 1259) +++ MacRuby/branches/experimental/parse.y 2009-03-30 11:53:26 UTC (rev 1260) @@ -2863,11 +2863,11 @@ * #=> * e.each{|x| a, = x} */ - ID id = rb_intern("__i__"); //internal_id(); + ID id = internal_id(); + ID *tbl; NODE *m = NEW_ARGS_AUX(0, 0); NODE *args, *scope; -#if 0 if (nd_type($2) == NODE_MASGN) { /* if args.length == 1 && args[0].kind_of?(Array) * args = args[0] @@ -2883,37 +2883,33 @@ NEW_CALL(NEW_CALL(NEW_DVAR(id), rb_intern("[]"), zero), rb_intern("kind_of?"), NEW_LIST(NEW_LIT(rb_cArray))), 0), - NEW_DASGN_CURR(id, - NEW_CALL(NEW_DVAR(id), rb_intern("[]"), zero)), - 0), + NEW_DASGN_CURR(id, + NEW_CALL(NEW_DVAR(id), rb_intern("[]"), zero)), + 0), node_assign($2, NEW_DVAR(id)))); + + args = new_args(m, 0, id, 0, 0); } else { - GC_WB(&m->nd_next, node_assign(NEW_MASGN(NEW_LIST($2), 0), NEW_DVAR(id))); + if (nd_type($2) == NODE_LASGN || + nd_type($2) == NODE_DASGN || + nd_type($2) == NODE_DASGN_CURR) { + GC_WB(&$2->nd_value, NEW_DVAR(id)); + m->nd_plen = 1; + GC_WB(&m->nd_next, $2); + args = new_args(m, 0, 0, 0, 0); + } + else { + GC_WB(&m->nd_next, node_assign(NEW_MASGN(NEW_LIST($2), 0), NEW_DVAR(id))); + args = new_args(m, 0, id, 0, 0); + } } -#endif - // TODO this doesn't work in multiple iterator variables are - // passed to 'for'. + tbl = ALLOC_N(ID, vtable_size(lvtbl->vars) + 3); + tbl[0] = 1; tbl[1] = id; + tbl[2] = vtable_size(lvtbl->vars); + vtable_tblcpy(tbl+3, lvtbl->vars); - args = new_args(m, 0, id, 0, 0); - - NODE *block = $8; - if (nd_type(block) != NODE_BLOCK) { - block = NEW_BLOCK(block); - } - NODE *new_block = NEW_BLOCK(NEW_DASGN($2->nd_vid, NEW_DVAR(id))); - GC_WB(&new_block->nd_next, block); - $8 = new_block; - - int cnt = vtable_size(lvtbl->args) + 1 + vtable_size(lvtbl->vars); - ID *tbl = ALLOC_N(ID, cnt + 2); - tbl[0] = vtable_size(lvtbl->args) + 1; - tbl[1] = id; - vtable_tblcpy(tbl+2, lvtbl->args); - tbl[vtable_size(lvtbl->args) + 2] = vtable_size(lvtbl->vars); - vtable_tblcpy(tbl+vtable_size(lvtbl->args)+3, lvtbl->vars); - scope = NEW_NODE(NODE_SCOPE, tbl, $8, args); $$ = NEW_FOR(0, $5, scope); fixpos($$, $2); Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-30 03:02:03 UTC (rev 1259) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-30 11:53:26 UTC (rev 1260) @@ -293,6 +293,9 @@ bool do_assert) { std::map<ID, Value *>::iterator iter = container.find(name); if (do_assert) { +#if ROXOR_COMPILER_DEBUG + printf("get_var %s\n", rb_id2name(name)); +#endif assert(iter != container.end()); return iter->second; } Modified: MacRuby/branches/experimental/spec/frozen/language/for_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/for_spec.rb 2009-03-30 03:02:03 UTC (rev 1259) +++ MacRuby/branches/experimental/spec/frozen/language/for_spec.rb 2009-03-30 11:53:26 UTC (rev 1260) @@ -12,20 +12,18 @@ j.should == 6 end - # MacRuby TODO: This does not compile yet. - # - # it "iterates over an Hash passing each key-value pair to the block" do - # k = 0 - # l = 0 - # - # for i, j in { 1 => 10, 2 => 20 } - # k += i - # l += j - # end - # - # k.should == 3 - # l.should == 30 - # end + it "iterates over an Hash passing each key-value pair to the block" do + k = 0 + l = 0 + + for i, j in { 1 => 10, 2 => 20 } + k += i + l += j + end + + k.should == 3 + l.should == 30 + end it "iterates over any object responding to 'each'" do class XYZ @@ -41,17 +39,15 @@ j.should == 55 end - # MacRuby TODO: This does not compile yet. - # - # it "allows an instance variable as an iterator name" do - # m = [1,2,3] - # n = 0 - # for @var in m - # n += 1 - # end - # @var.should == 3 - # n.should == 3 - # end + it "allows an instance variable as an iterator name" do + m = [1,2,3] + n = 0 + for @var in m + n += 1 + end + @var.should == 3 + n.should == 3 + end # TODO: commented out due to a compiler error #it "allows a class variable as an iterator name" do @@ -112,12 +108,10 @@ a.should == 123 end - # MacRuby TODO: This does not compile yet. - # - # it "returns expr" do - # for i in 1..3; end.should == (1..3) - # for i,j in { 1 => 10, 2 => 20 }; end.should == { 1 => 10, 2 => 20 } - # end + it "returns expr" do + for i in 1..3; end.should == (1..3) + for i,j in { 1 => 10, 2 => 20 }; end.should == { 1 => 10, 2 => 20 } + end it "breaks out of a loop upon 'break', returning nil" do j = 0 Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/for_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/for_tags.txt 2009-03-30 03:02:03 UTC (rev 1259) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/for_tags.txt 2009-03-30 11:53:26 UTC (rev 1260) @@ -1,8 +1,2 @@ -fails:The for expression iterates over an Enumerable passing each element to the block fails:The for expression iterates over any object responding to 'each' -fails:The for expression splats multiple arguments together if there are fewer arguments than values -fails:The for expression optionally takes a 'do' after the expression -fails:The for expression allows body begin on the same line if do is used -fails:The for expression breaks out of a loop upon 'break', returning nil -fails:The for expression allows 'break' to have an argument which becomes the value of the for expression -fails:The for expression starts the next iteration with 'next' \ No newline at end of file +fails:The for expression splats multiple arguments together if there are fewer arguments than values \ No newline at end of file

1 0

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

30 Mar '09

Revision: 1259 http://trac.macosforge.org/projects/ruby/changeset/1259 Author: pthomson(a)apple.com Date: 2009-03-29 20:02:03 -0700 (Sun, 29 Mar 2009) Log Message: ----------- Removed some unused #includes from io.c. The specs and test_roxor still work correctly. Modified Paths: -------------- MacRuby/branches/experimental/include/ruby/io.h MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/include/ruby/io.h =================================================================== --- MacRuby/branches/experimental/include/ruby/io.h 2009-03-29 23:33:34 UTC (rev 1258) +++ MacRuby/branches/experimental/include/ruby/io.h 2009-03-30 03:02:03 UTC (rev 1259) @@ -59,17 +59,18 @@ #define FMODE_WSPLIT_INITIALIZED 0x400 #define FMODE_TRUNC 0x00000800 #define FMODE_TEXTMODE 0x00001000 +#define FMODE_SYNCWRITE (FMODE_SYNC|FMODE_WRITABLE) - #ifndef SEEK_CUR # define SEEK_SET 0 # define SEEK_CUR 1 # define SEEK_END 2 #endif -#define FMODE_SYNCWRITE (FMODE_SYNC|FMODE_WRITABLE) +#ifndef O_ACCMODE +#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) +#endif - VALUE rb_io_taint_check(VALUE); NORETURN(void rb_eof_error(void)); Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-29 23:33:34 UTC (rev 1258) +++ MacRuby/branches/experimental/io.c 2009-03-30 03:02:03 UTC (rev 1259) @@ -11,39 +11,23 @@ #include "ruby/ruby.h" #include "ruby/io.h" -#include "ruby/signal.h" +#include "ruby/util.h" #include "ruby/node.h" #include "roxor.h" -#include <ctype.h> -#include <errno.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/select.h> -#include <sys/types.h> -#include <sys/ioctl.h> +#include <errno.h> #include <paths.h> #include <fcntl.h> +#include <unistd.h> +#include <sys/select.h> +#include <sys/ioctl.h> #include <sys/stat.h> - #include <sys/param.h> - -#if !defined NOFILE -# define NOFILE 64 -#endif - -#include <unistd.h> #include <sys/syscall.h> extern void Init_File(void); -#include "ruby/util.h" - -#ifndef O_ACCMODE -#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) -#endif - #if SIZEOF_OFF_T > SIZEOF_LONG && !defined(HAVE_LONG_LONG) # error off_t is bigger than long, but you have no long long... #endif @@ -1883,7 +1867,7 @@ static VALUE rb_io_sysseek(VALUE io, SEL sel, int argc, VALUE *argv) { -rb_notimplement(); +rb_notimplement(); } /*

1 0

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

29 Mar '09

Revision: 1258 http://trac.macosforge.org/projects/ruby/changeset/1258 Author: lsansonetti(a)apple.com Date: 2009-03-29 16:33:34 -0700 (Sun, 29 Mar 2009) Log Message: ----------- added a simple test for #eval Modified Paths: -------------- MacRuby/branches/experimental/bench.rb Modified: MacRuby/branches/experimental/bench.rb =================================================================== --- MacRuby/branches/experimental/bench.rb 2009-03-29 23:33:18 UTC (rev 1257) +++ MacRuby/branches/experimental/bench.rb 2009-03-29 23:33:34 UTC (rev 1258) @@ -198,4 +198,14 @@ end end + # Eval + bm.report('1000 eval') do + i=0 + s = "#{1+1}+#{20+20}" + while i<1000 + eval(s) + i+=1 + end + end + end

1 0

[1257] MacRuby/branches/experimental/io.c
by source_changes＠macosforge.org 29 Mar '09

29 Mar '09

Revision: 1257 http://trac.macosforge.org/projects/ruby/changeset/1257 Author: lsansonetti(a)apple.com Date: 2009-03-29 16:33:18 -0700 (Sun, 29 Mar 2009) Log Message: ----------- reverted patrick's gets implementation because it's buggy (breaks #require of one liners) + fixed the indentation Modified Paths: -------------- MacRuby/branches/experimental/io.c Modified: MacRuby/branches/experimental/io.c =================================================================== --- MacRuby/branches/experimental/io.c 2009-03-29 10:46:50 UTC (rev 1256) +++ MacRuby/branches/experimental/io.c 2009-03-29 23:33:18 UTC (rev 1257) @@ -1204,66 +1204,83 @@ static VALUE rb_io_gets_m(VALUE io, SEL sel, int argc, VALUE *argv) { - VALUE sep, limit; - rb_scan_args(argc, argv, "02", &sep, &limit); - rb_io_t *io_struct = ExtractIOStruct(io); - - if (rb_io_eof(io, 0) == Qtrue) { - return Qnil; + VALUE sep, limit; + rb_scan_args(argc, argv, "02", &sep, &limit); + rb_io_t *io_struct = ExtractIOStruct(io); + + if (rb_io_eof(io, 0) == Qtrue) { + return Qnil; + } + + if (NIL_P(rb_rs)) { + // TODO: Get rid of this when the fix comes in for the $\ variable. + rb_rs = (VALUE)CFSTR("\n"); + } + + if (NIL_P(sep)) { + // no arguments were passed at all. + // FIXME: if you pass nil, it's suppose to read everything. that sucks. + sep = rb_rs; + limit = Qnil; + } + else { + if (TYPE(sep) != T_STRING) { + // sep wasn't given, limit was. + limit = sep; + sep = rb_rs; + } + else if (RSTRING_LEN(sep) == 0) { + sep = (VALUE)CFSTR("\n\n"); } - - if (NIL_P(rb_rs)) { - // TODO: Get rid of this when the fix comes in for the $\ variable. - rb_rs = (VALUE)CFSTR("\n"); + } + long line_limit = (NIL_P(limit) ? -1 : FIX2LONG(limit)); + // now that we've got our parameters, let's get down to business. + + VALUE bstr = rb_bytestring_new(); + CFMutableDataRef data = rb_bytestring_wrapped_data(bstr); + if (line_limit != -1) { + CFDataIncreaseLength(data, line_limit); + UInt8 *b = CFDataGetMutableBytePtr(data); + rb_io_read_internal(io_struct, b, line_limit); + CFRange r = CFStringFind((CFStringRef)bstr, (CFStringRef)sep, 0); + if (r.location != kCFNotFound) { + CFDataSetLength(data, r.location); } - - if (NIL_P(sep)) { - // no arguments were passed at all. - // FIXME: if you pass nil, it's suppose to read everything. that sucks. - sep = rb_rs; - limit = Qnil; - } else { - if (TYPE(sep) != T_STRING) { - // sep wasn't given, limit was. - limit = sep; - sep = rb_rs; - } else if (RSTRING_LEN(sep) == 0) { - sep = (VALUE)CFSTR("\n\n"); - } + } + else { + long s = 512; + CFDataSetLength(data, s); + + const char *sepstr = RSTRING_PTR(sep); + const int seplen = RSTRING_LEN(sep); + assert(seplen > 0); + UInt8 *buf = CFDataGetMutableBytePtr(data); + UInt8 *tmp_buf = alloca(seplen); + long data_read = 0; + + while (true) { + if (rb_io_read_internal(io_struct, tmp_buf, seplen) != seplen) { + break; + } + if (data_read >= s) { + s += s; + CFDataSetLength(data, s); + buf = CFDataGetMutableBytePtr(data); + } + memcpy(&buf[data_read], tmp_buf, seplen); + data_read += seplen; + + if (memcmp(tmp_buf, sepstr, seplen) == 0) { + break; + } } - long line_limit = (NIL_P(limit) ? -1 : FIX2LONG(limit)); - // now that we've got our parameters, let's get down to business. - - VALUE bstr = rb_bytestring_new(); - CFMutableDataRef data = rb_bytestring_wrapped_data(bstr); - // this is not the best code i've ever written, but it'll do. - if(line_limit != -1) { - CFDataIncreaseLength(data, line_limit); - UInt8 *b = CFDataGetMutableBytePtr(data); - rb_io_read_internal(io_struct, b, line_limit); - CFRange r = CFStringFind((CFStringRef)bstr, (CFStringRef)sep, 0); - if (r.location != kCFNotFound) { - CFDataSetLength(data, r.location); - } - } else { - // Though this isn't the worst possible implementation, it could - // certainly use a little work. If it causes problems we'll take a look at it. - long string_offset = 0; - int seplen = RSTRING_LEN(sep); - for(;;) { - CFDataIncreaseLength(data, seplen); - UInt8 *b = CFDataGetMutableBytePtr(data) + string_offset; - long read = rb_io_read_internal(io_struct, b, seplen); - CFRange r = CFStringFind((CFStringRef)bstr, (CFStringRef)sep, 0); - if ((r.location != kCFNotFound) || (rb_io_eof(io, 0) == Qtrue)) { - CFDataSetLength(data, r.location + (seplen)); - break; - } else { - string_offset += read; - } - } + + if (data_read == 0) { + return Qnil; } - + CFDataSetLength(data, data_read); + } + return bstr; } @@ -1331,9 +1348,11 @@ static VALUE rb_io_readline(VALUE io, SEL sel, int argc, VALUE *argv) { - VALUE ret = rb_io_gets_m(io, sel, argc, argv); - if(NIL_P(ret)) rb_eof_error(); - return ret; + VALUE ret = rb_io_gets_m(io, sel, argc, argv); + if (NIL_P(ret)) { + rb_eof_error(); + } + return ret; } /* @@ -1845,7 +1864,7 @@ VALUE rb_io_gets(VALUE io, SEL sel) { - return rb_io_gets_m(io, sel, 0, NULL); + return rb_io_gets_m(io, 0, 0, NULL); } /*

1 0

[1256] MacRuby/branches/experimental
by source_changes＠macosforge.org 29 Mar '09

29 Mar '09

Revision: 1256 http://trac.macosforge.org/projects/ruby/changeset/1256 Author: eloy.de.enige(a)gmail.com Date: 2009-03-29 03:46:50 -0700 (Sun, 29 Mar 2009) Log Message: ----------- Commented a require statement in constants_spec.rb which does not compile yet, tagged remaining failing examples. Now that we can at least load all language spec files, I removed the partially green files and simply load "spec/frozen/language" instead of every single spec file. I might bring this back when we need so for the other spec suites. Use spec:partially_green to run the spec files which are not fully green yet without any tags. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake MacRuby/branches/experimental/spec/frozen/language/constants_spec.rb Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/constants_tags.txt Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 10:46:34 UTC (rev 1255) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 10:46:50 UTC (rev 1256) @@ -27,59 +27,28 @@ while } - KNOWN_PARTIALLY_GOOD = %w{ - alias - block - break - catch - class - def - eigenclass - encoding - ensure - for - loop - magic_comment - metaclass - method - next - predefined - private - regexp - rescue - return - throw - undef - variables - yield - } - - KNOWN_GOOD_AND_PARTIALLY_GOOD_FILES = - FileList["spec/frozen/language/{#{(KNOWN_GOOD + KNOWN_PARTIALLY_GOOD).join(',')}}_spec.rb"] - - desc "Run all language known good spec files which should be fully green" + 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"] sh "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run #{files.join(' ')}" end + desc "Run all partially good language spec files which are not yet fully green (does not use tags)" + task :partially_green do + files = Dir["spec/frozen/language/*_spec.rb"] - FileList["spec/frozen/language/{#{KNOWN_GOOD.join(',')}}_spec.rb"] + sh "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run #{files.join(' ')}" + end + desc "Run continuous integration language examples (all known good examples)" task :ci do - sh "./mspec/bin/mspec ci -B ./spec/frozen/macruby.mspec #{KNOWN_GOOD_AND_PARTIALLY_GOOD_FILES.join(' ')}" + sh "./mspec/bin/mspec ci -B ./spec/frozen/macruby.mspec spec/frozen/language" 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 #{KNOWN_GOOD_AND_PARTIALLY_GOOD_FILES.join(' ')}" + sh "./mspec/bin/mspec run -g fails -B ./spec/frozen/macruby.mspec spec/frozen/language" end - namespace :list do - desc "List all spec language spec files which do not load yet" - task :not_loadable do - puts((Dir['spec/frozen/language/*_spec.rb'] - KNOWN_GOOD_AND_PARTIALLY_GOOD_FILES).join("\n")) - end - end - %w{ fails critical }.each do |tag| namespace :list do # We cheat by using the fact that currently the ruby.1.9.mspec script uses the macruby tags, @@ -93,7 +62,7 @@ namespace :"1.9" do desc "Run roxor language specs tagged `#{tag}' against Ruby 1.9 (use this to look for possible 1.8/1.9 incompatibility bugs)" task tag do - sh "./mspec/bin/mspec run -g #{tag} -B ./spec/frozen/ruby.1.9.mspec #{KNOWN_GOOD_AND_PARTIALLY_GOOD_FILES.join(' ')}" + sh "./mspec/bin/mspec run -g #{tag} -B ./spec/frozen/ruby.1.9.mspec spec/frozen/language" end end end Modified: MacRuby/branches/experimental/spec/frozen/language/constants_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/constants_spec.rb 2009-03-29 10:46:34 UTC (rev 1255) +++ MacRuby/branches/experimental/spec/frozen/language/constants_spec.rb 2009-03-29 10:46:50 UTC (rev 1256) @@ -1,6 +1,8 @@ require File.dirname(__FILE__) + '/../spec_helper' -require File.dirname(__FILE__) + '/../fixtures/constants' +# MacRuby TODO: This file does not compile yet, causing most examples to fail. +#require File.dirname(__FILE__) + '/../fixtures/constants' + # Read the documentation in fixtures/constants.rb for the guidelines and # rationale for the structure and organization of these specs. Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/constants_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/constants_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/constants_tags.txt 2009-03-29 10:46:50 UTC (rev 1256) @@ -0,0 +1,39 @@ +fails:Literal (A::X) constant resolution sends #const_missing to the original class or module scope +fails:Literal (A::X) constant resolution evaluates the qualifier +fails:Literal (A::X) constant resolution raises a TypeError if a non-class or non-module qualifier is given +fails:Literal (A::X) constant resolution with statically assigned constants searches the immediate class or module scope first +fails:Literal (A::X) constant resolution with statically assigned constants searches a module included in the immediate class before the superclass +fails:Literal (A::X) constant resolution with statically assigned constants searches the superclass before a module included in the superclass +fails:Literal (A::X) constant resolution with statically assigned constants searches a module included in the superclass +fails:Literal (A::X) constant resolution with statically assigned constants searches the superclass chain +fails:Literal (A::X) constant resolution with statically assigned constants searches Object if no class or module qualifier is given +fails:Literal (A::X) constant resolution with statically assigned constants searches Object if a toplevel qualifier (::X) is given +fails:Literal (A::X) constant resolution with dynamically assigned constants searches the immediate class or module scope first +fails:Literal (A::X) constant resolution with dynamically assigned constants searches a module included in the immediate class before the superclass +fails:Literal (A::X) constant resolution with dynamically assigned constants searches the superclass before a module included in the superclass +fails:Literal (A::X) constant resolution with dynamically assigned constants searches a module included in the superclass +fails:Literal (A::X) constant resolution with dynamically assigned constants searches the superclass chain +fails:Literal (A::X) constant resolution with dynamically assigned constants does not search the singleton class of the class or module +fails:Literal (A::X) constant resolution with dynamically assigned constants returns the updated value when a constant is reassigned +fails:Constant resolution within methods sends #const_missing to the original class or module scope +fails:Constant resolution within methods with statically assigned constants searches the immediate class or module scope first +fails:Constant resolution within methods with statically assigned constants searches a module included in the immediate class before the superclass +fails:Constant resolution within methods with statically assigned constants searches the superclass before a module included in the superclass +fails:Constant resolution within methods with statically assigned constants searches a module included in the superclass +fails:Constant resolution within methods with statically assigned constants searches the superclass chain +fails:Constant resolution within methods with statically assigned constants searches the lexical scope of the method not the receiver's immediate class +fails:Constant resolution within methods with statically assigned constants searches the lexical scope of a singleton method +fails:Constant resolution within methods with statically assigned constants searches the lexical scope of a block +fails:Constant resolution within methods with statically assigned constants searches Object as a lexical scope only if Object is explicitly opened +fails:Constant resolution within methods with dynamically assigned constants searches the immediate class or module scope first +fails:Constant resolution within methods with dynamically assigned constants searches a module included in the immediate class before the superclass +fails:Constant resolution within methods with dynamically assigned constants searches the superclass before a module included in the superclass +fails:Constant resolution within methods with dynamically assigned constants searches a module included in the superclass +fails:Constant resolution within methods with dynamically assigned constants searches the superclass chain +fails:Constant resolution within methods with dynamically assigned constants searches the lexical scope of the method not the receiver's immediate class +fails:Constant resolution within methods with dynamically assigned constants searches the lexical scope of a singleton method +fails:Constant resolution within methods with dynamically assigned constants does not search the lexical scope of the caller +fails:Constant resolution within methods with dynamically assigned constants searches the lexical scope of a block +fails:Constant resolution within methods with dynamically assigned constants searches Object as a lexical scope only if Object is explicitly opened +fails:Constant resolution within methods with dynamically assigned constants returns the updated value when a constant is reassigned +fails:Constant resolution within methods with dynamically assigned constants does not search the lexical scope of qualifying modules \ No newline at end of file

1 0

[1255] MacRuby/branches/experimental
by source_changes＠macosforge.org 29 Mar '09

29 Mar '09

Revision: 1255 http://trac.macosforge.org/projects/ruby/changeset/1255 Author: eloy.de.enige(a)gmail.com Date: 2009-03-29 03:46:34 -0700 (Sun, 29 Mar 2009) Log Message: ----------- Commented a few examples in the for spec as they do not compile yet, tagged the remaining failing examples as fails, and added the for spec to the partially good files. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake MacRuby/branches/experimental/spec/frozen/language/for_spec.rb MacRuby/branches/experimental/spec/frozen/tags/macruby/language/for_tags.txt Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 10:11:47 UTC (rev 1254) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 10:46:34 UTC (rev 1255) @@ -37,6 +37,7 @@ eigenclass encoding ensure + for loop magic_comment metaclass Modified: MacRuby/branches/experimental/spec/frozen/language/for_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/for_spec.rb 2009-03-29 10:11:47 UTC (rev 1254) +++ MacRuby/branches/experimental/spec/frozen/language/for_spec.rb 2009-03-29 10:46:34 UTC (rev 1255) @@ -12,18 +12,20 @@ j.should == 6 end - it "iterates over an Hash passing each key-value pair to the block" do - k = 0 - l = 0 - - for i, j in { 1 => 10, 2 => 20 } - k += i - l += j - end - - k.should == 3 - l.should == 30 - end + # MacRuby TODO: This does not compile yet. + # + # it "iterates over an Hash passing each key-value pair to the block" do + # k = 0 + # l = 0 + # + # for i, j in { 1 => 10, 2 => 20 } + # k += i + # l += j + # end + # + # k.should == 3 + # l.should == 30 + # end it "iterates over any object responding to 'each'" do class XYZ @@ -39,15 +41,17 @@ j.should == 55 end - it "allows an instance variable as an iterator name" do - m = [1,2,3] - n = 0 - for @var in m - n += 1 - end - @var.should == 3 - n.should == 3 - end + # MacRuby TODO: This does not compile yet. + # + # it "allows an instance variable as an iterator name" do + # m = [1,2,3] + # n = 0 + # for @var in m + # n += 1 + # end + # @var.should == 3 + # n.should == 3 + # end # TODO: commented out due to a compiler error #it "allows a class variable as an iterator name" do @@ -108,10 +112,12 @@ a.should == 123 end - it "returns expr" do - for i in 1..3; end.should == (1..3) - for i,j in { 1 => 10, 2 => 20 }; end.should == { 1 => 10, 2 => 20 } - end + # MacRuby TODO: This does not compile yet. + # + # it "returns expr" do + # for i in 1..3; end.should == (1..3) + # for i,j in { 1 => 10, 2 => 20 }; end.should == { 1 => 10, 2 => 20 } + # end it "breaks out of a loop upon 'break', returning nil" do j = 0 @@ -140,17 +146,19 @@ j.should == 13 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 + + # 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 end language_version __FILE__, "for" \ No newline at end of file Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/for_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/for_tags.txt 2009-03-29 10:11:47 UTC (rev 1254) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/for_tags.txt 2009-03-29 10:46:34 UTC (rev 1255) @@ -1,4 +1,8 @@ -critical:The for expression iterates over an Hash passing each key-value pair to the block -critical:The for expression allows an instance variable as an iterator name -critical:The for expression returns expr -critical:The for expression repeats current iteration with 'redo' \ No newline at end of file +fails:The for expression iterates over an Enumerable passing each element to the block +fails:The for expression iterates over any object responding to 'each' +fails:The for expression splats multiple arguments together if there are fewer arguments than values +fails:The for expression optionally takes a 'do' after the expression +fails:The for expression allows body begin on the same line if do is used +fails:The for expression breaks out of a loop upon 'break', returning nil +fails:The for expression allows 'break' to have an argument which becomes the value of the for expression +fails:The for expression starts the next iteration with 'next' \ No newline at end of file

1 0

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

29 Mar '09

Revision: 1254 http://trac.macosforge.org/projects/ruby/changeset/1254 Author: eloy.de.enige(a)gmail.com Date: 2009-03-29 03:11:47 -0700 (Sun, 29 Mar 2009) Log Message: ----------- Renamed unloadable rake task to not_loadable. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 10:11:41 UTC (rev 1253) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-29 10:11:47 UTC (rev 1254) @@ -74,7 +74,7 @@ namespace :list do desc "List all spec language spec files which do not load yet" - task :unloadable do + task :not_loadable do puts((Dir['spec/frozen/language/*_spec.rb'] - KNOWN_GOOD_AND_PARTIALLY_GOOD_FILES).join("\n")) end end

1 0