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

[2785] MacRuby/trunk
by source_changes＠macosforge.org 13 Oct '09

13 Oct '09

Revision: 2785 http://trac.macosforge.org/projects/ruby/changeset/2785 Author: lsansonetti(a)apple.com Date: 2009-10-12 20:48:44 -0700 (Mon, 12 Oct 2009) Log Message: ----------- implemented protected visibility check Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/dispatcher.cpp MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2009-10-12 20:10:32 UTC (rev 2784) +++ MacRuby/trunk/compiler.cpp 2009-10-13 03:48:44 UTC (rev 2785) @@ -249,6 +249,7 @@ if (comparedToVal != NULL) { std::vector<Value *> params; params.push_back(compile_mcache(selEqq, false)); + params.push_back(current_self); params.push_back(subnodeVal); params.push_back(compile_sel(selEqq)); params.push_back(compile_const_pointer(NULL)); @@ -718,11 +719,12 @@ RoxorCompiler::compile_dispatch_call(std::vector<Value *> &params) { if (dispatcherFunc == NULL) { - // VALUE rb_vm_dispatch(struct mcache *cache, VALUE self, SEL sel, - // void *block, unsigned char opt, int argc, ...); + // VALUE rb_vm_dispatch(struct mcache *cache, VALUE top, VALUE self, + // SEL sel, void *block, unsigned char opt, int argc, ...); std::vector<const Type *> types; types.push_back(PtrTy); types.push_back(RubyObjTy); + types.push_back(RubyObjTy); types.push_back(PtrTy); types.push_back(PtrTy); types.push_back(Int8Ty); @@ -767,6 +769,7 @@ std::vector<Value *> params; const SEL sel = mid_to_sel(mid, argc); params.push_back(compile_mcache(sel, false)); + params.push_back(current_self); params.push_back(recv); params.push_back(compile_sel(sel)); params.push_back(compile_const_pointer(NULL)); @@ -2123,7 +2126,7 @@ return NULL; } - Value *val = params[1]; // self + Value *val = params[2]; // self Function *f = bb->getParent(); @@ -2156,7 +2159,7 @@ GlobalVariable *is_redefined = GET_CORE()->redefined_op_gvar(sel, true); - Value *leftVal = params[1]; // self + Value *leftVal = params[2]; // self Value *rightVal = params.back(); VALUE leftRVal = Qundef, rightRVal = Qundef; @@ -2546,12 +2549,13 @@ std::vector<Value *> new_params; new_params.push_back(compile_mcache(new_sel, false)); new_params.push_back(params[1]); + new_params.push_back(params[2]); new_params.push_back(compile_sel(new_sel)); - new_params.push_back(params[3]); + new_params.push_back(params[4]); new_params.push_back(ConstantInt::get(Int8Ty, DISPATCH_FCALL)); new_params.push_back(ConstantInt::get(Int32Ty, argc - 1)); for (int i = 0; i < argc - 1; i++) { - new_params.push_back(params[7 + i]); + new_params.push_back(params[8 + i]); } Value *thenVal = compile_dispatch_call(new_params); thenBB = bb; @@ -3474,6 +3478,7 @@ sel = mid_to_sel(node->nd_next->nd_vid, 0); } params.push_back(compile_mcache(sel, false)); + params.push_back(current_self); params.push_back(recv); params.push_back(compile_sel(sel)); params.push_back(compile_const_pointer(NULL)); @@ -3533,6 +3538,7 @@ sel = mid_to_sel(mid, 1); params.clear(); params.push_back(compile_mcache(sel, false)); + params.push_back(current_self); params.push_back(tmp); params.push_back(compile_sel(sel)); params.push_back(compile_const_pointer(NULL)); @@ -3557,6 +3563,7 @@ } params.clear(); params.push_back(compile_mcache(sel, false)); + params.push_back(current_self); params.push_back(recv); params.push_back(compile_sel(sel)); params.push_back(compile_const_pointer(NULL)); @@ -3609,6 +3616,7 @@ std::vector<Value *> params; params.push_back(compile_mcache(selBackquote, false)); params.push_back(current_self); + params.push_back(current_self); params.push_back(compile_sel(selBackquote)); params.push_back(compile_const_pointer(NULL)); params.push_back(ConstantInt::get(Int8Ty, DISPATCH_FCALL)); @@ -4055,6 +4063,9 @@ params.push_back(compile_get_mcache(sel_val, true)); } + // Top. + params.push_back(current_self); + // Self. params.push_back(recv == NULL ? current_self : compile_node(recv)); @@ -4137,7 +4148,7 @@ ? compile_block_create(NULL) : compile_const_pointer(NULL); } - params[3] = blockVal; + params[4] = blockVal; // If we are calling a method that needs a top-level binding // object, let's create it. @@ -4397,6 +4408,7 @@ std::vector<Value *> params; params.push_back(compile_mcache(selEqTilde, false)); + params.push_back(current_self); params.push_back(reTarget); params.push_back(compile_sel(selEqTilde)); params.push_back(compile_const_pointer(NULL)); @@ -4959,6 +4971,7 @@ std::vector<Value *> params; params.push_back(compile_mcache(selEach, false)); + params.push_back(current_self); // the block must not be passed to the code // that generates the values we loop on @@ -5130,6 +5143,7 @@ std::vector<Value *> params; SEL sel = sel_registerName("at_exit"); params.push_back(compile_mcache(sel, false)); + params.push_back(current_self); params.push_back(compile_nsobject()); params.push_back(compile_sel(sel)); params.push_back(compile_block_create(NULL)); Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2009-10-12 20:10:32 UTC (rev 2784) +++ MacRuby/trunk/dispatcher.cpp 2009-10-13 03:48:44 UTC (rev 2785) @@ -351,8 +351,9 @@ } static force_inline VALUE -__rb_vm_ruby_dispatch(VALUE self, SEL sel, rb_vm_method_node_t *node, - unsigned char opt, int argc, const VALUE *argv) +__rb_vm_ruby_dispatch(VALUE top, VALUE self, SEL sel, + rb_vm_method_node_t *node, unsigned char opt, + int argc, const VALUE *argv) { const rb_vm_arity_t &arity = node->arity; if ((argc < arity.min) || ((arity.max != -1) && (argc > arity.max))) { @@ -364,9 +365,21 @@ // Calling a private method with no explicit receiver OR an attribute // assignment to non-self, triggering #method_missing. rb_vm_block_t *b = GET_VM()->current_block(); - return method_missing(self, sel, b, argc, argv, METHOD_MISSING_PRIVATE); + return method_missing(self, sel, b, argc, argv, + METHOD_MISSING_PRIVATE); } + if ((node->flags & VM_METHOD_PROTECTED) + && top != 0 && node->klass != NULL + && !rb_obj_is_kind_of(top, (VALUE)node->klass)) { + // Calling a protected method inside a method where 'self' is not + // an instance of the class where the method was originally defined, + // triggering #method_missing. + rb_vm_block_t *b = GET_VM()->current_block(); + return method_missing(self, sel, b, argc, argv, + METHOD_MISSING_PROTECTED); + } + if ((node->flags & VM_METHOD_EMPTY) && arity.max == arity.min) { // Calling an empty method, let's just return nil! return Qnil; @@ -501,9 +514,9 @@ } static force_inline VALUE -__rb_vm_dispatch(RoxorVM *vm, struct mcache *cache, VALUE self, Class klass, - SEL sel, rb_vm_block_t *block, unsigned char opt, int argc, - const VALUE *argv) +__rb_vm_dispatch(RoxorVM *vm, struct mcache *cache, VALUE top, VALUE self, + Class klass, SEL sel, rb_vm_block_t *block, unsigned char opt, + int argc, const VALUE *argv) { assert(cache != NULL); @@ -653,7 +666,7 @@ } #if ROXOR_VM_DEBUG - printf("ruby dispatch %c[<%s %p> %s] (imp=%p, block=%p, argc=%d, cached=%s)\n", + printf("ruby dispatch %c[<%s %p> %s] (imp %p block %p argc %d opt %d cached %s)\n", class_isMetaClass(klass) ? '+' : '-', class_getName(klass), (void *)self, @@ -661,6 +674,7 @@ rcache.node->ruby_imp, block, argc, + opt, cached ? "true" : "false"); #endif @@ -701,7 +715,7 @@ MACRUBY_METHOD_ENTRY(class_name, method_name, file, line); } - VALUE v = __rb_vm_ruby_dispatch(self, sel, rcache.node, opt, + VALUE v = __rb_vm_ruby_dispatch(top, self, sel, rcache.node, opt, argc, argv); // DTrace probe: method__return @@ -959,8 +973,8 @@ extern "C" VALUE -rb_vm_dispatch(struct mcache *cache, VALUE self, SEL sel, rb_vm_block_t *block, - unsigned char opt, int argc, ...) +rb_vm_dispatch(struct mcache *cache, VALUE top, VALUE self, SEL sel, + rb_vm_block_t *block, unsigned char opt, int argc, ...) { VALUE base_argv[MAX_DISPATCH_ARGS]; VALUE *argv = base_argv; @@ -987,8 +1001,8 @@ RoxorVM *vm = GET_VM(); - VALUE retval = __rb_vm_dispatch(vm, cache, self, NULL, sel, block, opt, - argc, argv); + VALUE retval = __rb_vm_dispatch(vm, cache, top, self, NULL, sel, block, + opt, argc, argv); vm->pop_current_binding(); @@ -1010,8 +1024,8 @@ cache = GET_CORE()->method_cache_get(sel, false); } - return __rb_vm_dispatch(GET_VM(), cache, self, NULL, sel, NULL, opt, argc, - argv); + return __rb_vm_dispatch(GET_VM(), cache, 0, self, NULL, sel, NULL, opt, + argc, argv); } extern "C" @@ -1019,8 +1033,8 @@ rb_vm_call_with_cache(void *cache, VALUE self, SEL sel, int argc, const VALUE *argv) { - return __rb_vm_dispatch(GET_VM(), (struct mcache *)cache, self, NULL, sel, - NULL, DISPATCH_FCALL, argc, argv); + return __rb_vm_dispatch(GET_VM(), (struct mcache *)cache, 0, self, NULL, + sel, NULL, DISPATCH_FCALL, argc, argv); } extern "C" @@ -1028,7 +1042,7 @@ rb_vm_call_with_cache2(void *cache, rb_vm_block_t *block, VALUE self, VALUE klass, SEL sel, int argc, const VALUE *argv) { - return __rb_vm_dispatch(GET_VM(), (struct mcache *)cache, self, + return __rb_vm_dispatch(GET_VM(), (struct mcache *)cache, 0, self, (Class)klass, sel, block, DISPATCH_FCALL, argc, argv); } @@ -1066,7 +1080,7 @@ case T_COMPLEX: return rb_nu_plus(self, other); } - return rb_vm_dispatch(cache, self, selPLUS, NULL, 0, 1, other); + return rb_vm_dispatch(cache, 0, self, selPLUS, NULL, 0, 1, other); } extern "C" @@ -1084,7 +1098,7 @@ case T_COMPLEX: return rb_nu_minus(self, other); } - return rb_vm_dispatch(cache, self, selMINUS, NULL, 0, 1, other); + return rb_vm_dispatch(cache, 0, self, selMINUS, NULL, 0, 1, other); } extern "C" @@ -1101,7 +1115,7 @@ case T_COMPLEX: return rb_nu_div(self, other); } - return rb_vm_dispatch(cache, self, selDIV, NULL, 0, 1, other); + return rb_vm_dispatch(cache, 0, self, selDIV, NULL, 0, 1, other); } extern "C" @@ -1119,7 +1133,7 @@ case T_COMPLEX: return rb_nu_mul(self, other); } - return rb_vm_dispatch(cache, self, selMULT, NULL, 0, 1, other); + return rb_vm_dispatch(cache, 0, self, selMULT, NULL, 0, 1, other); } extern "C" @@ -1130,7 +1144,7 @@ case T_BIGNUM: return FIX2INT(rb_big_cmp(self, other)) < 0 ? Qtrue : Qfalse; } - return rb_vm_dispatch(cache, self, selLT, NULL, 0, 1, other); + return rb_vm_dispatch(cache, 0, self, selLT, NULL, 0, 1, other); } extern "C" @@ -1141,7 +1155,7 @@ case T_BIGNUM: return FIX2INT(rb_big_cmp(self, other)) <= 0 ? Qtrue : Qfalse; } - return rb_vm_dispatch(cache, self, selLE, NULL, 0, 1, other); + return rb_vm_dispatch(cache, 0, self, selLE, NULL, 0, 1, other); } extern "C" @@ -1152,7 +1166,7 @@ case T_BIGNUM: return FIX2INT(rb_big_cmp(self, other)) > 0 ? Qtrue : Qfalse; } - return rb_vm_dispatch(cache, self, selGT, NULL, 0, 1, other); + return rb_vm_dispatch(cache, 0, self, selGT, NULL, 0, 1, other); } extern "C" @@ -1163,7 +1177,7 @@ case T_BIGNUM: return FIX2INT(rb_big_cmp(self, other)) >= 0 ? Qtrue : Qfalse; } - return rb_vm_dispatch(cache, self, selGE, NULL, 0, 1, other); + return rb_vm_dispatch(cache, 0, self, selGE, NULL, 0, 1, other); } extern "C" @@ -1193,7 +1207,7 @@ case T_BIGNUM: return rb_big_eq(self, other); } - return rb_vm_dispatch(cache, self, selEq, NULL, 0, 1, other); + return rb_vm_dispatch(cache, 0, self, selEq, NULL, 0, 1, other); } extern "C" @@ -1201,7 +1215,7 @@ rb_vm_fast_neq(struct mcache *cache, VALUE self, VALUE other) { // TODO - return rb_vm_dispatch(cache, self, selNeq, NULL, 0, 1, other); + return rb_vm_dispatch(cache, 0, self, selNeq, NULL, 0, 1, other); } extern "C" @@ -1227,7 +1241,7 @@ return rb_obj_is_kind_of(other, self); default: - return rb_vm_dispatch(cache, self, selEqq, NULL, 0, 1, other); + return rb_vm_dispatch(cache, 0, self, selEqq, NULL, 0, 1, other); } } @@ -1252,7 +1266,8 @@ else { for (int i = 0; i < count; ++i) { VALUE o = RARRAY_AT(ary, i); - if (RTEST(rb_vm_dispatch(cache, o, selEqq, NULL, 0, 1, comparedTo))) { + if (RTEST(rb_vm_dispatch(cache, 0, o, selEqq, NULL, 0, 1, + comparedTo))) { return Qtrue; } } @@ -1276,7 +1291,7 @@ return obj; } } - return __rb_vm_dispatch(GET_VM(), cache, obj, NULL, selLTLT, NULL, 0, 1, + return __rb_vm_dispatch(GET_VM(), cache, 0, obj, NULL, selLTLT, NULL, 0, 1, &other); } @@ -1292,7 +1307,7 @@ } return rb_ary_aref(obj, 0, 1, &other); } - return __rb_vm_dispatch(GET_VM(), cache, obj, NULL, selAREF, NULL, 0, 1, + return __rb_vm_dispatch(GET_VM(), cache, 0, obj, NULL, selAREF, NULL, 0, 1, &other); } @@ -1309,7 +1324,7 @@ } } VALUE args[2] = { other1, other2 }; - return __rb_vm_dispatch(GET_VM(), cache, obj, NULL, selASET, NULL, 0, 2, + return __rb_vm_dispatch(GET_VM(), cache, 0, obj, NULL, selASET, NULL, 0, 2, args); } Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-10-12 20:10:32 UTC (rev 2784) +++ MacRuby/trunk/vm.cpp 2009-10-13 03:48:44 UTC (rev 2785) @@ -720,6 +720,7 @@ assert(m != NULL); assert(method_getImplementation(m) == imp); rb_vm_method_node_t *real_node = method_node_get(m, true); + real_node->klass = klass; real_node->objc_imp = imp; real_node->ruby_imp = ruby_imp; real_node->arity = arity; @@ -738,6 +739,7 @@ node = iter2->second; assert(node->objc_imp == imp); } + node->klass = klass; node->arity = arity; node->flags = flags; node->sel = sel; @@ -810,6 +812,7 @@ assert(m != NULL); assert(method_getImplementation(m) == imp); node = method_node_get(m, true); + node->klass = (Class)mod; node->objc_imp = imp; node->ruby_imp = ruby_imp; node->arity = arity; @@ -3236,6 +3239,7 @@ // For symbolication. rb_vm_method_node_t *mnode = GET_CORE()->method_node_get(imp, true); + mnode->klass = 0; mnode->arity = rb_vm_arity(2); mnode->sel = sel_registerName("<main>"); mnode->objc_imp = mnode->ruby_imp = imp; Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2009-10-12 20:10:32 UTC (rev 2784) +++ MacRuby/trunk/vm.h 2009-10-13 03:48:44 UTC (rev 2785) @@ -93,6 +93,7 @@ typedef struct rb_vm_method_node { rb_vm_arity_t arity; + Class klass; SEL sel; IMP objc_imp; IMP ruby_imp;

