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

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

23 Mar '09

Revision: 1103 http://trac.macosforge.org/projects/ruby/changeset/1103 Author: eloy.de.enige(a)gmail.com Date: 2009-03-23 06:44:00 -0700 (Mon, 23 Mar 2009) Log Message: ----------- Added numbers to the known good specs. There is 1 error, but it's the same as with the others; a SyntaxError is actually raised. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 13:25:59 UTC (rev 1102) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 13:44:00 UTC (rev 1103) @@ -1,7 +1,7 @@ namespace :spec do MSPEC_RUN = "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run" - KNOWN_GOOD = %w{ and execution hash if module or order unless until while } + KNOWN_GOOD = %w{ and execution hash if module numbers or order unless until while } desc "Run continuous integration language examples (known good)" task :ci do

1 0

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

23 Mar '09

Revision: 1102 http://trac.macosforge.org/projects/ruby/changeset/1102 Author: eloy.de.enige(a)gmail.com Date: 2009-03-23 06:25:59 -0700 (Mon, 23 Mar 2009) Log Message: ----------- Added if spec to KNOWN_GOOD. Still has one error, but that's not important as it does actually raise a SyntaxError. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 13:24:00 UTC (rev 1101) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 13:25:59 UTC (rev 1102) @@ -1,7 +1,7 @@ namespace :spec do MSPEC_RUN = "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run" - KNOWN_GOOD = %w{ and execution hash module or order unless until while } + KNOWN_GOOD = %w{ and execution hash if module or order unless until while } desc "Run continuous integration language examples (known good)" task :ci do

1 0

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

23 Mar '09

Revision: 1101 http://trac.macosforge.org/projects/ruby/changeset/1101 Author: eloy.de.enige(a)gmail.com Date: 2009-03-23 06:24:00 -0700 (Mon, 23 Mar 2009) Log Message: ----------- Moved 1.8 specific if examples into if_1.8.rb and added a 1.9 example. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/if_spec.rb Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/language/versions/if_1.8.rb MacRuby/branches/experimental/spec/frozen/language/versions/if_1.9.rb Modified: MacRuby/branches/experimental/spec/frozen/language/if_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/if_spec.rb 2009-03-23 13:12:38 UTC (rev 1100) +++ MacRuby/branches/experimental/spec/frozen/language/if_spec.rb 2009-03-23 13:24:00 UTC (rev 1101) @@ -130,13 +130,6 @@ end.should == 123 end - it "allows starting then-body on the same line if colon is used" do - if true: 123 - else - 456 - end.should == 123 - end - it "allows starting else-body on the same line" do if false 123 @@ -144,12 +137,6 @@ end.should == 456 end - it "allows both then- and else-bodies start on the same line (with colon after expression)" do - if false: 123 - else 456 - end.should == 456 - end - it "evaluates subsequent elsif statements and execute body of first matching" do if false 123 @@ -174,14 +161,6 @@ end.should == 456 end - it "allows ':' after expression when then-body is on the next line" do - if true: - 123 - end.should == 123 - - if true; 123; end.should == 123 - end - it "allows 'then' after expression when then-body is on the next line" do if true then 123 @@ -190,13 +169,6 @@ if true then ; 123; end.should == 123 end - it "allows then-body on the same line separated with ':'" do - if true: 123 - end.should == 123 - - if true: 123; end.should == 123 - end - it "allows then-body on the same line separated with 'then'" do if true then 123 end.should == 123 @@ -204,13 +176,6 @@ if true then 123; end.should == 123 end - it "returns nil when then-body on the same line separated with ':' and expression is false" do - if false: 123 - end.should == nil - - if false: 123; end.should == nil - end - it "returns nil when then-body on the same line separated with 'then' and expression is false" do if false then 123 end.should == nil @@ -218,13 +183,6 @@ if false then 123; end.should == nil end - it "returns nil when then-body separated by ':' is empty and expression is true" do - if true: - end.should == nil - - if true: ; end.should == nil - end - it "returns nil when then-body separated by 'then' is empty and expression is true" do if true then end.should == nil @@ -232,13 +190,6 @@ if true then ; end.should == nil end - it "returns nil when then-body separated by ':', expression is false and no else part" do - if false: - end.should == nil - - if false: ; end.should == nil - end - it "returns nil when then-body separated by 'then', expression is false and no else part" do if false then end.should == nil @@ -246,14 +197,6 @@ if false then ; end.should == nil end - it "evaluates then-body when then-body separated by ':', expression is true and else part is present" do - if true: 123 - else 456 - end.should == 123 - - if true: 123; else 456; end.should == 123 - end - it "evaluates then-body when then-body separated by 'then', expression is true and else part is present" do if true then 123 else 456 @@ -262,14 +205,6 @@ if true then 123; else 456; end.should == 123 end - it "evaluates else-body when then-body separated by ':' and expression is false" do - if false: 123 - else 456 - end.should == 456 - - if false: 123; else 456; end.should == 456 - end - it "evaluates else-body when then-body separated by 'then' and expression is false" do if false then 123 else 456 @@ -277,16 +212,6 @@ if false then 123; else 456; end.should == 456 end - - it "allows elsif-body at the same line separated by ':' or 'then'" do - if false then 123 - elsif false: 234 - elsif true then 345 - elsif true: 456 - end.should == 345 - - if false: 123; elsif false then 234; elsif true: 345; elsif true then 456; end.should == 345 - end end describe "The postfix if form" do @@ -350,3 +275,5 @@ b.should == 126 end end + +language_version __FILE__, "if" \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/if_1.8.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/if_1.8.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/if_1.8.rb 2009-03-23 13:24:00 UTC (rev 1101) @@ -0,0 +1,76 @@ +describe "The if expression" do + it "allows starting then-body on the same line if colon is used" do + if true: 123 + else + 456 + end.should == 123 + end + + it "allows both then- and else-bodies start on the same line (with colon after expression)" do + if false: 123 + else 456 + end.should == 456 + end + + it "allows ':' after expression when then-body is on the next line" do + if true: + 123 + end.should == 123 + + if true; 123; end.should == 123 + end + + it "allows then-body on the same line separated with ':'" do + if true: 123 + end.should == 123 + + if true: 123; end.should == 123 + end + + it "returns nil when then-body on the same line separated with ':' and expression is false" do + if false: 123 + end.should == nil + + if false: 123; end.should == nil + end + + it "returns nil when then-body separated by ':' is empty and expression is true" do + if true: + end.should == nil + + if true: ; end.should == nil + end + + it "returns nil when then-body separated by ':', expression is false and no else part" do + if false: + end.should == nil + + if false: ; end.should == nil + end + + it "evaluates then-body when then-body separated by ':', expression is true and else part is present" do + if true: 123 + else 456 + end.should == 123 + + if true: 123; else 456; end.should == 123 + end + + it "evaluates else-body when then-body separated by ':' and expression is false" do + if false: 123 + else 456 + end.should == 456 + + if false: 123; else 456; end.should == 456 + end + + it "allows elsif-body at the same line separated by ':' or 'then'" do + if false then 123 + elsif false: 234 + elsif true then 345 + elsif true: 456 + end.should == 345 + + if false: 123; elsif false then 234; elsif true: 345; elsif true then 456; end.should == 345 + end +end \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/if_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/if_1.9.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/if_1.9.rb 2009-03-23 13:24:00 UTC (rev 1101) @@ -0,0 +1,5 @@ +describe "The if expression" do + it "raises a SyntaxError if a colon is used" do + lambda { eval "if true: 1; end" }.should raise_error(SyntaxError) + end +end \ No newline at end of file

