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

[1203] MacRuby/branches/experimental/spec/frozen/tags/macruby/language/ method_tags.txt
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1203 http://trac.macosforge.org/projects/ruby/changeset/1203 Author: lsansonetti(a)apple.com Date: 2009-03-27 01:30:29 -0700 (Fri, 27 Mar 2009) Log Message: ----------- tag a spec that cannot be executed (MAX_DISPATCH_ARGS assertion) Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/method_tags.txt Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/method_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/method_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/method_tags.txt 2009-03-27 08:30:29 UTC (rev 1203) @@ -0,0 +1 @@ +fails:Calling a method allows any number of args beyond required to method with a splat \ No newline at end of file Property changes on: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/method_tags.txt ___________________________________________________________________ Added: svn:eol-style + native

1 0

[1202] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1202 http://trac.macosforge.org/projects/ruby/changeset/1202 Author: lsansonetti(a)apple.com Date: 2009-03-27 01:16:51 -0700 (Fri, 27 Mar 2009) Log Message: ----------- implemented NODE_OP_ASGN2 (o.foo||=42) 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-27 04:53:14 UTC (rev 1201) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-27 08:16:51 UTC (rev 1202) @@ -2681,12 +2681,13 @@ break; case NODE_OP_ASGN1: + case NODE_OP_ASGN2: { assert(node->nd_recv != NULL); Value *recv = compile_node(node->nd_recv); - assert(node->nd_mid >= 0); - ID mid = node->nd_mid; + long type = nd_type(node) == NODE_OP_ASGN1 + ? node->nd_mid : node->nd_next->nd_mid; // a=[0] += 42 // @@ -2696,28 +2697,40 @@ assert(node->nd_args != NULL); assert(node->nd_args->nd_head != NULL); - assert(node->nd_args->nd_body != NULL); // tmp = a.send(:[], 0) std::vector<Value *> params; - void *cache = GET_VM()->method_cache_get(selAREF, false); + SEL sel; + if (nd_type(node) == NODE_OP_ASGN1) { + sel = selAREF; + } + else { + assert(node->nd_next->nd_vid > 0); + sel = mid_to_sel(node->nd_next->nd_vid, 0); + } + void *cache = GET_VM()->method_cache_get(sel, false); params.push_back(compile_const_pointer(cache)); params.push_back(recv); - params.push_back(compile_const_pointer((void *)selAREF)); + params.push_back(compile_const_pointer((void *)sel)); params.push_back(compile_const_pointer(NULL)); params.push_back(ConstantInt::get(Type::Int8Ty, 0)); + int argc = 0; std::vector<Value *> arguments; - int argc; - compile_dispatch_arguments(node->nd_args->nd_body, arguments, &argc); + if (nd_type(node) == NODE_OP_ASGN1) { + assert(node->nd_args->nd_body != NULL); + compile_dispatch_arguments(node->nd_args->nd_body, + arguments, + &argc); + } params.push_back(ConstantInt::get(Type::Int32Ty, argc)); for (std::vector<Value *>::iterator i = arguments.begin(); - i != arguments.end(); ++i) { + i != arguments.end(); ++i) { params.push_back(*i); } - Value *tmp = compile_optimized_dispatch_call(selAREF, argc, params); + Value *tmp = compile_optimized_dispatch_call(sel, argc, params); if (tmp == NULL) { tmp = compile_dispatch_call(params); } @@ -2728,7 +2741,10 @@ BasicBlock *touchedBB = NULL; BasicBlock *untouchedBB = NULL; Value *tmp2; - if (mid == 0 || mid == 1) { + NODE *value = nd_type(node) == NODE_OP_ASGN1 + ? node->nd_args->nd_head : node->nd_value; + assert(value != NULL); + if (type == 0 || type == 1) { // 0 means OR, 1 means AND Function *f = bb->getParent(); @@ -2736,7 +2752,7 @@ untouchedBB = BasicBlock::Create("", f); mergeBB = BasicBlock::Create("merge", f); - if (mid == 0) { + if (type == 0) { compile_boolean_test(tmp, untouchedBB, touchedBB); } else { @@ -2746,10 +2762,12 @@ BranchInst::Create(mergeBB, untouchedBB); bb = touchedBB; - tmp2 = compile_node(node->nd_args->nd_head); + tmp2 = compile_node(value); } else { - const SEL sel = mid_to_sel(mid, 1); + ID mid = nd_type(node) == NODE_OP_ASGN1 + ? node->nd_mid : node->nd_next->nd_mid; + sel = mid_to_sel(mid, 1); cache = GET_VM()->method_cache_get(sel, false); params.clear(); params.push_back(compile_const_pointer(cache)); @@ -2758,7 +2776,7 @@ params.push_back(compile_const_pointer(NULL)); params.push_back(ConstantInt::get(Type::Int8Ty, 0)); params.push_back(ConstantInt::get(Type::Int32Ty, 1)); - params.push_back(compile_node(node->nd_args->nd_head)); + params.push_back(compile_node(value)); tmp2 = compile_optimized_dispatch_call(sel, 1, params); if (tmp2 == NULL) { @@ -2767,12 +2785,19 @@ } // a.send(:[]=, 0, tmp) - - cache = GET_VM()->method_cache_get(selASET, false); + + if (nd_type(node) == NODE_OP_ASGN1) { + sel = selASET; + } + else { + assert(node->nd_next->nd_aid > 0); + sel = mid_to_sel(node->nd_next->nd_aid, 1); + } + cache = GET_VM()->method_cache_get(sel, false); params.clear(); params.push_back(compile_const_pointer(cache)); params.push_back(recv); - params.push_back(compile_const_pointer((void *)selASET)); + params.push_back(compile_const_pointer((void *)sel)); params.push_back(compile_const_pointer(NULL)); params.push_back(ConstantInt::get(Type::Int8Ty, 0)); argc++; @@ -2783,7 +2808,7 @@ } params.push_back(tmp2); - Value *ret = compile_optimized_dispatch_call(selASET, argc, params); + Value *ret = compile_optimized_dispatch_call(sel, argc, params); if (ret == NULL) { ret = compile_dispatch_call(params); } Modified: MacRuby/branches/experimental/test_roxor.rb =================================================================== --- MacRuby/branches/experimental/test_roxor.rb 2009-03-27 04:53:14 UTC (rev 1201) +++ MacRuby/branches/experimental/test_roxor.rb 2009-03-27 08:16:51 UTC (rev 1202) @@ -333,6 +333,20 @@ assert '42', "a=[123]; a[0] &&= 42; p a[0]" assert 'nil', "a=[]; a[0] &&= 123; p a[0]" + assert '42', %q{ + class Foo; attr_accessor :x; end + o = Foo.new + o.x ||= 42 + p o.x + } + assert '42', %q{ + class Foo; attr_accessor :x; end + o = Foo.new + o.x = 2 + o.x += 40 + p o.x + } + assert '42', "a ||= 42; p a" assert '42', "a = nil; a ||= 42; p a" assert '42', "a = false; a ||= 42; p a"