1 0

[2784] MacRuby/trunk/sample-macruby/Scripts/jumpy.rb
by source_changes＠macosforge.org 12 Oct '09

12 Oct '09

Revision: 2784 http://trac.macosforge.org/projects/ruby/changeset/2784 Author: rich(a)infoether.com Date: 2009-10-12 13:10:32 -0700 (Mon, 12 Oct 2009) Log Message: ----------- added undefined constants required for core animation example per bug 382 Modified Paths: -------------- MacRuby/trunk/sample-macruby/Scripts/jumpy.rb Modified: MacRuby/trunk/sample-macruby/Scripts/jumpy.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/jumpy.rb 2009-10-12 19:14:16 UTC (rev 2783) +++ MacRuby/trunk/sample-macruby/Scripts/jumpy.rb 2009-10-12 20:10:32 UTC (rev 2784) @@ -5,6 +5,25 @@ framework 'QuartzCore' framework 'ApplicationServices' +# these are not properly mapped in BridgeSupport in Snow Leopard (from GCGeometry.h) +CGRectInfinite = CGRect.new([-8.98847e+307, -8.98847e+307], [1.79769e+308, 1.79769e+308]) unless defined?(CGRectInfinite) +CGSizeZero = CGSizeMake(0, 0) unless defined?(CGSizeZero) +CGRectZero = CGRectMake(0, 0, 0, 0) unless defined?(CGRectZero) +CGPointZero = CGPointMake(0, 0) unless defined?(CGPointZero) +# we need CGRectNull! + +# these are not properly mapped in BridgeSupport in Snow Leopard (from CATransaction.h) +KCATransactionAnimationDuration = 'animationDuration' unless defined?(KCATransactionAnimationDuration) +KCATransactionDisableActions = 'disableActions' unless defined?(KCATransactionDisableActions) +KCATransactionAnimationTimingFunction = 'animationTimingFunction' unless defined?(KCATransactionAnimationTimingFunction) +KCATransactionCompletionBlock = 'completionBlock' unless defined?(KCATransactionCompletionBlock) + +# these are not properly mapped in BridgeSupport in Snow Leopard (from CAMediaTimingFunction.h) +KCAMediaTimingFunctionEaseIn = 'easeIn' unless defined?(KCAMediaTimingFunctionEaseIn) +KCAMediaTimingFunctionEaseOut = 'easeOut' unless defined?(KCAMediaTimingFunctionEaseOut) +KCAMediaTimingFunctionLinear = 'linear' unless defined?(KCAMediaTimingFunctionLinear) +KCAMediaTimingFunctionEaseInOut = 'easeInOut' unless defined?(KCAMediaTimingFunctionEaseInOut) + class JumpyController ANIMATION_DURATION = 4.0

