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

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

26 Mar '09

Revision: 1153 http://trac.macosforge.org/projects/ruby/changeset/1153 Author: lsansonetti(a)apple.com Date: 2009-03-25 18:18:56 -0700 (Wed, 25 Mar 2009) Log Message: ----------- let's be friendler and allow people calling rb_vm_run_under() without self Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-26 00:55:06 UTC (rev 1152) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-26 01:18:56 UTC (rev 1153) @@ -5917,10 +5917,11 @@ rb_vm_run_under(VALUE klass, VALUE self, const char *fname, NODE *node) { assert(klass != 0); - assert(self != 0); VALUE old_top_object = GET_VM()->current_top_object; - GET_VM()->current_top_object = self; + if (self != 0) { + GET_VM()->current_top_object = self; + } Class old_class = GET_VM()->current_class; GET_VM()->current_class = (Class)klass;

1 0

[1152] MacRuby/branches/experimental
by source_changes＠macosforge.org 26 Mar '09

26 Mar '09

Revision: 1152 http://trac.macosforge.org/projects/ruby/changeset/1152 Author: lsansonetti(a)apple.com Date: 2009-03-25 17:55:06 -0700 (Wed, 25 Mar 2009) Log Message: ----------- fixed bugs in const lookup Modified Paths: -------------- MacRuby/branches/experimental/class.c MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/roxor.h MacRuby/branches/experimental/test_roxor.rb MacRuby/branches/experimental/variable.c Modified: MacRuby/branches/experimental/class.c =================================================================== --- MacRuby/branches/experimental/class.c 2009-03-26 00:54:43 UTC (rev 1151) +++ MacRuby/branches/experimental/class.c 2009-03-26 00:55:06 UTC (rev 1152) @@ -372,6 +372,7 @@ RCLASS_SET_VERSION(klass, v); } RCLASS_SET_VERSION_FLAG(klass, RCLASS_IS_SINGLETON); + rb_vm_set_outer(klass, rb_cNSObject); rb_singleton_class_attached(klass, obj); Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-26 00:54:43 UTC (rev 1151) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-26 00:55:06 UTC (rev 1152) @@ -370,6 +370,11 @@ } }; +struct rb_vm_outer { + Class klass; + struct rb_vm_outer *outer; +}; + class RoxorVM { private: @@ -384,6 +389,7 @@ std::map<ID, struct ccache *> ccache; std::map<Class, std::map<ID, int> *> ivar_slots; std::map<SEL, GlobalVariable *> redefined_ops_gvars; + std::map<Class, struct rb_vm_outer *> outers; public: static RoxorVM *current; @@ -482,6 +488,21 @@ } int find_ivar_slot(VALUE klass, ID name, bool create); bool class_can_have_ivar_slots(VALUE klass); + + struct rb_vm_outer *get_outer(Class klass) { + std::map<Class, struct rb_vm_outer *>::iterator iter = + outers.find(klass); + return iter == outers.end() ? NULL : iter->second; + } + + void set_outer(Class klass, Class mod) { + struct rb_vm_outer *mod_outer = get_outer(mod); + struct rb_vm_outer *class_outer = (struct rb_vm_outer *) + malloc(sizeof(struct rb_vm_outer)); + class_outer->klass = klass; + class_outer->outer = mod_outer; + outers[klass] = class_outer; + } }; RoxorVM *RoxorVM::current = NULL; @@ -991,16 +1012,25 @@ Value * RoxorCompiler::compile_const(ID id, Value *outer) { + bool outer_given = true; + if (outer == NULL) { + outer = compile_current_class(); + outer_given = false; + } + if (getConstFunc == NULL) { - // VALUE rb_vm_get_const(VALUE mod, struct ccache *cache, ID id); - getConstFunc = cast<Function>(module->getOrInsertFunction("rb_vm_get_const", - RubyObjTy, RubyObjTy, PtrTy, IntTy, NULL)); + // VALUE rb_vm_get_const(VALUE mod, unsigned char lexical_lookup, + // struct ccache *cache, ID id); + getConstFunc = cast<Function>(module->getOrInsertFunction( + "rb_vm_get_const", + RubyObjTy, RubyObjTy, Type::Int8Ty, PtrTy, IntTy, NULL)); } std::vector<Value *> params; struct ccache *cache = GET_VM()->constant_cache_get(id); params.push_back(outer); + params.push_back(ConstantInt::get(Type::Int8Ty, outer_given ? 0 : 1)); params.push_back(compile_const_pointer(cache)); params.push_back(ConstantInt::get(IntTy, id)); @@ -1027,8 +1057,9 @@ #define DEFINED_GVAR 2 #define DEFINED_CVAR 3 #define DEFINED_CONST 4 -#define DEFINED_SUPER 5 -#define DEFINED_METHOD 6 +#define DEFINED_LCONST 5 +#define DEFINED_SUPER 6 +#define DEFINED_METHOD 7 Value * RoxorCompiler::compile_defined_expression(NODE *node) @@ -1116,8 +1147,9 @@ break; case NODE_CONST: - type = DEFINED_CONST; + type = DEFINED_LCONST; what1 = (VALUE)node->nd_vid; + what2 = compile_current_class(); break; case NODE_SUPER: @@ -3236,7 +3268,7 @@ case NODE_CONST: assert(node->nd_vid > 0); - return compile_const(node->nd_vid, compile_current_class()); + return compile_const(node->nd_vid, NULL); case NODE_CDECL: { @@ -4114,27 +4146,84 @@ GET_VM()->const_defined(id); } +static inline VALUE +rb_const_get_direct(VALUE klass, ID id) +{ + CFDictionaryRef iv_dict = rb_class_ivar_dict(klass); + if (iv_dict != NULL) { + VALUE value; + if (CFDictionaryGetValueIfPresent(iv_dict, (const void *)id, + (const void **)&value)) { + return value; + } + } + VALUE mods = rb_attr_get(klass, idIncludedModules); + if (mods != Qnil) { + int i, count = RARRAY_LEN(mods); + for (i = 0; i < count; i++) { + VALUE val = rb_const_get_direct(RARRAY_AT(mods, i), id); + if (val != Qundef) { + return val; + } + } + } + return Qundef; +} + +static VALUE +rb_vm_const_lookup(VALUE outer, ID path, bool lexical, bool defined) +{ + if (lexical) { + struct rb_vm_outer *o = GET_VM()->get_outer((Class)outer); + while (o != NULL && o->klass != (Class)rb_cNSObject) { + VALUE val = rb_const_get_direct((VALUE)o->klass, path); + if (val != Qundef) { + return defined ? Qtrue : val; + } + o = o->outer; + } + } + + return defined ? rb_const_defined(outer, path) : rb_const_get(outer, path); +} + extern "C" VALUE -rb_vm_get_const(VALUE outer, struct ccache *cache, ID path) +rb_vm_get_const(VALUE outer, unsigned char lexical_lookup, + struct ccache *cache, ID path) { - // TODO if called within module_eval, we should update outer + if (GET_VM()->current_class != NULL && lexical_lookup) { + outer = (VALUE)GET_VM()->current_class; + } + assert(cache != NULL); if (cache->outer == outer && cache->val != Qundef) { return cache->val; } + + VALUE val = rb_vm_const_lookup(outer, path, lexical_lookup, false); + cache->outer = outer; - return cache->val = rb_const_get(outer, path); + cache->val = val; + + return val; } extern "C" void -rb_vm_const_defined(ID path) +rb_vm_const_is_defined(ID path) { GET_VM()->const_defined(path); } extern "C" +void +rb_vm_set_outer(VALUE klass, VALUE under) +{ + GET_VM()->set_outer((Class)klass, (Class)under); +} + +extern "C" VALUE rb_vm_define_class(ID path, VALUE outer, VALUE super, unsigned char is_module) { @@ -4340,12 +4429,10 @@ break; case DEFINED_CONST: + case DEFINED_LCONST: { - VALUE outer = what2; - if (NIL_P(outer)) { - outer = CLASS_OF(self); - } - if (rb_const_defined(outer, (ID)what)) { + if (rb_vm_const_lookup(what2, (ID)what, + type == DEFINED_LCONST, true)) { str = "constant"; } } Modified: MacRuby/branches/experimental/roxor.h =================================================================== --- MacRuby/branches/experimental/roxor.h 2009-03-26 00:54:43 UTC (rev 1151) +++ MacRuby/branches/experimental/roxor.h 2009-03-26 00:55:06 UTC (rev 1152) @@ -18,7 +18,7 @@ int rb_vm_safe_level(void); void rb_vm_set_safe_level(int level); VALUE rb_vm_top_self(void); -void rb_vm_const_defined(ID path); +void rb_vm_const_is_defined(ID path); bool rb_vm_lookup_method(Class klass, SEL sel, IMP *pimp, NODE **pnode); bool rb_vm_lookup_method2(Class klass, ID mid, SEL *psel, IMP *pimp, NODE **pnode); void rb_vm_define_method(Class klass, SEL sel, IMP imp, NODE *node); @@ -33,6 +33,7 @@ bool rb_vm_respond_to(VALUE obj, SEL sel, bool priv); VALUE rb_vm_method_missing(VALUE obj, int argc, const VALUE *argv); int rb_vm_find_class_ivar_slot(VALUE klass, ID name); +void rb_vm_set_outer(VALUE klass, VALUE under); static inline void rb_vm_regrow_robject_slots(struct RObject *obj, unsigned int new_num_slot) Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-26 00:54:43 UTC (rev 1151) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-26 00:55:06 UTC (rev 1152) @@ -435,6 +435,21 @@ assert 'true', 'p ::String == String' + assert '42', %q{ + o = Object.new + class << o + module Foo + Bar = 42 + end + class Baz; include Foo; end + class Baz; + def self.bar; Bar; end + end + def baz; Baz; end + end + p o.baz.bar + } + end test "ranges" do Modified: MacRuby/branches/experimental/variable.c =================================================================== --- MacRuby/branches/experimental/variable.c 2009-03-26 00:54:43 UTC (rev 1151) +++ MacRuby/branches/experimental/variable.c 2009-03-26 00:55:06 UTC (rev 1152) @@ -273,6 +273,8 @@ } OBJ_FREEZE(str); rb_ivar_set(klass, classpath, str); + + rb_vm_set_outer(klass, under); } VALUE @@ -1831,7 +1833,7 @@ DLOG("CONS", "%s::%s <- %p", class_getName((Class)klass), rb_id2name(id), (void *)val); CFDictionarySetValue(iv_dict, (const void *)id, (const void *)val); - rb_vm_const_defined(id); + rb_vm_const_is_defined(id); } void