1 0

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

27 Mar '09

Revision: 1201 http://trac.macosforge.org/projects/ruby/changeset/1201 Author: lsansonetti(a)apple.com Date: 2009-03-26 21:53:14 -0700 (Thu, 26 Mar 2009) Log Message: ----------- let's not assert on a MASGN node part of the left side of a MASGN (it's not implemented yet, though) Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-27 04:23:34 UTC (rev 1200) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-27 04:53:14 UTC (rev 1201) @@ -2541,7 +2541,8 @@ if (rhsnGetFunc == NULL) { // VALUE rb_vm_rhsn_get(VALUE ary, int offset); - rhsnGetFunc = cast<Function>(module->getOrInsertFunction("rb_vm_rhsn_get", + rhsnGetFunc = cast<Function>(module->getOrInsertFunction( + "rb_vm_rhsn_get", RubyObjTy, RubyObjTy, Type::Int32Ty, NULL)); } @@ -2553,7 +2554,8 @@ std::vector<Value *> params; params.push_back(ary); params.push_back(ConstantInt::get(Type::Int32Ty, i++)); - Value *elt = CallInst::Create(rhsnGetFunc, params.begin(), params.end(), "", bb); + Value *elt = CallInst::Create(rhsnGetFunc, params.begin(), + params.end(), "", bb); switch (nd_type(ln)) { case NODE_LASGN: @@ -2574,8 +2576,16 @@ compile_attribute_assign(ln, elt); break; + case NODE_MASGN: + // a,(*b),c = 1, 2, 3; b #=> [2] + // This is a strange case but covered by the + // RubySpecs. + // TODO + break; + default: - compile_node_error("unimplemented MASGN subnode", ln); + compile_node_error("unimplemented MASGN subnode", + ln); } l = l->nd_next; }