1 0

[2783] MacRuby/trunk/TODO
by source_changes＠macosforge.org 12 Oct '09

12 Oct '09

Revision: 2783 http://trac.macosforge.org/projects/ruby/changeset/2783 Author: lsansonetti(a)apple.com Date: 2009-10-12 12:14:16 -0700 (Mon, 12 Oct 2009) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-10-12 05:35:03 UTC (rev 2782) +++ MacRuby/trunk/TODO 2009-10-12 19:14:16 UTC (rev 2783) @@ -35,6 +35,7 @@ [ ] Xcode target for AOT compilation [/] finish AOT compiler (only normal mode) [X] sync with LLVM 2.6/ToT +[ ] non-ASCII regexp [ ] leaks [ ] implement ~RoxorVM [ ] fix exception leak

1 0

[2782] MacRuby/trunk
by source_changes＠macosforge.org 12 Oct '09

12 Oct '09

Revision: 2782 http://trac.macosforge.org/projects/ruby/changeset/2782 Author: lsansonetti(a)apple.com Date: 2009-10-11 22:35:03 -0700 (Sun, 11 Oct 2009) Log Message: ----------- added support for AOT compilation of literal bignums Modified Paths: -------------- MacRuby/trunk/bignum.c MacRuby/trunk/compiler.cpp Modified: MacRuby/trunk/bignum.c =================================================================== --- MacRuby/trunk/bignum.c 2009-10-12 05:09:01 UTC (rev 2781) +++ MacRuby/trunk/bignum.c 2009-10-12 05:35:03 UTC (rev 2782) @@ -688,6 +688,14 @@ return rb_str_to_inum(str, base, base==0); } +VALUE +rb_bignum_new_retained(const char *str) +{ + VALUE v = rb_cstr2inum(str, 10); + GC_RETAIN(v); + return v; +} + const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz"; static VALUE bigsqr(VALUE x); Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2009-10-12 05:09:01 UTC (rev 2781) +++ MacRuby/trunk/compiler.cpp 2009-10-12 05:35:03 UTC (rev 2782) @@ -5294,6 +5294,10 @@ cast<Function>(module->getOrInsertFunction("rb_reg_new_retained", RubyObjTy, PtrTy, Int32Ty, Int32Ty, NULL)); + Function *newBignumFunc = + cast<Function>(module->getOrInsertFunction("rb_bignum_new_retained", + RubyObjTy, PtrTy, NULL)); + Function *getClassFunc = cast<Function>(module->getOrInsertFunction("objc_getClass", RubyObjTy, PtrTy, NULL)); @@ -5399,6 +5403,33 @@ } break; + case T_BIGNUM: + { + const char *bigstr = RSTRING_PTR(rb_big2str(val, 10)); + + GlobalVariable *bigstr_gvar = + compile_const_global_string(bigstr); + + std::vector<Value *> idxs; + idxs.push_back(ConstantInt::get(Int32Ty, 0)); + idxs.push_back(ConstantInt::get(Int32Ty, 0)); + Instruction *load = GetElementPtrInst::Create(bigstr_gvar, + idxs.begin(), idxs.end(), ""); + + std::vector<Value *> params; + params.push_back(load); + + Instruction *call = CallInst::Create(newBignumFunc, + params.begin(), params.end(), ""); + + Instruction *assign = new StoreInst(call, gvar, ""); + + list.insert(list.begin(), assign); + list.insert(list.begin(), call); + list.insert(list.begin(), load); + } + break; + default: if (rb_obj_is_kind_of(val, rb_cRange)) { VALUE beg = 0, end = 0;