1 0

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

23 Mar '09

Revision: 1100 http://trac.macosforge.org/projects/ruby/changeset/1100 Author: eloy.de.enige(a)gmail.com Date: 2009-03-23 06:12:38 -0700 (Mon, 23 Mar 2009) Log Message: ----------- Removed spec:workaround:language task and added spec:fails which only runs all specs that are not in KNOWN_GOOD. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 13:00:49 UTC (rev 1099) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 13:12:38 UTC (rev 1100) @@ -8,20 +8,20 @@ sh "#{MSPEC_RUN} #{FileList["spec/frozen/language/{#{KNOWN_GOOD.join(',')}}_spec.rb"].join(' ')}" end + desc "Run language examples that are known to fail" + task :fails do + files = FileList["spec/frozen/language/*_spec.rb"] + files -= files.grep(/\/(#{KNOWN_GOOD.join('|')})_spec\.rb$/) + files.each do |spec| + sh "#{MSPEC_RUN} #{spec}" rescue nil + end + end + desc "Run language examples" task :language do sh "./mspec/bin/mspec ci -B ./spec/frozen/macruby.mspec spec/frozen/language/*_spec.rb" 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}" rescue nil - end - end - end - namespace :"1.9" do desc "Run Ruby 1.9 language examples" task :language do

1 0

[1099] MacRuby/branches/experimental/spec/frozen/language/yield_spec.rb
by source_changes＠macosforge.org 23 Mar '09

23 Mar '09

Revision: 1099 http://trac.macosforge.org/projects/ruby/changeset/1099 Author: eloy.de.enige(a)gmail.com Date: 2009-03-23 06:00:49 -0700 (Mon, 23 Mar 2009) Log Message: ----------- Tagged a yield example as critical as it causes a seg fault. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/yield_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/language/yield_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/yield_spec.rb 2009-03-23 12:52:25 UTC (rev 1098) +++ MacRuby/branches/experimental/spec/frozen/language/yield_spec.rb 2009-03-23 13:00:49 UTC (rev 1099) @@ -27,6 +27,7 @@ def f; yield *[*[1]]; end; f {|a| a.should == 1 } end + # MR: critical it "assigns objects followed by splatted objects to block variables" do def f; yield 1, *nil; end; f {|a, b| b.should == nil } def f; yield 1, *1; end; f {|a, b| b.should == 1 }

1 0

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

23 Mar '09