1 0

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

26 Mar '09

Revision: 1151 http://trac.macosforge.org/projects/ruby/changeset/1151 Author: lsansonetti(a)apple.com Date: 2009-03-25 17:54:43 -0700 (Wed, 25 Mar 2009) Log Message: ----------- added defined_spec.rb to the green list Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-25 13:03:46 UTC (rev 1150) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-26 00:54:43 UTC (rev 1151) @@ -5,6 +5,7 @@ and array case + defined else execution hash

1 0

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

25 Mar '09

Revision: 1150 http://trac.macosforge.org/projects/ruby/changeset/1150 Author: vincent.isambart(a)gmail.com Date: 2009-03-25 06:03:46 -0700 (Wed, 25 Mar 2009) Log Message: ----------- reverted my change for def f(a=b=c=1) and fixed the problem in a simpler way: I just moved the local vars allocation code before the opt args compilation Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-25 12:59:29 UTC (rev 1149) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-25 13:03:46 UTC (rev 1150) @@ -710,43 +710,13 @@ Function::ArgumentListType::iterator RoxorCompiler::compile_optional_arguments(Function::ArgumentListType::iterator iter, - NODE *start_node) + NODE *node) { - NODE *node = start_node; assert(nd_type(node) == NODE_OPT_ARG); - // we have to handle the case def f(a = b = c = 1) and create those b and c - // and this before we compile the assignments themselves do { assert(node->nd_value != NULL); - assert(nd_type(node->nd_value) == NODE_LASGN || nd_type(node->nd_value) == NODE_DASGN_CURR); - NODE *assign_node = node->nd_value->nd_value; - while (assign_node != NULL) { - switch (nd_type(assign_node)) { - case NODE_LASGN: - case NODE_DASGN_CURR: - Value *slot = new AllocaInst(RubyObjTy, "", bb); - new StoreInst(nilVal, slot, bb); - lvars[assign_node->nd_vid] = slot; - case NODE_IASGN: - case NODE_GASGN: - assign_node = assign_node->nd_value; - break; - - // TODO: NODE_ATTRASGN - - default: - assign_node = NULL; - } - } - } - while ((node = node->nd_next) != NULL); - - node = start_node; - do { - assert(node->nd_value != NULL); - Value *isUndefInst = new ICmpInst(ICmpInst::ICMP_EQ, iter, undefVal, "", bb); Function *f = bb->getParent(); @@ -2321,6 +2291,22 @@ lvars[id] = slot; } + // local vars must be created before the optional arguments + // because they can be used in them, for instance with def f(a=b=c=1) + int lvar_count = (int)node->nd_tbl[args_count + 1]; + for (i = 0; i < lvar_count; i++) { + ID id = node->nd_tbl[i + args_count + 2]; + if (lvars.find(id) != lvars.end()) { + continue; + } +#if ROXOR_COMPILER_DEBUG + printf("var %s\n", rb_id2name(id)); +#endif + Value *store = new AllocaInst(RubyObjTy, "", bb); + new StoreInst(nilVal, store, bb); + lvars[id] = store; + } + // Compile optional arguments. NODE *n = node->nd_args; Function::ArgumentListType::iterator iter = f->arg_begin(); @@ -2337,20 +2323,6 @@ } n = n->nd_next; } - - int lvar_count = (int)node->nd_tbl[args_count + 1]; - for (i = 0; i < lvar_count; i++) { - ID id = node->nd_tbl[i + args_count + 2]; - if (lvars.find(id) != lvars.end()) { - continue; - } -#if ROXOR_COMPILER_DEBUG - printf("var %s\n", rb_id2name(id)); -#endif - Value *store = new AllocaInst(RubyObjTy, "", bb); - new StoreInst(nilVal, store, bb); - lvars[id] = store; - } } Value *val = NULL;

