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

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

23 Mar '09

Revision: 1083 http://trac.macosforge.org/projects/ruby/changeset/1083 Author: lsansonetti(a)apple.com Date: 2009-03-22 22:12:41 -0700 (Sun, 22 Mar 2009) Log Message: ----------- implemented begin..end while/until loops Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-23 04:50:22 UTC (rev 1082) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-23 05:12:41 UTC (rev 1083) @@ -3682,8 +3682,10 @@ BasicBlock *bodyBB = BasicBlock::Create("body", f); BasicBlock *afterBB = BasicBlock::Create("after", f); - BranchInst::Create(loopBB, bb); + const bool first_pass_free = node->nd_state == 0; + BranchInst::Create(first_pass_free ? bodyBB : loopBB, bb); + bb = loopBB; Value *condVal = compile_node(node->nd_cond);

1 0

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

23 Mar '09

Revision: 1082 http://trac.macosforge.org/projects/ruby/changeset/1082 Author: lsansonetti(a)apple.com Date: 2009-03-22 21:50:22 -0700 (Sun, 22 Mar 2009) Log Message: ----------- implemented redo (works only for loops at the moment, and not blocks yet) Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-23 04:26:24 UTC (rev 1081) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-23 04:50:22 UTC (rev 1082) @@ -193,6 +193,7 @@ Function *current_block_func; GlobalVariable *current_opened_class; BasicBlock *current_loop_begin_bb; + BasicBlock *current_loop_body_bb; BasicBlock *current_loop_end_bb; Value *current_loop_exit_val; @@ -503,6 +504,7 @@ current_block_func = NULL; current_opened_class = NULL; current_loop_begin_bb = NULL; + current_loop_body_bb = NULL; current_loop_end_bb = NULL; current_loop_exit_val = NULL; @@ -3005,9 +3007,11 @@ case NODE_BREAK: case NODE_NEXT: + case NODE_REDO: case NODE_RETURN: { const bool within_loop = current_loop_begin_bb != NULL + && current_loop_body_bb != NULL && current_loop_end_bb != NULL; if (!current_block && !within_loop) { @@ -3017,6 +3021,9 @@ if (nd_type(node) == NODE_NEXT) { rb_raise(rb_eLocalJumpError, "unexpected next"); } + if (nd_type(node) == NODE_REDO) { + rb_raise(rb_eLocalJumpError, "unexpected redo"); + } } Value *val = node->nd_head != NULL @@ -3030,6 +3037,9 @@ else if (nd_type(node) == NODE_NEXT) { BranchInst::Create(current_loop_begin_bb, bb); } + else if (nd_type(node) == NODE_REDO) { + BranchInst::Create(current_loop_body_bb, bb); + } else { ReturnInst::Create(val, bb); } @@ -3045,6 +3055,10 @@ params.push_back(val); CallInst::Create(breakFunc, params.begin(), params.end(), "", bb); } + else if (nd_type(node) == NODE_REDO) { + // TODO + abort(); + } ReturnInst::Create(val, bb); } @@ -3681,10 +3695,12 @@ } BasicBlock *old_current_loop_begin_bb = current_loop_begin_bb; + BasicBlock *old_current_loop_body_bb = current_loop_body_bb; BasicBlock *old_current_loop_end_bb = current_loop_end_bb; Value *old_current_loop_exit_val = current_loop_exit_val; current_loop_begin_bb = loopBB; + current_loop_body_bb = bodyBB; current_loop_end_bb = afterBB; current_loop_exit_val = NULL; @@ -3702,6 +3718,7 @@ } current_loop_begin_bb = old_current_loop_begin_bb; + current_loop_body_bb = old_current_loop_body_bb; current_loop_end_bb = old_current_loop_end_bb; current_loop_exit_val = old_current_loop_exit_val; @@ -3716,6 +3733,7 @@ current_block = true; BasicBlock *old_current_loop_begin_bb = current_loop_begin_bb; + BasicBlock *old_current_loop_body_bb = current_loop_body_bb; BasicBlock *old_current_loop_end_bb = current_loop_end_bb; current_loop_begin_bb = current_loop_end_bb = NULL; Function *old_current_block_func = current_block_func; @@ -3728,6 +3746,7 @@ assert(Function::classof(block)); current_loop_begin_bb = old_current_loop_begin_bb; + current_loop_body_bb = old_current_loop_body_bb; current_loop_end_bb = old_current_loop_end_bb; current_block = false; current_mid = old_current_mid;