1 0

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

27 Mar '09

Revision: 1200 http://trac.macosforge.org/projects/ruby/changeset/1200 Author: lsansonetti(a)apple.com Date: 2009-03-26 21:23:34 -0700 (Thu, 26 Mar 2009) Log Message: ----------- moved precedence_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-27 04:23:12 UTC (rev 1199) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-27 04:23:34 UTC (rev 1200) @@ -16,6 +16,7 @@ not or order + precedence redo retry string @@ -38,7 +39,6 @@ magic_comment metaclass next - precedence predefined private rescue

1 0

[1199] MacRuby/branches/experimental/spec/frozen/tags/macruby/language/ precedence_tags.txt
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1199 http://trac.macosforge.org/projects/ruby/changeset/1199 Author: lsansonetti(a)apple.com Date: 2009-03-26 21:23:12 -0700 (Thu, 26 Mar 2009) Log Message: ----------- removed the precedence_tags.txt since it's now green Removed Paths: ------------- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/precedence_tags.txt Deleted: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/precedence_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/precedence_tags.txt 2009-03-27 04:22:01 UTC (rev 1198) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/precedence_tags.txt 2009-03-27 04:23:12 UTC (rev 1199) @@ -1,2 +0,0 @@ -critical:Operators + - are left-associative -fails:Operators <= < > >= have higher precedence than <=> == === != =~ !~ \ No newline at end of file

1 0

[1198] MacRuby/branches/experimental/spec/frozen/language/precedence_spec. rb
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1198 http://trac.macosforge.org/projects/ruby/changeset/1198 Author: lsansonetti(a)apple.com Date: 2009-03-26 21:22:01 -0700 (Thu, 26 Mar 2009) Log Message: ----------- marked 1.8-only specs as such Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/language/precedence_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/language/precedence_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/language/precedence_spec.rb 2009-03-27 04:21:39 UTC (rev 1197) +++ MacRuby/branches/experimental/spec/frozen/language/precedence_spec.rb 2009-03-27 04:22:01 UTC (rev 1198) @@ -101,16 +101,18 @@ (++2).should == 2 end - it "! ~ + have a higher precedence than **" do - class FalseClass; def **(a); 1000; end; end - (!0**2).should == 1000 - class FalseClass; undef_method :**; end + ruby_version_is "" ... "1.9" do + it "! ~ + have a higher precedence than **" do + class FalseClass; def **(a); 1000; end; end + (!0**2).should == 1000 + class FalseClass; undef_method :**; end - class UnaryPlusTest; def +@; 50; end; end - a = UnaryPlusTest.new - (+a**2).should == 2500 + class UnaryPlusTest; def +@; 50; end; end + a = UnaryPlusTest.new + (+a**2).should == 2500 - (~0**2).should == 1 + (~0**2).should == 1 + end end it "** is right-associative" do @@ -250,36 +252,38 @@ (e > 0 > 1).should_not == e > (0 > 1) end - it "<= < > >= have higher precedence than <=> == === != =~ !~" do - (1 <=> 5 < 1).should == nil - (1 <=> 5 <= 1).should == nil - (1 <=> 5 > 1).should == nil - (1 <=> 5 >= 1).should == nil - - (1 == 5 < 1).should == false - (1 == 5 <= 1).should == false - (1 == 5 > 1).should == false - (1 == 5 >= 1).should == false - - (1 === 5 < 1).should == false - (1 === 5 <= 1).should == false - (1 === 5 > 1).should == false - (1 === 5 >= 1).should == false - - (1 != 5 < 1).should == true - (1 != 5 <= 1).should == true - (1 != 5 > 1).should == true - (1 != 5 >= 1).should == true - - (1 =~ 5 < 1).should == false - (1 =~ 5 <= 1).should == false - (1 =~ 5 > 1).should == false - (1 =~ 5 >= 1).should == false - - (1 !~ 5 < 1).should == true - (1 !~ 5 <= 1).should == true - (1 !~ 5 > 1).should == true - (1 !~ 5 >= 1).should == true + ruby_version_is "" ... "1.9" do + it "<= < > >= have higher precedence than <=> == === != =~ !~" do + (1 <=> 5 < 1).should == nil + (1 <=> 5 <= 1).should == nil + (1 <=> 5 > 1).should == nil + (1 <=> 5 >= 1).should == nil + + (1 == 5 < 1).should == false + (1 == 5 <= 1).should == false + (1 == 5 > 1).should == false + (1 == 5 >= 1).should == false + + (1 === 5 < 1).should == false + (1 === 5 <= 1).should == false + (1 === 5 > 1).should == false + (1 === 5 >= 1).should == false + + (1 != 5 < 1).should == true + (1 != 5 <= 1).should == true + (1 != 5 > 1).should == true + (1 != 5 >= 1).should == true + + (1 =~ 5 < 1).should == false + (1 =~ 5 <= 1).should == false + (1 =~ 5 > 1).should == false + (1 =~ 5 >= 1).should == false + + (1 !~ 5 < 1).should == true + (1 !~ 5 <= 1).should == true + (1 !~ 5 > 1).should == true + (1 !~ 5 >= 1).should == true + end end it "<=> == === != =~ !~ are non-associative" do