1 0

[1149] MacRuby/branches/experimental/spec/frozen
by source_changes＠macosforge.org 25 Mar '09

25 Mar '09

Revision: 1149 http://trac.macosforge.org/projects/ruby/changeset/1149 Author: eloy.de.enige(a)gmail.com Date: 2009-03-25 05:59:29 -0700 (Wed, 25 Mar 2009) Log Message: ----------- Fixed ruby version guard to run upto 1.9 and fixed the description for 1.8. Updated fails tags for macruby, only 1 spec fails. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/defined_spec.rb MacRuby/branches/experimental/spec/frozen/tags/1.9/language/defined_tags.txt MacRuby/branches/experimental/spec/frozen/tags/macruby/language/defined_tags.txt Modified: MacRuby/branches/experimental/spec/frozen/language/defined_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/defined_spec.rb 2009-03-25 12:16:10 UTC (rev 1148) +++ MacRuby/branches/experimental/spec/frozen/language/defined_spec.rb 2009-03-25 12:59:29 UTC (rev 1149) @@ -175,8 +175,8 @@ ret.should == "super" end - ruby_version_is "" ... "1.8" do - it "returns 'local-variable' when defined? is called on a block var" do + ruby_version_is "" ... "1.9" do + it "returns 'local-variable(in-block)' when defined? is called on a block var" do block = Proc.new { |xxx| defined?(xxx) } ret = block.call(1) ret.should == 'local-variable(in-block)' Modified: MacRuby/branches/experimental/spec/frozen/tags/1.9/language/defined_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/1.9/language/defined_tags.txt 2009-03-25 12:16:10 UTC (rev 1148) +++ MacRuby/branches/experimental/spec/frozen/tags/1.9/language/defined_tags.txt 2009-03-25 12:59:29 UTC (rev 1149) @@ -1,3 +1,2 @@ fails:The defined? keyword returns 'super' when Subclass#no_args uses defined? fails:The defined? keyword returns 'super' when Subclass#args uses defined? -fails:The defined? keyword returns 'local-variable' when defined? is called on a block var Modified: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/defined_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/defined_tags.txt 2009-03-25 12:16:10 UTC (rev 1148) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/defined_tags.txt 2009-03-25 12:59:29 UTC (rev 1149) @@ -1,3 +1 @@ -fails:The defined? keyword returns 'super' when Subclass#no_args uses defined? -fails:The defined? keyword returns 'super' when Subclass#args uses defined? -fails:The defined? keyword returns 'local-variable' when defined? is called on a block var +fails:The defined? keyword follows normal lexical and hierarchical scoping for constants