1 0

[2781] MacRuby/trunk/bin/rubyc
by source_changes＠macosforge.org 12 Oct '09

12 Oct '09

Revision: 2781 http://trac.macosforge.org/projects/ruby/changeset/2781 Author: lsansonetti(a)apple.com Date: 2009-10-11 22:09:01 -0700 (Sun, 11 Oct 2009) Log Message: ----------- make sure the init function name doesn't contain '-' Modified Paths: -------------- MacRuby/trunk/bin/rubyc Modified: MacRuby/trunk/bin/rubyc =================================================================== --- MacRuby/trunk/bin/rubyc 2009-10-10 20:28:31 UTC (rev 2780) +++ MacRuby/trunk/bin/rubyc 2009-10-12 05:09:01 UTC (rev 2781) @@ -96,7 +96,7 @@ output ||= File.join(File.dirname(path), base + '.o') # Generate init function (must be unique). - init_func = "MREP_#{File.read(path).hash}" + init_func = "MREP_#{File.read(path).hash.abs}" # Compile the file into LLVM bitcode. bc = gen_tmpfile(base, 'bc')

1 0

[2780] MacRuby/trunk/dispatcher.cpp
by source_changes＠macosforge.org 10 Oct '09

10 Oct '09

Revision: 2780 http://trac.macosforge.org/projects/ruby/changeset/2780 Author: lsansonetti(a)apple.com Date: 2009-10-10 13:28:31 -0700 (Sat, 10 Oct 2009) Log Message: ----------- when handling a sel_of_type argument, handle the case when the selector may be nil Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2009-10-10 06:25:33 UTC (rev 2779) +++ MacRuby/trunk/dispatcher.cpp 2009-10-10 20:28:31 UTC (rev 2780) @@ -816,18 +816,20 @@ // call is the future target. const int arg_i = arg->index; assert(arg_i >= 0); - ID arg_selid = rb_to_id(argv[arg_i]); - SEL arg_sel = sel_registerName(rb_id2name(arg_selid)); + if (argv[arg_i] != Qnil) { + ID arg_selid = rb_to_id(argv[arg_i]); + SEL arg_sel = sel_registerName(rb_id2name(arg_selid)); - if (reinstall_method_maybe(*(Class *)ocrcv, arg_sel, - arg->sel_of_type)) { - goto sel_target_found; - } - for (int j = 0; j < argc; j++) { - if (j != arg_i && !SPECIAL_CONST_P(argv[j])) { - if (reinstall_method_maybe(*(Class *)argv[j], - arg_sel, arg->sel_of_type)) { - goto sel_target_found; + if (reinstall_method_maybe(*(Class *)ocrcv, arg_sel, + arg->sel_of_type)) { + goto sel_target_found; + } + for (int j = 0; j < argc; j++) { + if (j != arg_i && !SPECIAL_CONST_P(argv[j])) { + if (reinstall_method_maybe(*(Class *)argv[j], + arg_sel, arg->sel_of_type)) { + goto sel_target_found; + } } } }