Revision: 1098 http://trac.macosforge.org/projects/ruby/changeset/1098 Author: eloy.de.enige(a)gmail.com Date: 2009-03-23 05:52:25 -0700 (Mon, 23 Mar 2009) Log Message: ----------- Added unless specs to known good specs. There is 1 error, but that's not really relevant as the syntax _does_ raise a SyntaxError as it should. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 12:51:15 UTC (rev 1097) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 12:52:25 UTC (rev 1098) @@ -1,7 +1,7 @@ namespace :spec do MSPEC_RUN = "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run" - KNOWN_GOOD = %w{ and execution hash module or order until while } + KNOWN_GOOD = %w{ and execution hash module or order unless until while } desc "Run continuous integration language examples (known good)" task :ci do

1 0

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

23 Mar '09

Revision: 1097 http://trac.macosforge.org/projects/ruby/changeset/1097 Author: eloy.de.enige(a)gmail.com Date: 2009-03-23 05:51:15 -0700 (Mon, 23 Mar 2009) Log Message: ----------- Moved a 1.8 specific unless example into a language version file and added a 1.9 example. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/unless_spec.rb Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/language/versions/unless_1.8.rb MacRuby/branches/experimental/spec/frozen/language/versions/unless_1.9.rb Modified: MacRuby/branches/experimental/spec/frozen/language/unless_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/unless_spec.rb 2009-03-23 12:10:09 UTC (rev 1096) +++ MacRuby/branches/experimental/spec/frozen/language/unless_spec.rb 2009-03-23 12:51:15 UTC (rev 1097) @@ -36,12 +36,10 @@ it "does not return a value when the expression is true" do unless true; end.should == nil end - - it "allows expression and body to be on one line (using ':')" do - unless false: 'foo'; else 'bar'; end.should == 'foo' - end it "allows expression and body to be on one line (using 'then')" do unless false then 'foo'; else 'bar'; end.should == 'foo' end -end \ No newline at end of file +end + +language_version __FILE__, "unless" \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/unless_1.8.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/unless_1.8.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/unless_1.8.rb 2009-03-23 12:51:15 UTC (rev 1097) @@ -0,0 +1,5 @@ +describe "The unless expression" do + it "allows expression and body to be on one line (using ':')" do + unless false: 'foo'; else 'bar'; end.should == 'foo' + end +end \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/unless_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/unless_1.9.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/unless_1.9.rb 2009-03-23 12:51:15 UTC (rev 1097) @@ -0,0 +1,5 @@ +describe "The unless expression" do + it "raises a SyntaxError when expression and body are on one line (using ':')" do + lambda { instance_eval "unless false: 'foo'; end" }.should raise_error(SyntaxError) + end +end \ No newline at end of file

1 0

[1096] MacRuby/branches/experimental/spec/frozen/language/case_spec.rb
by source_changes＠macosforge.org 23 Mar '09

23 Mar '09

Revision: 1096 http://trac.macosforge.org/projects/ruby/changeset/1096 Author: eloy.de.enige(a)gmail.com Date: 2009-03-23 05:10:09 -0700 (Mon, 23 Mar 2009) Log Message: ----------- Fixed a case spec example for 1.9. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/case_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/language/case_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/case_spec.rb 2009-03-23 11:23:48 UTC (rev 1095) +++ MacRuby/branches/experimental/spec/frozen/language/case_spec.rb 2009-03-23 12:10:09 UTC (rev 1096) @@ -177,7 +177,7 @@ case 4 else true - when 4: false + when 4; false end CODE }.should raise_error(SyntaxError)

1 0

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

23 Mar '09

Revision: 1095 http://trac.macosforge.org/projects/ruby/changeset/1095 Author: vincent.isambart(a)gmail.com Date: 2009-03-23 04:23:48 -0700 (Mon, 23 Mar 2009) Log Message: ----------- test for what causes the problems in the case spec Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-23 10:49:56 UTC (rev 1094) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-23 11:23:48 UTC (rev 1095) @@ -689,6 +689,7 @@ assert ":ok", "def foo(&block); :ok; end; p foo" 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 f(&proc) p :ok; end; f(&nil)" assert ":ok", %{ def foo(&block) p(block ? :ko : :ok) end

1 0

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

23 Mar '09

Revision: 1094 http://trac.macosforge.org/projects/ruby/changeset/1094 Author: vincent.isambart(a)gmail.com Date: 2009-03-23 03:49:56 -0700 (Mon, 23 Mar 2009) Log Message: ----------- fixed case spec crash Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-23 10:02:03 UTC (rev 1093) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-23 10:49:56 UTC (rev 1094) @@ -704,15 +704,11 @@ break; case NODE_ARGSPUSH: + case NODE_ARGSCAT: compile_when_arguments(args->nd_head, comparedToVal, thenBB); compile_single_when_argument(args->nd_body, comparedToVal, thenBB); break; - case NODE_ARGSCAT: - compile_when_arguments(args->nd_head, comparedToVal, thenBB); - compile_when_arguments(args->nd_body, comparedToVal, thenBB); - break; - default: compile_node_error("unrecognized when arg node", args); }

1 0