1 0

[1197] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1197 http://trac.macosforge.org/projects/ruby/changeset/1197 Author: lsansonetti(a)apple.com Date: 2009-03-26 21:21:39 -0700 (Thu, 26 Mar 2009) Log Message: ----------- fixed +[NSObject new:] + minor things Modified Paths: -------------- MacRuby/branches/experimental/class.c MacRuby/branches/experimental/include/ruby/ruby.h MacRuby/branches/experimental/objc.m MacRuby/branches/experimental/object.c MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/roxor.h MacRuby/branches/experimental/string.c MacRuby/branches/experimental/vm_method.c Modified: MacRuby/branches/experimental/class.c =================================================================== --- MacRuby/branches/experimental/class.c 2009-03-27 01:35:40 UTC (rev 1196) +++ MacRuby/branches/experimental/class.c 2009-03-27 04:21:39 UTC (rev 1197) @@ -99,12 +99,13 @@ VALUE rb_obj_init_copy(VALUE, SEL, VALUE); +VALUE rb_class_new_instance_imp(VALUE klass, SEL sel, int argc, VALUE *argv); + void rb_define_object_special_methods(VALUE klass) { rb_objc_define_method(*(VALUE *)klass, "alloc", rb_class_allocate_instance, 0); RCLASS_SET_VERSION(*(VALUE *)klass, (RCLASS_VERSION(*(VALUE *)klass) | RCLASS_HAS_ROBJECT_ALLOC)); - VALUE rb_class_new_instance_imp(VALUE klass, SEL sel, int argc, VALUE *argv); rb_objc_define_method(*(VALUE *)klass, "new", rb_class_new_instance_imp, -1); rb_objc_define_method(*(VALUE *)klass, "__new__", rb_class_new_instance_imp, -1); rb_objc_define_method(klass, "dup", rb_obj_dup, 0); @@ -166,8 +167,9 @@ DLOG("DEFC", "%s < %s (version=%d)", ocname, class_getName(class_getSuperclass((Class)ocklass)), version_flag); - if (klass != 0) + if (klass != 0) { rb_objc_install_primitives(ocklass, (Class)super); + } return (VALUE)ocklass; } @@ -1050,28 +1052,39 @@ return sel_registerName(name); } -void -rb_objc_add_method(VALUE klass, const char *name, void *imp, const int arity, const int noex) +static void +rb_objc_add_method(VALUE klass, const char *name, void *imp, const int arity, + const int noex, bool direct) { - assert(name[strlen(name) - 1] != ':'); + if (!direct) { + assert(name[strlen(name) - 1] != ':'); + } NODE *node = NEW_CFUNC(imp, arity); NODE *body = NEW_FBODY(NEW_METHOD(node, klass, noex), 0); rb_objc_retain(body); - rb_vm_define_method((Class)klass, name_to_sel(name, arity), (IMP)imp, body); + rb_vm_define_method((Class)klass, name_to_sel(name, arity), (IMP)imp, body, direct); } void +rb_objc_define_direct_method(VALUE klass, const char *name, void *imp, + const int arity) +{ + rb_objc_add_method(klass, name, imp, arity, NOEX_PUBLIC, true); +} + +void rb_objc_define_method(VALUE klass, const char *name, void *imp, const int arity) { - rb_objc_add_method(klass, name, imp, arity, NOEX_PUBLIC); + rb_objc_add_method(klass, name, imp, arity, NOEX_PUBLIC, false); } void -rb_objc_define_private_method(VALUE klass, const char *name, void *imp, const int arity) +rb_objc_define_private_method(VALUE klass, const char *name, void *imp, + const int arity) { - rb_objc_add_method(klass, name, imp, arity, NOEX_PRIVATE); + rb_objc_add_method(klass, name, imp, arity, NOEX_PRIVATE, false); } void Modified: MacRuby/branches/experimental/include/ruby/ruby.h =================================================================== --- MacRuby/branches/experimental/include/ruby/ruby.h 2009-03-27 01:35:40 UTC (rev 1196) +++ MacRuby/branches/experimental/include/ruby/ruby.h 2009-03-27 04:21:39 UTC (rev 1197) @@ -873,6 +873,7 @@ void rb_define_attr(VALUE,const char*,int,int); void rb_objc_define_method(VALUE klass, const char *name, void *imp, const int arity); +void rb_objc_define_direct_method(VALUE klass, const char *name, void *imp, const int arity); void rb_objc_define_private_method(VALUE klass, const char *name, void *imp, const int arity); void rb_objc_undef_method(VALUE klass, const char *name); Modified: MacRuby/branches/experimental/objc.m =================================================================== --- MacRuby/branches/experimental/objc.m 2009-03-27 01:35:40 UTC (rev 1196) +++ MacRuby/branches/experimental/objc.m 2009-03-27 04:21:39 UTC (rev 1197) @@ -3595,6 +3595,7 @@ old_imp_isaForAutonotifying = method_getImplementation(m); method_setImplementation(m, (IMP)rb_obj_imp_isaForAutonotifying); +#if 0 { VALUE klass; NODE *node, *body; @@ -3606,6 +3607,7 @@ closure = rb_ruby_to_objc_closure("@@:@", 1, body->nd_body); assert(class_addMethod((Class)klass, @selector(new:), (IMP)closure, "@@:@")); } +#endif _objc_msgForward_addr = &_objc_msgForward; Modified: MacRuby/branches/experimental/object.c =================================================================== --- MacRuby/branches/experimental/object.c 2009-03-27 01:35:40 UTC (rev 1196) +++ MacRuby/branches/experimental/object.c 2009-03-27 04:21:39 UTC (rev 1197) @@ -2679,9 +2679,13 @@ void rb_include_module2(VALUE klass, VALUE module, int check, int add_methods); + // At this point, methods defined on Class or Module will be automatically + // added to NSObject's metaclass. rb_include_module2(*(VALUE *)rb_cNSObject, rb_cClass, 0, 0); rb_include_module2(*(VALUE *)rb_cNSObject, rb_cModule, 0, 0); + rb_objc_define_direct_method(*(VALUE *)rb_cNSObject, "new:", rb_class_new_instance_imp, -1); + rb_objc_define_private_method(rb_cNSObject, "initialize", rb_obj_dummy, 0); rb_objc_define_method(rb_cNSObject, "==", rb_obj_equal, 1); rb_objc_define_method(rb_cNSObject, "equal?", rb_obj_equal, 1); Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-27 01:35:40 UTC (rev 1196) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-27 04:21:39 UTC (rev 1197) @@ -4603,7 +4603,7 @@ IMP imp = GET_VM()->compile(func); - rb_vm_define_method(klass, sel, imp, node); + rb_vm_define_method(klass, sel, imp, node, false); } extern "C" @@ -4667,7 +4667,7 @@ NODE *body = NEW_FBODY(NEW_METHOD(node, klass, noex), 0); rb_objc_retain(body); - rb_vm_define_method(klass, sel_registerName(name), imp, body); + rb_vm_define_method(klass, sel_registerName(name), imp, body, false); } if (write) { @@ -4679,7 +4679,7 @@ rb_objc_retain(body); snprintf(buf, sizeof buf, "%s=:", name); - rb_vm_define_method(klass, sel_registerName(buf), imp, body); + rb_vm_define_method(klass, sel_registerName(buf), imp, body, false); } delete compiler; @@ -4687,20 +4687,19 @@ extern "C" void -rb_vm_define_method(Class klass, SEL sel, IMP imp, NODE *node) +rb_vm_define_method(Class klass, SEL sel, IMP imp, NODE *node, bool direct) { + assert(klass != NULL); assert(node != NULL); const rb_vm_arity_t arity = rb_vm_node_arity(node); assert(arity.real < MAX_ARITY); - assert(klass != NULL); - const char *sel_name = sel_getName(sel); const bool genuine_selector = sel_name[strlen(sel_name) - 1] == ':'; int oc_arity = genuine_selector ? arity.real : 0; - bool redefined = false; + bool redefined = direct; define_method: char *types; @@ -5110,11 +5109,12 @@ } #if ROXOR_VM_DEBUG - printf("objc dispatch %c[<%s %p> %s] (cached=%s)\n", + printf("objc dispatch %c[<%s %p> %s] imp=%p (cached=%s)\n", class_isMetaClass(klass) ? '+' : '-', class_getName(klass), (void *)self, sel_getName(sel), + ocache.imp, cached ? "true" : "false"); #endif Modified: MacRuby/branches/experimental/roxor.h =================================================================== --- MacRuby/branches/experimental/roxor.h 2009-03-27 01:35:40 UTC (rev 1196) +++ MacRuby/branches/experimental/roxor.h 2009-03-27 04:21:39 UTC (rev 1197) @@ -21,7 +21,7 @@ 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); +void rb_vm_define_method(Class klass, SEL sel, IMP imp, NODE *node, bool direct); void rb_vm_define_attr(Class klass, const char *name, bool read, bool write, int noex); void rb_vm_alias(VALUE klass, ID name, ID def); VALUE rb_vm_call(VALUE self, SEL sel, int argc, const VALUE *args, bool super); Modified: MacRuby/branches/experimental/string.c =================================================================== --- MacRuby/branches/experimental/string.c 2009-03-27 01:35:40 UTC (rev 1196) +++ MacRuby/branches/experimental/string.c 2009-03-27 04:21:39 UTC (rev 1197) @@ -5156,7 +5156,7 @@ (IMP)imp_rb_str_fastestEncodingInCFStringEncoding); rb_objc_install_method2(klass, "isEqual:", (IMP)imp_rb_str_isEqual); - rb_define_alloc_func((VALUE)klass, str_alloc); + rb_objc_define_method(*(VALUE *)klass, "alloc", str_alloc, 0); } static CFIndex Modified: MacRuby/branches/experimental/vm_method.c =================================================================== --- MacRuby/branches/experimental/vm_method.c 2009-03-27 01:35:40 UTC (rev 1196) +++ MacRuby/branches/experimental/vm_method.c 2009-03-27 04:21:39 UTC (rev 1197) @@ -789,7 +789,7 @@ rb_bug("undefined method `%s'; can't happen", rb_id2name(id)); } - rb_vm_define_method(*(Class *)module, sel, imp, node); + rb_vm_define_method(*(Class *)module, sel, imp, node, false); } return module;