1 0

[2779] MacRuby/trunk/string.c
by source_changes＠macosforge.org 10 Oct '09

10 Oct '09

Revision: 2779 http://trac.macosforge.org/projects/ruby/changeset/2779 Author: lsansonetti(a)apple.com Date: 2009-10-09 23:25:33 -0700 (Fri, 09 Oct 2009) Log Message: ----------- fixed a bug in -[ByteString isEqual:]: the given object may not be a CFString Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2009-10-10 02:38:44 UTC (rev 2778) +++ MacRuby/trunk/string.c 2009-10-10 06:25:33 UTC (rev 2779) @@ -5547,9 +5547,6 @@ // Can't resolve a character string based on that data. return false; } - if (CFStringGetLength(rcv_str) != CFStringGetLength(other)) { - return false; - } return CFEqual(rcv_str, (CFTypeRef)other); } }

1 0

[2778] MacRuby/trunk/spec/macruby/tags/macruby/core/kvo_tags.txt
by source_changes＠macosforge.org 10 Oct '09

10 Oct '09

Revision: 2778 http://trac.macosforge.org/projects/ruby/changeset/2778 Author: lsansonetti(a)apple.com Date: 2009-10-09 19:38:44 -0700 (Fri, 09 Oct 2009) Log Message: ----------- the KVO specs now pass at 100% Removed Paths: ------------- MacRuby/trunk/spec/macruby/tags/macruby/core/kvo_tags.txt Deleted: MacRuby/trunk/spec/macruby/tags/macruby/core/kvo_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/kvo_tags.txt 2009-10-10 02:38:26 UTC (rev 2777) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/kvo_tags.txt 2009-10-10 02:38:44 UTC (rev 2778) @@ -1,5 +0,0 @@ -fails:An Object being observed through NSKeyValueObservation keeps reporting its instance variables through instance_variables -fails:An Object being observed through NSKeyValueObservation can be inspected -fails:A nontrivially derived Object being observed through NSKeyValueObservation retains the values for its instance variables -fails:A nontrivially derived Object being observed through NSKeyValueObservation keeps reporting its instance variables through instance_variables -fails:A nontrivially derived Object being observed through NSKeyValueObservation can be inspected