1 0

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

25 Mar '09

Revision: 1148 http://trac.macosforge.org/projects/ruby/changeset/1148 Author: vincent.isambart(a)gmail.com Date: 2009-03-25 05:16:10 -0700 (Wed, 25 Mar 2009) Log Message: ----------- added a strange crashing test Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-25 12:14:55 UTC (rev 1147) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-25 12:16:10 UTC (rev 1148) @@ -840,6 +840,13 @@ def bar(a = foo); end bar } + + assert '42', %{ + def foo() yield 1, 2 end + x = 1 + w = 42 + foo { |x, y = :y| p w } + } end test "blocks" do

1 0

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

25 Mar '09

Revision: 1147 http://trac.macosforge.org/projects/ruby/changeset/1147 Author: vincent.isambart(a)gmail.com Date: 2009-03-25 05:14:55 -0700 (Wed, 25 Mar 2009) Log Message: ----------- added basic code for supporting def f(a=b=c=1) Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-25 12:14:50 UTC (rev 1146) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-25 12:14:55 UTC (rev 1147) @@ -710,13 +710,43 @@ Function::ArgumentListType::iterator RoxorCompiler::compile_optional_arguments(Function::ArgumentListType::iterator iter, - NODE *node) + NODE *start_node) { + NODE *node = start_node; assert(nd_type(node) == NODE_OPT_ARG); + // we have to handle the case def f(a = b = c = 1) and create those b and c + // and this before we compile the assignments themselves do { assert(node->nd_value != NULL); + assert(nd_type(node->nd_value) == NODE_LASGN || nd_type(node->nd_value) == NODE_DASGN_CURR); + NODE *assign_node = node->nd_value->nd_value; + while (assign_node != NULL) { + switch (nd_type(assign_node)) { + case NODE_LASGN: + case NODE_DASGN_CURR: + Value *slot = new AllocaInst(RubyObjTy, "", bb); + new StoreInst(nilVal, slot, bb); + lvars[assign_node->nd_vid] = slot; + case NODE_IASGN: + case NODE_GASGN: + assign_node = assign_node->nd_value; + break; + + // TODO: NODE_ATTRASGN + + default: + assign_node = NULL; + } + } + } + while ((node = node->nd_next) != NULL); + + node = start_node; + do { + assert(node->nd_value != NULL); + Value *isUndefInst = new ICmpInst(ICmpInst::ICMP_EQ, iter, undefVal, "", bb); Function *f = bb->getParent();