1 0

[1196] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Mar '09

27 Mar '09

Revision: 1196 http://trac.macosforge.org/projects/ruby/changeset/1196 Author: lsansonetti(a)apple.com Date: 2009-03-26 18:35:40 -0700 (Thu, 26 Mar 2009) Log Message: ----------- rescue_spec.rb all passing but a spec (because of a block dvar bug that is already covered in test_roxor.rb) Modified Paths: -------------- MacRuby/branches/experimental/rakelib/spec.rake Added Paths: ----------- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/rescue_tags.txt Modified: MacRuby/branches/experimental/rakelib/spec.rake =================================================================== --- MacRuby/branches/experimental/rakelib/spec.rake 2009-03-27 01:29:08 UTC (rev 1195) +++ MacRuby/branches/experimental/rakelib/spec.rake 2009-03-27 01:35:40 UTC (rev 1196) @@ -41,6 +41,7 @@ precedence predefined private + rescue return throw yield Added: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/rescue_tags.txt =================================================================== --- MacRuby/branches/experimental/spec/frozen/tags/macruby/language/rescue_tags.txt (rev 0) +++ MacRuby/branches/experimental/spec/frozen/tags/macruby/language/rescue_tags.txt 2009-03-27 01:35:40 UTC (rev 1196) @@ -0,0 +1 @@ +fails:The rescue keyword can rescue a splatted list of exceptions \ No newline at end of file Property changes on: MacRuby/branches/experimental/spec/frozen/tags/macruby/language/rescue_tags.txt ___________________________________________________________________ Added: svn:eol-style + native

