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

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

23 Mar '09

Revision: 1093 http://trac.macosforge.org/projects/ruby/changeset/1093 Author: eloy.de.enige(a)gmail.com Date: 2009-03-23 03:02:03 -0700 (Mon, 23 Mar 2009) Log Message: ----------- The hash spec passes as well. Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 09:32:04 UTC (rev 1092) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 10:02:03 UTC (rev 1093) @@ -1,7 +1,7 @@ namespace :spec do MSPEC_RUN = "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run" - KNOWN_GOOD = %w{ and or order execution until while module } + KNOWN_GOOD = %w{ and execution hash module or order until while } desc "Run continuous integration language examples (known good)" task :ci do

1 0

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

23 Mar '09

Revision: 1092 http://trac.macosforge.org/projects/ruby/changeset/1092 Author: eloy.de.enige(a)gmail.com Date: 2009-03-23 02:32:04 -0700 (Mon, 23 Mar 2009) Log Message: ----------- Moved 1.8 specific tests into a language version file and added a 1.9 example. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/def_spec.rb Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/language/versions/def_1.8.rb MacRuby/branches/experimental/spec/frozen/language/versions/def_1.9.rb Modified: MacRuby/branches/experimental/spec/frozen/language/def_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/def_spec.rb 2009-03-23 08:26:45 UTC (rev 1091) +++ MacRuby/branches/experimental/spec/frozen/language/def_spec.rb 2009-03-23 09:32:04 UTC (rev 1092) @@ -17,7 +17,7 @@ def initialize end end - DefInitializeSpec.new.private_methods(false).should include('initialize') + DefInitializeSpec.should have_private_instance_method(:initialize, false) end end @@ -27,7 +27,7 @@ def initialize_copy end end - DefInitializeCopySpec.new.private_methods(false).should include('initialize_copy') + DefInitializeCopySpec.should have_private_instance_method(:initialize_copy, false) end end @@ -52,30 +52,6 @@ foo(1, 2, 3, 4, 5, 6, 7, 8).should == [1, 2, 3, 4, 5, [6, 7, 8]] end - it "creates a method that can be invoked with an inline hash argument" do - def foo(a,b,*c); [a,b,c] end - - foo('abc', 'rbx' => 'cool', 'specs' => 'fail sometimes', 'oh' => 'shit', *[789, 'yeah']). - should == - ['abc', { 'rbx' => 'cool', 'specs' => 'fail sometimes', 'oh' => 'shit'}, [789, 'yeah']] - end - - it "creates a method that can be invoked with an inline hash and a block" do - def foo(a,b,*c,&d); [a,b,c,yield(d)] end - - foo('abc', 'rbx' => 'cool', 'specs' => 'fail sometimes', 'oh' => 'shit', *[789, 'yeah']) { 3 }. - should == - ['abc', { 'rbx' => 'cool', 'specs' => 'fail sometimes', 'oh' => 'shit'}, [789, 'yeah'], 3] - - foo('abc', 'rbx' => 'cool', 'specs' => 'fail sometimes', *[789, 'yeah']) do 3 end.should == - ['abc', { 'rbx' => 'cool', 'specs' => 'fail sometimes' }, [789, 'yeah'], 3] - - l = lambda { 3 } - - foo('abc', 'rbx' => 'cool', 'specs' => 'fail sometimes', *[789, 'yeah'], &l).should == - ['abc', { 'rbx' => 'cool', 'specs' => 'fail sometimes' }, [789, 'yeah'], 3] - end - it "allows only a single * argument" do lambda { eval 'def foo(a, *b, *c); end' }.should raise_error(SyntaxError) end @@ -348,7 +324,7 @@ other = DefSpecNested.new other.an_instance_method.should == other - DefSpecNested.instance_methods.should include("an_instance_method") + DefSpecNested.should have_instance_method(:an_instance_method) end it "creates a class method when evaluated in a class method" do @@ -513,3 +489,5 @@ lambda { bar(3,4,5) }.should raise_error(ArgumentError) end end + +language_version __FILE__, "def" \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/def_1.8.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/def_1.8.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/def_1.8.rb 2009-03-23 09:32:04 UTC (rev 1092) @@ -0,0 +1,25 @@ +describe "An instance method definition with a splat" do + it "creates a method that can be invoked with an inline hash argument" do + def foo(a,b,*c); [a,b,c] end + + foo('abc', 'rbx' => 'cool', 'specs' => 'fail sometimes', 'oh' => 'shit', *[789, 'yeah']). + should == + ['abc', { 'rbx' => 'cool', 'specs' => 'fail sometimes', 'oh' => 'shit'}, [789, 'yeah']] + end + + it "creates a method that can be invoked with an inline hash and a block" do + def foo(a,b,*c,&d); [a,b,c,yield] end + + foo('abc', 'rbx' => 'cool', 'specs' => 'fail sometimes', 'oh' => 'shit', *[789, 'yeah']) { 3 }. + should == + ['abc', { 'rbx' => 'cool', 'specs' => 'fail sometimes', 'oh' => 'shit'}, [789, 'yeah'], 3] + + foo('abc', 'rbx' => 'cool', 'specs' => 'fail sometimes', *[789, 'yeah']) do 3 end.should == + ['abc', { 'rbx' => 'cool', 'specs' => 'fail sometimes' }, [789, 'yeah'], 3] + + l = lambda { 3 } + + foo('abc', 'rbx' => 'cool', 'specs' => 'fail sometimes', *[789, 'yeah'], &l).should == + ['abc', { 'rbx' => 'cool', 'specs' => 'fail sometimes' }, [789, 'yeah'], 3] + end +end \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/def_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/def_1.9.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/def_1.9.rb 2009-03-23 09:32:04 UTC (rev 1092) @@ -0,0 +1,9 @@ +describe "An instance method definition with a splat" do + it "raises a SyntaxError when invoked with an inline hash argument" do + def foo(a,b,*c); [a,b,c] end + + lambda do + instance_eval "foo('abc', 'specs' => 'fail sometimes', 'on' => '1.9', *[789, 'yeah'])" + end.should raise_error(SyntaxError) + end +end \ No newline at end of file