1 0

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

25 Mar '09

Revision: 1146 http://trac.macosforge.org/projects/ruby/changeset/1146 Author: vincent.isambart(a)gmail.com Date: 2009-03-25 05:14:50 -0700 (Wed, 25 Mar 2009) Log Message: ----------- added failing tests Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-25 10:56:22 UTC (rev 1145) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-25 12:14:50 UTC (rev 1146) @@ -621,6 +621,7 @@ assert "42", "def foo(x, y=123, z=2); x+y+z; end; p foo(30, 10)" assert "126", "def foo(a=b=c=42); a+b+c; end; p foo" + assert "[42, nil]", "def f(a=X::x=b=1) p [a, b] end; f(42)" assert "42", "def foo; 1; end; i = 0; while i < 42; i += foo; end; p i" assert "42", %q{

1 0

[1145] MacRuby/branches/experimental
by source_changes＠macosforge.org 25 Mar '09

25 Mar '09

Revision: 1145 http://trac.macosforge.org/projects/ruby/changeset/1145 Author: vincent.isambart(a)gmail.com Date: 2009-03-25 03:56:22 -0700 (Wed, 25 Mar 2009) Log Message: ----------- cleanup up a few things 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-25 03:26:11 UTC (rev 1144) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-25 10:56:22 UTC (rev 1145) @@ -717,15 +717,15 @@ do { assert(node->nd_value != NULL); - Value *isNilInst = new ICmpInst(ICmpInst::ICMP_EQ, iter, undefVal, "", bb); + Value *isUndefInst = new ICmpInst(ICmpInst::ICMP_EQ, iter, undefVal, "", bb); Function *f = bb->getParent(); - BasicBlock *arg_nil = BasicBlock::Create("arg_nil", f); + BasicBlock *arg_undef = BasicBlock::Create("arg_undef", f); BasicBlock *next_bb = BasicBlock::Create("", f); - BranchInst::Create(arg_nil, next_bb, isNilInst, bb); + BranchInst::Create(arg_undef, next_bb, isUndefInst, bb); - bb = arg_nil; + bb = arg_undef; compile_node(node->nd_value); BranchInst::Create(next_bb, bb); @@ -4938,6 +4938,8 @@ argc, (VALUE *)argv); } +#undef rcache +#undef ocache printf("BOUH %s\n", (char *)sel); abort(); Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-25 03:26:11 UTC (rev 1144) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-25 10:56:22 UTC (rev 1145) @@ -834,6 +834,11 @@ p o.foo } + assert '42', %{ + def foo; p 42; end + def bar(a = foo); end + bar + } end test "blocks" do

1 0

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

25 Mar '09

Revision: 1144 http://trac.macosforge.org/projects/ruby/changeset/1144 Author: lsansonetti(a)apple.com Date: 2009-03-24 20:26:11 -0700 (Tue, 24 Mar 2009) Log Message: ----------- added failing test Modified Paths: -------------- MacRuby/branches/experimental/test_roxor.rb Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-25 02:36:57 UTC (rev 1143) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-25 03:26:11 UTC (rev 1144) @@ -620,6 +620,8 @@ assert "42", "def foo(x, y=20, z=2); x+y+z; end; p foo(20)" assert "42", "def foo(x, y=123, z=2); x+y+z; end; p foo(30, 10)" + assert "126", "def foo(a=b=c=42); a+b+c; end; p foo" + assert "42", "def foo; 1; end; i = 0; while i < 42; i += foo; end; p i" assert "42", %q{ class X; def foo; 15; end; end @@ -1418,4 +1420,4 @@ assert ":ok", "puts ':ok'.encode('US-ASCII')" -end \ No newline at end of file +end

1 0