1 0

[2777] MacRuby/trunk
by source_changes＠macosforge.org 10 Oct '09

10 Oct '09

Revision: 2777 http://trac.macosforge.org/projects/ruby/changeset/2777 Author: lsansonetti(a)apple.com Date: 2009-10-09 19:38:26 -0700 (Fri, 09 Oct 2009) Log Message: ----------- fixed bugs post KVO Modified Paths: -------------- MacRuby/trunk/include/ruby/ruby.h MacRuby/trunk/objc.m MacRuby/trunk/variable.c Modified: MacRuby/trunk/include/ruby/ruby.h =================================================================== --- MacRuby/trunk/include/ruby/ruby.h 2009-10-10 00:23:24 UTC (rev 2776) +++ MacRuby/trunk/include/ruby/ruby.h 2009-10-10 02:38:26 UTC (rev 2777) @@ -555,6 +555,7 @@ # define RCLASS_SCOPE_PRIVATE (1<<24) /* class opened for private methods */ # define RCLASS_SCOPE_PROTECTED (1<<25) /* class opened for protected methods */ # define RCLASS_SCOPE_MOD_FUNC (1<<26) /* class opened for module_function methods */ +# define RCLASS_KVO_CHECK_DONE (1<<27) /* class created by KVO and flags merged */ # if defined(__LP64__) # define _PTR_TYPE uint64_t # define RCLASS_VERSION(m) (class_getVersion((Class)m)) Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2009-10-10 00:23:24 UTC (rev 2776) +++ MacRuby/trunk/objc.m 2009-10-10 02:38:26 UTC (rev 2777) @@ -592,13 +592,11 @@ static Class rb_obj_imp_isaForAutonotifying(void *rcv, SEL sel) { - Class ret; long ret_version; -#define KVO_CHECK_DONE 0x100000 + Class ret = ((Class (*)(void *, SEL))old_imp_isaForAutonotifying)(rcv, sel); - ret = ((Class (*)(void *, SEL)) old_imp_isaForAutonotifying)(rcv, sel); - if (ret != NULL && ((ret_version = RCLASS_VERSION(ret)) & KVO_CHECK_DONE) == 0) { + if (ret != NULL && ((ret_version = RCLASS_VERSION(ret)) & RCLASS_KVO_CHECK_DONE) == 0) { const char *name = class_getName(ret); if (strncmp(name, "NSKVONotifying_", 15) == 0) { Class ret_orig; @@ -612,10 +610,9 @@ if ((orig_v & RCLASS_IS_RUBY_CLASS) == RCLASS_IS_RUBY_CLASS) { ret_version |= RCLASS_IS_RUBY_CLASS; } - // XXX merge more flags? } } - ret_version |= KVO_CHECK_DONE; + ret_version |= RCLASS_KVO_CHECK_DONE; RCLASS_SET_VERSION(ret, ret_version); } return ret; Modified: MacRuby/trunk/variable.c =================================================================== --- MacRuby/trunk/variable.c 2009-10-10 00:23:24 UTC (rev 2776) +++ MacRuby/trunk/variable.c 2009-10-10 02:38:26 UTC (rev 2777) @@ -961,6 +961,14 @@ CFMakeCollectable(clone_dict); } +static inline bool +rb_class_has_ivar_dict(VALUE mod) +{ + const long v = RCLASS_VERSION(mod); + return (v & RCLASS_IS_RUBY_CLASS) == RCLASS_IS_RUBY_CLASS + && (v & RCLASS_KVO_CHECK_DONE) != RCLASS_KVO_CHECK_DONE; +} + #define RCLASS_RUBY_IVAR_DICT(mod) \ (*(CFMutableDictionaryRef *) \ ((void *)mod + class_getInstanceSize(*(Class *)RCLASS_SUPER(mod)))) @@ -970,7 +978,7 @@ { CFMutableDictionaryRef dict; - if (RCLASS_RUBY(mod)) { + if (rb_class_has_ivar_dict(mod)) { dict = RCLASS_RUBY_IVAR_DICT(mod); } else { @@ -986,7 +994,7 @@ void rb_class_ivar_set_dict(VALUE mod, CFMutableDictionaryRef dict) { - if (RCLASS_RUBY(mod)) { + if (rb_class_has_ivar_dict(mod)) { CFMutableDictionaryRef old_dict = RCLASS_RUBY_IVAR_DICT(mod); if (old_dict != dict) { if (old_dict != NULL) {