1 0

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

23 Mar '09

Revision: 1091 http://trac.macosforge.org/projects/ruby/changeset/1091 Author: eloy.de.enige(a)gmail.com Date: 2009-03-23 01:26:45 -0700 (Mon, 23 Mar 2009) Log Message: ----------- Use ruby_version_is guards for simple api differences between 1.8 and 1.9 as was the case with the module specs. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/module_spec.rb Removed Paths: ------------- MacRuby/branches/experimental/spec/frozen/language/versions/module_1.8.rb MacRuby/branches/experimental/spec/frozen/language/versions/module_1.9.rb Modified: MacRuby/branches/experimental/spec/frozen/language/module_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/module_spec.rb 2009-03-23 08:18:54 UTC (rev 1090) +++ MacRuby/branches/experimental/spec/frozen/language/module_spec.rb 2009-03-23 08:26:45 UTC (rev 1091) @@ -18,4 +18,18 @@ end end -language_version __FILE__, "module" \ No newline at end of file +describe "An anonymous module" do + ruby_version_is "" ... "1.9" do + it "returns an empty string for its name" do + m = Module.new + m.name.should == "" + end + end + + ruby_version_is "1.9" do + it "returns nil for its name" do + m = Module.new + m.name.should == nil + end + end +end Deleted: MacRuby/branches/experimental/spec/frozen/language/versions/module_1.8.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/module_1.8.rb 2009-03-23 08:18:54 UTC (rev 1090) +++ MacRuby/branches/experimental/spec/frozen/language/versions/module_1.8.rb 2009-03-23 08:26:45 UTC (rev 1091) @@ -1,6 +0,0 @@ -describe "An anonymous module" do - it "returns an empty string as its name" do - m = Module.new - m.name.should == "" - end -end \ No newline at end of file Deleted: MacRuby/branches/experimental/spec/frozen/language/versions/module_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/module_1.9.rb 2009-03-23 08:18:54 UTC (rev 1090) +++ MacRuby/branches/experimental/spec/frozen/language/versions/module_1.9.rb 2009-03-23 08:26:45 UTC (rev 1091) @@ -1,6 +0,0 @@ -describe "An anonymous module" do - it "has no name" do - m = Module.new - m.name.should == nil - end -end \ No newline at end of file

1 0

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

23 Mar '09

Revision: 1090 http://trac.macosforge.org/projects/ruby/changeset/1090 Author: eloy.de.enige(a)gmail.com Date: 2009-03-23 01:18:54 -0700 (Mon, 23 Mar 2009) Log Message: ----------- Moved 1.8 specific module example into a language version specific file and added a 1.9 example. Now all module specs are green. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/module_spec.rb Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/language/versions/module_1.8.rb MacRuby/branches/experimental/spec/frozen/language/versions/module_1.9.rb Modified: MacRuby/branches/experimental/spec/frozen/language/module_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/module_spec.rb 2009-03-23 07:46:41 UTC (rev 1089) +++ MacRuby/branches/experimental/spec/frozen/language/module_spec.rb 2009-03-23 08:18:54 UTC (rev 1090) @@ -13,10 +13,9 @@ end it "gets a name when assigned to a constant" do - m = Module.new LangModuleSpec::Anon = Module.new - - m.name.should == "" LangModuleSpec::Anon.name.should == "LangModuleSpec::Anon" end end + +language_version __FILE__, "module" \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/module_1.8.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/module_1.8.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/module_1.8.rb 2009-03-23 08:18:54 UTC (rev 1090) @@ -0,0 +1,6 @@ +describe "An anonymous module" do + it "returns an empty string as its name" do + m = Module.new + m.name.should == "" + end +end \ No newline at end of file Added: MacRuby/branches/experimental/spec/frozen/language/versions/module_1.9.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/versions/module_1.9.rb (rev 0) +++ MacRuby/branches/experimental/spec/frozen/language/versions/module_1.9.rb 2009-03-23 08:18:54 UTC (rev 1090) @@ -0,0 +1,6 @@ +describe "An anonymous module" do + it "has no name" do + m = Module.new + m.name.should == nil + end +end \ No newline at end of file