1 0

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

23 Mar '09

Revision: 1081 http://trac.macosforge.org/projects/ruby/changeset/1081 Author: lsansonetti(a)apple.com Date: 2009-03-22 21:26:24 -0700 (Sun, 22 Mar 2009) Log Message: ----------- order_spec.rb is good now (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 04:25:29 UTC (rev 1080) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-23 04:26:24 UTC (rev 1081) @@ -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 } + KNOWN_GOOD = %w{ and or order } desc "Run continuous integration language examples (known good)" task :ci do @@ -28,4 +28,4 @@ sh "./mspec/bin/mspec ci -B spec/frozen/ruby.1.9.mspec spec/frozen/language" end end -end \ No newline at end of file +end

1 0

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

23 Mar '09

Revision: 1080 http://trac.macosforge.org/projects/ruby/changeset/1080 Author: lsansonetti(a)apple.com Date: 2009-03-22 21:25:29 -0700 (Sun, 22 Mar 2009) Log Message: ----------- when compiling a dispatch call, make sure we compile the block *after* the arguments, because it is covered in a crazy rubyspec and we do want to pass these crazy rubyspec do we? Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-23 03:35:25 UTC (rev 1079) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-23 04:25:29 UTC (rev 1080) @@ -2919,25 +2919,29 @@ return cast<Value>(CallInst::Create(f, params.begin(), params.end(), "", bb)); } - // Prepare the dispatcher parameters + // Prepare the dispatcher parameters. std::vector<Value *> params; + // Method cache. const SEL sel = mid_to_sel(mid, positive_arity ? 1 : 0); void *cache = GET_VM()->method_cache_get(sel, super_call); params.push_back(compile_const_pointer(cache)); + // Self. params.push_back(recv == NULL ? current_self : compile_node(recv)); + + // Selector. params.push_back(compile_const_pointer((void *)sel)); - Value *blockVal; - if (args != NULL && nd_type(args) == NODE_BLOCK_PASS) { - assert(!block_given); - blockVal = compile_block_create(args); - args = args->nd_head; + + // RubySpec requires that we compile the block *after* the arguments, so we + // do pass NULL as the block for the moment... + params.push_back(compile_const_pointer(NULL)); + NODE *real_args = args; + if (real_args != NULL && nd_type(real_args) == NODE_BLOCK_PASS) { + real_args = args->nd_head; } - else { - blockVal = block_given ? compile_block_create() : compile_const_pointer(NULL); - } - params.push_back(blockVal); + + // Call option. const unsigned char call_opt = super_call ? DISPATCH_SUPER : (nd_type(node) == NODE_VCALL) @@ -2945,6 +2949,7 @@ : 0; params.push_back(ConstantInt::get(Type::Int8Ty, call_opt)); + // Arguments. int argc = 0; if (nd_type(node) == NODE_ZSUPER) { params.push_back(ConstantInt::get(Type::Int32Ty, fargs_arity)); @@ -2957,11 +2962,12 @@ } argc = fargs_arity; } - else if (args != NULL) { + else if (real_args != NULL) { std::vector<Value *> arguments; - compile_dispatch_arguments(args, arguments, &argc); + compile_dispatch_arguments(real_args, arguments, &argc); params.push_back(ConstantInt::get(Type::Int32Ty, argc)); - for (std::vector<Value *>::iterator i = arguments.begin(); i != arguments.end(); ++i) { + for (std::vector<Value *>::iterator i = arguments.begin(); + i != arguments.end(); ++i) { params.push_back(*i); } } @@ -2969,6 +2975,18 @@ params.push_back(ConstantInt::get(Type::Int32Ty, 0)); } + // Now compile the block and insert it in the params list! + Value *blockVal; + if (args != NULL && nd_type(args) == NODE_BLOCK_PASS) { + assert(!block_given); + blockVal = compile_block_create(args); + } + else { + blockVal = block_given + ? compile_block_create() : compile_const_pointer(NULL); + } + params[3] = blockVal; + // Can we optimize the call? if (!super_call && !splat_args) { Value *optimizedCall = compile_optimized_dispatch_call(sel, argc, params);