1 0

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

27 Mar '09

Revision: 1195 http://trac.macosforge.org/projects/ruby/changeset/1195 Author: lsansonetti(a)apple.com Date: 2009-03-26 18:29:08 -0700 (Thu, 26 Mar 2009) Log Message: ----------- route divisions by zero through the dispatcher (note: currently only handles the immediate/immediate case) Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-27 01:19:25 UTC (rev 1194) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-27 01:29:08 UTC (rev 1195) @@ -1419,6 +1419,9 @@ res = leftLong - rightLong; } else if (sel == selDIV) { + if (rightLong == 0) { + return NULL; + } res = leftLong / rightLong; } else if (sel == selMULT) {

1 0

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

27 Mar '09

Revision: 1194 http://trac.macosforge.org/projects/ruby/changeset/1194 Author: lsansonetti(a)apple.com Date: 2009-03-26 18:19:25 -0700 (Thu, 26 Mar 2009) Log Message: ----------- now accept splats in a rescue argument Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-03-27 01:06:32 UTC (rev 1193) +++ MacRuby/branches/experimental/roxor.cpp 2009-03-27 01:19:25 UTC (rev 1194) @@ -3790,12 +3790,16 @@ } else { NODE *n2 = n->nd_args; - assert(nd_type(n2) == NODE_ARRAY); - while (n2 != NULL) { - exceptions_to_catch.push_back(compile_node( - n2->nd_head)); - n2 = n2->nd_next; + if (nd_type(n2) == NODE_ARRAY) { + while (n2 != NULL) { + exceptions_to_catch.push_back(compile_node( + n2->nd_head)); + n2 = n2->nd_next; + } } + else { + exceptions_to_catch.push_back(compile_node(n2)); + } } Function *isEHActiveFunc = NULL; @@ -5855,12 +5859,21 @@ unsigned char active = 0; va_start(ar, argc); - for (int i = 0; i < argc; ++i) { - VALUE klass = va_arg(ar, VALUE); - if (rb_obj_is_kind_of(GET_VM()->current_exception, klass)) { - active = 1; - break; + for (int i = 0; i < argc && active == 0; ++i) { + VALUE obj = va_arg(ar, VALUE); + if (TYPE(obj) == T_ARRAY) { + for (int j = 0, count = RARRAY_LEN(obj); j < count; ++j) { + VALUE obj2 = RARRAY_AT(obj, j); + if (rb_obj_is_kind_of(GET_VM()->current_exception, obj2)) { + active = 1; + } + } } + else { + if (rb_obj_is_kind_of(GET_VM()->current_exception, obj)) { + active = 1; + } + } } va_end(ar);

1 0