1 0

[1089] MacRuby/branches/experimental/variable.c
by source_changes＠macosforge.org 23 Mar '09

23 Mar '09

Revision: 1089 http://trac.macosforge.org/projects/ruby/changeset/1089 Author: eloy.de.enige(a)gmail.com Date: 2009-03-23 00:46:41 -0700 (Mon, 23 Mar 2009) Log Message: ----------- Fixed a comment which caused a syntax error. Modified Paths: -------------- MacRuby/branches/experimental/variable.c Modified: MacRuby/branches/experimental/variable.c =================================================================== --- MacRuby/branches/experimental/variable.c 2009-03-23 07:10:14 UTC (rev 1088) +++ MacRuby/branches/experimental/variable.c 2009-03-23 07:46:41 UTC (rev 1089) @@ -1,4 +1,4 @@ - * This file is covered by the Ruby license. See COPYING for more details. +/* This file is covered by the Ruby license. See COPYING for more details. * * Copyright (C) 2007-2008, Apple Inc. All rights reserved. * Copyright (C) 1993-2007 Yukihiro Matsumoto

1 0

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

23 Mar '09

Revision: 1088 http://trac.macosforge.org/projects/ruby/changeset/1088 Author: lsansonetti(a)apple.com Date: 2009-03-23 00:10:14 -0700 (Mon, 23 Mar 2009) Log Message: ----------- execution_spec.rb passes Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 06:51:46 UTC (rev 1087) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 07:10:14 UTC (rev 1088) @@ -1,7 +1,7 @@ namespace :spec do MSPEC_RUN = "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run" - KNOWN_GOOD = %w{ and or order until while module } + KNOWN_GOOD = %w{ and or order execution until while module } desc "Run continuous integration language examples (known good)" task :ci do

1 0

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

23 Mar '09

Revision: 1087 http://trac.macosforge.org/projects/ruby/changeset/1087 Author: lsansonetti(a)apple.com Date: 2009-03-22 23:51:46 -0700 (Sun, 22 Mar 2009) Log Message: ----------- module_spec.rb is green (except for a test that is 1.8-only) Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 06:47:43 UTC (rev 1086) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 06:51:46 UTC (rev 1087) @@ -1,7 +1,7 @@ namespace :spec do MSPEC_RUN = "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run" - KNOWN_GOOD = %w{ and or order until while } + KNOWN_GOOD = %w{ and or order until while module } desc "Run continuous integration language examples (known good)" task :ci do

1 0

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

23 Mar '09

Revision: 1086 http://trac.macosforge.org/projects/ruby/changeset/1086 Author: lsansonetti(a)apple.com Date: 2009-03-22 23:47:43 -0700 (Sun, 22 Mar 2009) Log Message: ----------- fixed class/module definition using a given cpath (like class Foo::Bar; end) Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/variable.c Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-23 05:36:11 UTC (rev 1085) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-23 06:47:43 UTC (rev 1086) @@ -2798,19 +2798,23 @@ NODE *super = node->nd_super; if (defineClassFunc == NULL) { - // VALUE rb_vm_define_class(ID path, VALUE outer, VALUE super, unsigned char is_module); - defineClassFunc = cast<Function>(module->getOrInsertFunction("rb_vm_define_class", - RubyObjTy, IntTy, RubyObjTy, RubyObjTy, Type::Int8Ty, NULL)); + // VALUE rb_vm_define_class(ID path, VALUE outer, VALUE super, + // unsigned char is_module); + defineClassFunc = cast<Function>(module->getOrInsertFunction( + "rb_vm_define_class", + RubyObjTy, IntTy, RubyObjTy, RubyObjTy, + Type::Int8Ty, NULL)); } std::vector<Value *> params; params.push_back(ConstantInt::get(IntTy, (long)path)); - params.push_back(compile_current_class()); + params.push_back(compile_class_path(node->nd_cpath)); params.push_back(super == NULL ? zeroVal : compile_node(super)); - params.push_back(ConstantInt::get(Type::Int8Ty, nd_type(node) == NODE_MODULE ? 1 : 0)); + params.push_back(ConstantInt::get(Type::Int8Ty, + nd_type(node) == NODE_MODULE ? 1 : 0)); - classVal = CallInst::Create(defineClassFunc, params.begin(), params.end(), "", bb); + classVal = compile_protected_call(defineClassFunc, params); } NODE *body = node->nd_body; Modified: MacRuby/branches/experimental/variable.c =================================================================== --- MacRuby/branches/experimental/variable.c 2009-03-23 05:36:11 UTC (rev 1085) +++ MacRuby/branches/experimental/variable.c 2009-03-23 06:47:43 UTC (rev 1086) @@ -1,4 +1,3 @@ -/* * This file is covered by the Ruby license. See COPYING for more details. * * Copyright (C) 2007-2008, Apple Inc. All rights reserved. @@ -225,7 +224,9 @@ { VALUE path = classname(mod); - if (!NIL_P(path)) return rb_str_dup(path); + if (!NIL_P(path)) { + return rb_str_dup(path); + } return path; }