1 0

[1079] MacRuby/branches/experimental/mspec/lib/pp.rb
by source_changes＠macosforge.org 23 Mar '09

23 Mar '09

Revision: 1079 http://trac.macosforge.org/projects/ruby/changeset/1079 Author: lsansonetti(a)apple.com Date: 2009-03-22 20:35:25 -0700 (Sun, 22 Mar 2009) Log Message: ----------- fixed fake #pretty_inspect method Modified Paths: -------------- MacRuby/branches/experimental/mspec/lib/pp.rb Modified: MacRuby/branches/experimental/mspec/lib/pp.rb =================================================================== --- MacRuby/branches/experimental/mspec/lib/pp.rb 2009-03-23 03:31:59 UTC (rev 1078) +++ MacRuby/branches/experimental/mspec/lib/pp.rb 2009-03-23 03:35:25 UTC (rev 1079) @@ -1,5 +1,5 @@ module Kernel - def pretty_inspect(obj) - puts obj.inspect + def pretty_inspect + self.inspect end end

1 0

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

23 Mar '09

Revision: 1078 http://trac.macosforge.org/projects/ruby/changeset/1078 Author: lsansonetti(a)apple.com Date: 2009-03-22 20:31:59 -0700 (Sun, 22 Mar 2009) Log Message: ----------- fixed bugs in singleton method definition + added tests (one is still failing though) Modified Paths: -------------- MacRuby/branches/experimental/class.c MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/class.c =================================================================== --- MacRuby/branches/experimental/class.c 2009-03-23 02:53:19 UTC (rev 1077) +++ MacRuby/branches/experimental/class.c 2009-03-23 03:31:59 UTC (rev 1078) @@ -1131,12 +1131,15 @@ rb_bug("unknown immediate %ld", obj); } +#if 0 DEFER_INTS; if (RCLASS_SINGLETON(RBASIC(obj)->klass) && rb_iv_get(RBASIC(obj)->klass, "__attached__") == obj) { klass = RBASIC(obj)->klass; } - else { + else +#endif + { switch (TYPE(obj)) { case T_CLASS: case T_MODULE: @@ -1155,8 +1158,10 @@ OBJ_UNTAINT(klass); } #endif - if (OBJ_FROZEN(obj)) OBJ_FREEZE(klass); - ALLOW_INTS; + if (OBJ_FROZEN(obj)) { + OBJ_FREEZE(klass); + } +// ALLOW_INTS; return klass; } Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-23 02:53:19 UTC (rev 1077) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-23 03:31:59 UTC (rev 1078) @@ -281,6 +281,7 @@ Value *compile_ivar_assignment(ID vid, Value *val); Value *compile_current_class(void); Value *compile_const(ID id, Value *outer); + Value *compile_singleton_class(Value *obj); Value *compile_defined_expression(NODE *node); Value *compile_dstr(NODE *node); void compile_dead_branch(void); @@ -1014,6 +1015,22 @@ return compile_protected_call(getConstFunc, params); } +Value * +RoxorCompiler::compile_singleton_class(Value *obj) +{ + if (singletonClassFunc == NULL) { + // VALUE rb_singleton_class(VALUE klass); + singletonClassFunc = cast<Function>(module->getOrInsertFunction( + "rb_singleton_class", + RubyObjTy, RubyObjTy, NULL)); + } + + std::vector<Value *> params; + params.push_back(obj); + + return compile_protected_call(singletonClassFunc, params); +} + #define DEFINED_IVAR 1 #define DEFINED_GVAR 2 #define DEFINED_CVAR 3 @@ -2753,17 +2770,7 @@ Value *classVal; if (nd_type(node) == NODE_SCLASS) { - if (singletonClassFunc == NULL) { - // VALUE rb_singleton_class(VALUE klass); - singletonClassFunc = cast<Function>(module->getOrInsertFunction("rb_singleton_class", - RubyObjTy, RubyObjTy, NULL)); - } - - std::vector<Value *> params; - - params.push_back(compile_current_class()); - - classVal = CallInst::Create(singletonClassFunc, params.begin(), params.end(), "", bb); + classVal = compile_singleton_class(compile_current_class()); } else { assert(node->nd_cpath->nd_mid > 0); @@ -3337,10 +3344,10 @@ NODE *body = node->nd_defn; assert(body != NULL); - const bool class_method = nd_type(node) == NODE_DEFS; + const bool singleton_method = nd_type(node) == NODE_DEFS; current_mid = mid; - current_instance_method = !class_method; + current_instance_method = !singleton_method; DEBUG_LEVEL_INC(); Value *val = compile_node(body); @@ -3351,18 +3358,28 @@ current_mid = 0; current_instance_method = false; + Value *classVal; + if (singleton_method) { + assert(node->nd_recv != NULL); + classVal = compile_singleton_class(compile_node(node->nd_recv)); + } + else { + classVal = compile_current_class(); + } + if (prepareMethodFunc == NULL) { - // void rb_vm_prepare_method(Class klass, SEL sel, Function *f, - // NODE *node, unsigned char class_method) + // void rb_vm_prepare_method(Class klass, SEL sel, + // Function *f, NODE *node); prepareMethodFunc = - cast<Function>(module->getOrInsertFunction("rb_vm_prepare_method", - Type::VoidTy, RubyObjTy, PtrTy, PtrTy, - PtrTy, Type::Int8Ty, NULL)); + cast<Function>(module->getOrInsertFunction( + "rb_vm_prepare_method", + Type::VoidTy, RubyObjTy, PtrTy, PtrTy, + PtrTy, NULL)); } std::vector<Value *> params; - params.push_back(compile_current_class()); + params.push_back(classVal); rb_vm_arity_t arity = rb_vm_node_arity(body); const SEL sel = mid_to_sel(mid, arity.real); @@ -3372,11 +3389,9 @@ rb_objc_retain((void *)body); params.push_back(compile_const_pointer(body)); - val = ConstantInt::get(Type::Int8Ty, class_method ? 1 : 0); - params.push_back(val); + CallInst::Create(prepareMethodFunc, params.begin(), + params.end(), "", bb); - CallInst::Create(prepareMethodFunc, params.begin(), params.end(), "", bb); - return nilVal; } break; @@ -4158,16 +4173,12 @@ extern "C" void -rb_vm_prepare_method(Class klass, SEL sel, Function *func, NODE *node, unsigned char class_method) +rb_vm_prepare_method(Class klass, SEL sel, Function *func, NODE *node) { if (klass == NULL) { klass = GET_VM()->current_opened_class; } - if (class_method) { - klass = *(Class *)klass; - } - IMP imp = GET_VM()->compile(func); rb_vm_define_method(klass, sel, imp, node); Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-23 02:53:19 UTC (rev 1077) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-23 03:31:59 UTC (rev 1078) @@ -780,6 +780,38 @@ end } + assert '42', %{ + class Foo + def self.foo; 42; end + end + p Foo.foo + } + assert '42', %{ + class Foo + class << self + def foo; 42; end + end + end + p Foo.foo + } + assert '42', %{ + class Foo; end + def Foo.foo; 42; end + p Foo.foo + } + assert '42', %{ + o = Object.new + def o.foo; 42; end + p o.foo + } + assert '42', %{ + o = Object.new + class << o + def foo; 42; end + end + p o.foo + } + end test "blocks" do