1 0

[2776] MacRuby/trunk/spec/macruby
by source_changes＠macosforge.org 10 Oct '09

10 Oct '09

Revision: 2776 http://trac.macosforge.org/projects/ruby/changeset/2776 Author: lsansonetti(a)apple.com Date: 2009-10-09 17:23:24 -0700 (Fri, 09 Oct 2009) Log Message: ----------- added KVO specs (patch by Matthias Neeracher) Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/string_spec.rb MacRuby/trunk/spec/macruby/tags/macruby/core/string_tags.txt Added Paths: ----------- MacRuby/trunk/spec/macruby/core/kvo_spec.rb MacRuby/trunk/spec/macruby/tags/macruby/core/kvo_tags.txt Added: MacRuby/trunk/spec/macruby/core/kvo_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/kvo_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/kvo_spec.rb 2009-10-10 00:23:24 UTC (rev 2776) @@ -0,0 +1,88 @@ +require File.dirname(__FILE__) + "/../spec_helper" + +class Wrapper + attr_accessor :whatever + + def initialize(value) + super() + @wrapped = value + @whatever= 'like, whatever' + end + + def wrappedValue + @wrapped + end +end + +class FancyWrapper < NSValue + attr_accessor :whatever + + def initialize(value) + super() + @wrapped = value + @whatever= 'like, whatever' + end + + def wrappedValue + @wrapped + end +end + +describe "An Object being observed through NSKeyValueObservation" do + it "retains the values for its instance variables" do + # + # Was <rdar://problem/7210942> + # + w = Wrapper.new(42) + w.addObserver(w, forKeyPath:'whatever', options:0, context:nil) + w.wrappedValue.should == 42 + end + + it "keeps reporting its instance variables through instance_variables" do + # + # <rdar://problem/7210942> + # + w = Wrapper.new(42) + w.addObserver(w, forKeyPath:'whatever', options:0, context:nil) + w.instance_variables.should include(:@wrapped) + end + + it "can be inspected" do + # + # <rdar://problem/7210942> + # + w = Wrapper.new(42) + w.addObserver(w, forKeyPath:'whatever', options:0, context:nil) + lambda { w.inspect }.should_not raise_error + end +end + +describe "A nontrivially derived Object" do + it "retains the values for its instance variables" do + w = FancyWrapper.new(42) + w.wrappedValue.should == 42 + end +end + +describe "A nontrivially derived Object being observed through NSKeyValueObservation" do + it "retains the values for its instance variables" do + # + # <rdar://problem/7260995> + # + w = FancyWrapper.new(42) + w.addObserver(w, forKeyPath:'whatever', options:0, context:nil) + w.wrappedValue.should == 42 + end + + it "keeps reporting its instance variables through instance_variables" do + w = FancyWrapper.new(42) + w.addObserver(w, forKeyPath:'whatever', options:0, context:nil) + w.instance_variables.should include(:@wrapped) + end + + it "can be inspected" do + w = FancyWrapper.new(42) + w.addObserver(w, forKeyPath:'whatever', options:0, context:nil) + lambda { w.inspect }.should_not raise_error + end +end Modified: MacRuby/trunk/spec/macruby/core/string_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/string_spec.rb 2009-10-09 23:39:35 UTC (rev 2775) +++ MacRuby/trunk/spec/macruby/core/string_spec.rb 2009-10-10 00:23:24 UTC (rev 2776) @@ -25,7 +25,7 @@ end end -describe "An String object" do +describe "A String object" do it "is an instance of the String/NSMutableString class" do ''.class.should == String ''.kind_of?(String).should == true @@ -54,6 +54,11 @@ a.foo = 42 a.foo.should == 42 end + + it "can match() a Regex" do + a = 'aaba' + a.should match(/a+b./) + end end describe "An NSString object" do Added: MacRuby/trunk/spec/macruby/tags/macruby/core/kvo_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/kvo_tags.txt (rev 0) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/kvo_tags.txt 2009-10-10 00:23:24 UTC (rev 2776) @@ -0,0 +1,5 @@ +fails:An Object being observed through NSKeyValueObservation keeps reporting its instance variables through instance_variables +fails:An Object being observed through NSKeyValueObservation can be inspected +fails:A nontrivially derived Object being observed through NSKeyValueObservation retains the values for its instance variables +fails:A nontrivially derived Object being observed through NSKeyValueObservation keeps reporting its instance variables through instance_variables +fails:A nontrivially derived Object being observed through NSKeyValueObservation can be inspected Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/string_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/string_tags.txt 2009-10-09 23:39:35 UTC (rev 2775) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/string_tags.txt 2009-10-10 00:23:24 UTC (rev 2776) @@ -1,3 +1,4 @@ critical:The NSString class can be subclassed and later instantiated critical:An NSString object can have a singleton class -fails:An String object can have a singleton class with an attr_accessor +fails:A String object can have a singleton class with an attr_accessor +fails:A String object can match() a Regex

1 0