1 0

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

23 Mar '09

Revision: 1085 http://trac.macosforge.org/projects/ruby/changeset/1085 Author: lsansonetti(a)apple.com Date: 2009-03-22 22:36:11 -0700 (Sun, 22 Mar 2009) Log Message: ----------- implemented const setting using the colon syntax 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-23 05:14:21 UTC (rev 1084) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-23 05:36:11 UTC (rev 1085) @@ -281,6 +281,7 @@ Value *compile_ivar_read(ID vid); Value *compile_ivar_assignment(ID vid, Value *val); Value *compile_current_class(void); + Value *compile_class_path(NODE *node); Value *compile_const(ID id, Value *outer); Value *compile_singleton_class(Value *obj); Value *compile_defined_expression(NODE *node); @@ -1200,6 +1201,22 @@ return CallInst::Create(newStringFunc, params.begin(), params.end(), "", bb); } +Value * +RoxorCompiler::compile_class_path(NODE *node) +{ + if (nd_type(node) == NODE_COLON3) { + // ::Foo + return ConstantInt::get(RubyObjTy, (long)rb_cObject); + } + else if (node->nd_head != NULL) { + // Bar::Foo + return compile_node(node->nd_head); + } + + // XXX not sure about that... + return compile_current_class(); +} + void RoxorCompiler::compile_dead_branch(void) { @@ -3088,17 +3105,25 @@ { if (setConstFunc == NULL) { // VALUE rb_vm_set_const(VALUE mod, ID id, VALUE obj); - setConstFunc = cast<Function>(module->getOrInsertFunction("rb_vm_set_const", + setConstFunc = cast<Function>(module->getOrInsertFunction( + "rb_vm_set_const", Type::VoidTy, RubyObjTy, IntTy, RubyObjTy, NULL)); } - assert(node->nd_vid > 0); assert(node->nd_value != NULL); std::vector<Value *> params; - params.push_back(compile_current_class()); - params.push_back(ConstantInt::get(IntTy, (long)node->nd_vid)); + if (node->nd_vid > 0) { + params.push_back(compile_current_class()); + params.push_back(ConstantInt::get(IntTy, (long)node->nd_vid)); + } + else { + assert(node->nd_else != NULL); + params.push_back(compile_class_path(node->nd_else)); + assert(node->nd_else->nd_mid > 0); + params.push_back(ConstantInt::get(IntTy, (long)node->nd_else->nd_mid)); + } Value *val = compile_node(node->nd_value); params.push_back(val); Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-23 05:14:21 UTC (rev 1084) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-23 05:36:11 UTC (rev 1085) @@ -367,6 +367,7 @@ assert '42', "FOO=42; p FOO" assert '42', "FOO=42; p Object::FOO" assert '42', "class X; FOO=42; end; p X::FOO" + assert '42', "class X; end; X::FOO=42; p X::FOO" assert ':ok', %q{ class X; FOO=123; end

1 0

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

23 Mar '09

Revision: 1084 http://trac.macosforge.org/projects/ruby/changeset/1084 Author: lsansonetti(a)apple.com Date: 2009-03-22 22:14:21 -0700 (Sun, 22 Mar 2009) Log Message: ----------- while_spec.rb and until_spec.rb are now green (re-yeepee) Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 05:12:41 UTC (rev 1083) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 05:14:21 UTC (rev 1084) @@ -1,7 +1,7 @@ namespace :spec do MSPEC_RUN = "./miniruby -v -I./mspec/lib -I./lib ./mspec/bin/mspec-run" - KNOWN_GOOD = %w{ and or order } + KNOWN_GOOD = %w{ and or order until while } desc "Run continuous integration language examples (known good)" task :ci do

1 0