1 0

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

23 Mar '09

Revision: 1077 http://trac.macosforge.org/projects/ruby/changeset/1077 Author: lsansonetti(a)apple.com Date: 2009-03-22 19:53:19 -0700 (Sun, 22 Mar 2009) Log Message: ----------- removed a useless assertion Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-23 01:29:30 UTC (rev 1076) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-23 02:53:19 UTC (rev 1077) @@ -2084,9 +2084,8 @@ // Get dynamic vars. if (current_block && node->nd_tbl != NULL) { - int args_count = (int)node->nd_tbl[0]; - assert(args_count == nargs); - int lvar_count = (int)node->nd_tbl[args_count + 1]; + const int args_count = (int)node->nd_tbl[0]; + const int lvar_count = (int)node->nd_tbl[args_count + 1]; for (int i = 0; i < lvar_count; i++) { ID id = node->nd_tbl[i + args_count + 2]; if (lvars.find(id) != lvars.end()) {

1 0

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

23 Mar '09

Revision: 1076 http://trac.macosforge.org/projects/ruby/changeset/1076 Author: lsansonetti(a)apple.com Date: 2009-03-22 18:29:30 -0700 (Sun, 22 Mar 2009) Log Message: ----------- changed the test so that it works in both macruby and pure 1.9 Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-23 01:27:22 UTC (rev 1075) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-23 01:29:30 UTC (rev 1076) @@ -497,7 +497,7 @@ assert "X", "class X; end; p X" assert "Class", "class X; end; p X.class" - assert "NSObject", "class X; end; p X.superclass" + assert "true", "class X; end; p X.superclass == Object" assert "Y", "class X; end; class Y < X; end; p Y" assert "X", "class X; end; class Y < X; end; p Y.superclass"

1 0

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

23 Mar '09

Revision: 1075 http://trac.macosforge.org/projects/ruby/changeset/1075 Author: lsansonetti(a)apple.com Date: 2009-03-22 18:27:22 -0700 (Sun, 22 Mar 2009) Log Message: ----------- added failing tests for the |x,| block argument Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-23 00:49:09 UTC (rev 1074) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-23 01:27:22 UTC (rev 1075) @@ -875,6 +875,12 @@ foo { |a = 42, *rest| p [a, rest] } } + assert 'nil', 'p = proc { |x,| p x }; p.call' + assert '42', 'p = proc { |x,| p x }; p.call(42)' + assert '42', 'p = proc { |x,| p x }; p.call(42,1,2,3)' + assert '42', 'p = proc { |x,| p x }; p.call([42])' + assert '42', 'p = proc { |x,| p x }; p.call([42,1,2,3])' + assert "true", "def foo; p block_given?; end; foo {}" assert "false", "def foo; p block_given?; end; foo" assert "false", "def foo; p block_given?; end; def bar; foo; end; bar {}"

1 0

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

23 Mar '09

Revision: 1074 http://trac.macosforge.org/projects/ruby/changeset/1074 Author: eloy.de.enige(a)gmail.com Date: 2009-03-22 17:49:09 -0700 (Sun, 22 Mar 2009) Log Message: ----------- Tagged a case example as critical. Only 2 failing tests after that. 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 00:35:19 UTC (rev 1073) +++ MacRuby/branches/experimental/spec/frozen/language/case_spec.rb 2009-03-23 00:49:09 UTC (rev 1074) @@ -28,7 +28,7 @@ when "b" end.should == nil end - + it "evaluates the 'else'-body when no other expression matches" do case "c" when "a"; 'foo' @@ -36,7 +36,7 @@ else 'zzz' end.should == 'zzz' end - + it "returns nil when no expression matches and 'else'-body is empty" do case "c" when "a"; "a" @@ -89,7 +89,7 @@ "foo" end.should == "foo" end - + it "takes lists of values" do case 'z' when 'a', 'b', 'c', 'd' @@ -131,10 +131,11 @@ end.should == "foo" end + # MR: critical it "concats arrays before expanding them" do a = ['a', 'b', 'c', 'd'] b = ['f'] - + case 'f' when 'f', *a|b "foo" @@ -142,14 +143,14 @@ "bar" end.should == "foo" end - + it "never matches when clauses with no values" do case nil when *[] "foo" end.should == nil end - + it "lets you define a method after the case statement" do case (def foo; 'foo'; end; 'f') when 'a' @@ -158,7 +159,7 @@ 'bar' end.should == 'bar' end - + it "raises a SyntaxError when 'else' is used when no 'when' is given" do lambda { eval <<-CODE

1 0