April 2010 - macruby-changes - lists.macosforge.org

[3947] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 21 Apr '10

21 Apr '10

Revision: 3947 http://trac.macosforge.org/projects/ruby/changeset/3947 Author: lsansonetti(a)apple.com Date: 2010-04-20 19:22:39 -0700 (Tue, 20 Apr 2010) Log Message: ----------- fix bugs in the way objc method types were generated + when we acquire the core global lock, make sure we also release it in case an exception happens Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-04-20 23:14:49 UTC (rev 3946) +++ MacRuby/trunk/vm.cpp 2010-04-21 02:22:39 UTC (rev 3947) @@ -64,6 +64,34 @@ VALUE rb_cTopLevel = 0; +// A simple class that acquires the core global lock in its constructor and +// releases it in its destructor. It is used to make sure the lock will be +// released in case an exception happens inside the scope (since C++ exceptions +// call object destructors). +class RoxorCoreLock { + private: + bool locked; + + public: + RoxorCoreLock() { + GET_CORE()->lock(); + locked = true; + } + + ~RoxorCoreLock() { + if (locked) { + GET_CORE()->unlock(); + locked = false; + } + } + + void unlock(void) { + assert(locked); + GET_CORE()->unlock(); + locked = false; + } +}; + class RoxorFunction { public: // Information retrieved from JITManager. @@ -1110,23 +1138,21 @@ rb_vm_set_default_random(VALUE random) { RoxorCore *core = GET_CORE(); + RoxorCoreLock lock; - core->lock(); if (core->get_default_random() != random) { GC_RELEASE(core->get_default_random()); GC_RETAIN(random); core->set_default_random(random); } - core->unlock(); } VALUE RoxorCore::trap_cmd_for_signal(int signal) { - lock(); - VALUE trap = trap_cmd[signal]; - unlock(); - return trap; + RoxorCoreLock lock; + + return trap_cmd[signal]; } extern "C" @@ -1139,10 +1165,9 @@ int RoxorCore::trap_level_for_signal(int signal) { - lock(); - VALUE trap = trap_level[signal]; - unlock(); - return trap; + RoxorCoreLock lock; + + return trap_level[signal]; } extern "C" @@ -1155,7 +1180,8 @@ void RoxorCore::set_trap_for_signal(VALUE trap, int level, int signal) { - lock(); + RoxorCoreLock lock; + VALUE oldtrap = trap_cmd[signal]; if (oldtrap != trap) { GC_RELEASE(oldtrap); @@ -1163,7 +1189,6 @@ trap_cmd[signal] = trap; trap_level[signal] = level; } - unlock(); } extern "C" @@ -1838,9 +1863,9 @@ #endif } -static inline void +static void resolve_method_type(char *buf, const size_t buflen, Class klass, Method m, - SEL sel, const unsigned int oc_arity) + SEL sel, const unsigned int types_count) { bs_element_method_t *bs_method = GET_CORE()->find_bs_method(klass, sel); @@ -1855,12 +1880,10 @@ // informal protocol method. const char *informal_type_str = informal_type->c_str(); strncpy(buf, informal_type_str, buflen); - const unsigned int type_arity = TypeArity(informal_type_str); - if (oc_arity > type_arity) { - for (unsigned int i = type_arity; i < oc_arity; i++) { - strlcat(buf, "@", buflen); - } - } + for (unsigned int i = TypeArity(informal_type_str); + i < types_count; i++) { + strlcat(buf, "@", buflen); + } } else { // Generate an automatic signature. We do check for KVO selectors @@ -1887,31 +1910,32 @@ else if (kvo_sel(klass, selname, selsize, "replaceObjectIn", "AtIndex:withObject:")) { strncpy(buf, "v@:i@", buflen); - } #if 0 // TODO else if (kvo_sel(klass, selname, selsize, "get", ":range:")) { } #endif else { - assert(oc_arity < buflen); + assert(types_count < buflen); + // retval, self and sel. buf[0] = strncmp(selname, "set", 3) == 0 ? 'v' : '@'; buf[1] = '@'; buf[2] = ':'; - for (unsigned int i = 3; i < oc_arity; i++) { + + // Arguments. + for (unsigned int i = 3; i < types_count; i++) { buf[i] = '@'; } - buf[oc_arity] = '\0'; + buf[types_count] = '\0'; } } } else { - const unsigned int m_argc = method_getNumberOfArguments(m); - if (m_argc < oc_arity) { - for (unsigned int i = m_argc; i < oc_arity; i++) { - strcat(buf, "@"); - } + assert(strlen(buf) >= 3); + for (unsigned int i = method_getNumberOfArguments(m) + 1; + i < types_count; i++) { + strlcat(buf, "@", buflen); } } } @@ -1920,7 +1944,7 @@ RoxorCore::retype_method(Class klass, rb_vm_method_node_t *node, const char *types) { - lock(); + RoxorCoreLock lock; // TODO: 1) don't reinstall method in case the types didn't change // 2) free LLVM machine code from old objc IMP @@ -1935,8 +1959,6 @@ node = add_method(klass, node->sel, node->objc_imp, node->ruby_imp, node->arity, node->flags, types); - unlock(); - return node; } @@ -1951,9 +1973,9 @@ } // Resolve Objective-C signature. - const int oc_arity = arity.real + 3; + const int types_count = arity.real + 3; // retval, self and sel char types[100]; - resolve_method_type(types, sizeof types, klass, m, sel, oc_arity); + resolve_method_type(types, sizeof types, klass, m, sel, types_count); // Generate Objective-C stub if needed. std::map<IMP, IMP>::iterator iter = objc_to_ruby_stubs.find(imp); @@ -2022,7 +2044,7 @@ return false; } - GET_CORE()->lock(); + RoxorCoreLock lock; bool status = false; @@ -2052,7 +2074,6 @@ status = GET_CORE()->resolve_methods(map, klass, sel); bails: - GET_CORE()->unlock(); return status; } @@ -2576,7 +2597,7 @@ 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; + int types_count = genuine_selector ? arity.real + 3 : 3; bool redefined = direct; rb_vm_method_node_t *node; @@ -2584,7 +2605,7 @@ Method method = class_getInstanceMethod(klass, sel); char types[100]; - resolve_method_type(types, sizeof types, klass, method, sel, oc_arity); + resolve_method_type(types, sizeof types, klass, method, sel, types_count); node = GET_CORE()->add_method(klass, sel, objc_imp, ruby_imp, arity, flags, types); @@ -2594,7 +2615,7 @@ char buf[100]; snprintf(buf, sizeof buf, "%s:", sel_name); sel = sel_registerName(buf); - oc_arity = arity.real; + types_count = arity.real + 3; redefined = true; goto define_method; @@ -2604,7 +2625,7 @@ strlcpy(buf, sel_name, sizeof buf); buf[strlen(buf) - 1] = 0; // remove the ending ':' sel = sel_registerName(buf); - oc_arity = 0; + types_count = 3; redefined = true; goto define_method; @@ -2888,7 +2909,8 @@ void * RoxorCore::gen_large_arity_stub(int argc, bool is_block) { - lock(); + RoxorCoreLock lock; + std::map<int, void *> &stubs = is_block ? rb_large_arity_bstubs : rb_large_arity_rstubs; std::map<int, void *>::iterator iter = stubs.find(argc); @@ -2902,7 +2924,6 @@ else { stub = iter->second; } - unlock(); return stub; } @@ -2911,7 +2932,7 @@ RoxorCore::gen_stub(std::string types, bool variadic, int min_argc, bool is_objc) { - lock(); + RoxorCoreLock lock; #if ROXOR_VM_DEBUG printf("gen Ruby -> %s stub with types %s\n", is_objc ? "ObjC" : "C", @@ -2931,8 +2952,6 @@ stub = iter->second; } - unlock(); - return stub; } @@ -3453,6 +3472,7 @@ __vm_raise(void) { VALUE rb_exc = GET_VM()->current_exception(); + // DTrace probe: raise if (MACRUBY_RAISE_ENABLED()) { char *classname = (char *)rb_class2name(CLASS_OF(rb_exc)); @@ -4364,21 +4384,21 @@ void RoxorCore::register_finalizer(rb_vm_finalizer_t *finalizer) { - lock(); + RoxorCoreLock lock; + finalizers.push_back(finalizer); - unlock(); } void RoxorCore::unregister_finalizer(rb_vm_finalizer_t *finalizer) { - lock(); + RoxorCoreLock lock; + std::vector<rb_vm_finalizer_t *>::iterator i = std::find(finalizers.begin(), finalizers.end(), finalizer); if (i != finalizers.end()) { finalizers.erase(i); } - unlock(); } static void @@ -4440,9 +4460,9 @@ void RoxorCore::register_thread(VALUE thread) { - lock(); + RoxorCoreLock lock; + rb_ary_push(threads, thread); - unlock(); rb_vm_thread_t *t = GetThreadPtr(thread); pthread_assert(pthread_setspecific(RoxorVM::vm_thread_key, t->vm)); @@ -4456,7 +4476,8 @@ void RoxorCore::unregister_thread(VALUE thread) { - lock(); + RoxorCoreLock lock; + // We do not call #delete because it might trigger #== in case it has been // overriden on the thread object, and therefore cause a deadlock if the // new method tries to acquire the RoxorCore GIL. @@ -4474,8 +4495,9 @@ (void *)thread); abort(); } - unlock(); + lock.unlock(); + rb_vm_thread_t *t = GetThreadPtr(thread); const int code = pthread_mutex_destroy(&t->sleep_mutex); @@ -5103,7 +5125,7 @@ rb_vm_unregister_current_alien_thread(void) { // Check if the current pthread has been registered. - GET_CORE()->lock(); + RoxorCoreLock lock; pthread_t self = pthread_self(); VALUE ary = GET_CORE()->get_threads(); bool need_to_unregister = false; @@ -5113,7 +5135,7 @@ need_to_unregister = true; } } - GET_CORE()->unlock(); + lock.unlock(); // If yes, appropriately unregister it. if (need_to_unregister) {

1 0

[3946] MacRuby/trunk/spec/macruby/core/pointer_spec.rb
by source_changes＠macosforge.org 20 Apr '10

20 Apr '10

Revision: 3946 http://trac.macosforge.org/projects/ruby/changeset/3946 Author: lsansonetti(a)apple.com Date: 2010-04-20 16:14:49 -0700 (Tue, 20 Apr 2010) Log Message: ----------- added specs for Pointer#cast! Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/pointer_spec.rb Modified: MacRuby/trunk/spec/macruby/core/pointer_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/pointer_spec.rb 2010-04-20 23:14:30 UTC (rev 3945) +++ MacRuby/trunk/spec/macruby/core/pointer_spec.rb 2010-04-20 23:14:49 UTC (rev 3946) @@ -170,3 +170,19 @@ lambda { pointer[3] = 42 }.should raise_error(ArgumentError) end end + +describe "A Pointer object" do + it "can have its type changed using #cast!" do + pointer = Pointer.new(NSRect.type) + pointer[0] = NSMakeRect(10, 20, 30, 40) + + val = NSValue.valueWithPointer(pointer) + pointer2 = val.pointerValue + pointer2.class.should == Pointer + pointer2.type == 'v' + + pointer2.cast!(NSRect.type).should == pointer2 + pointer2.type.should == NSRect.type + pointer2[0].should == NSMakeRect(10, 20, 30, 40) + end +end

1 0

[3945] MacRuby/trunk/bridgesupport.cpp
by source_changes＠macosforge.org 20 Apr '10

20 Apr '10

Revision: 3945 http://trac.macosforge.org/projects/ruby/changeset/3945 Author: lsansonetti(a)apple.com Date: 2010-04-20 16:14:30 -0700 (Tue, 20 Apr 2010) Log Message: ----------- added #cast! method to retype pointers, allow any pointer to be converted to void* Modified Paths: -------------- MacRuby/trunk/bridgesupport.cpp Modified: MacRuby/trunk/bridgesupport.cpp =================================================================== --- MacRuby/trunk/bridgesupport.cpp 2010-04-20 20:43:36 UTC (rev 3944) +++ MacRuby/trunk/bridgesupport.cpp 2010-04-20 23:14:30 UTC (rev 3945) @@ -571,17 +571,18 @@ static const char *convert_ffi_type(VALUE type, bool raise_exception_if_unknown); -VALUE -rb_pointer_new(const char *type_str, void *val, size_t len) +static void +rb_pointer_init_type(rb_vm_pointer_t *ptr, VALUE type) { + const char *type_str = StringValuePtr(type); // LLVM doesn't allow to get a pointer to Type::VoidTy, and for convenience // reasons we map a pointer to void as a pointer to unsigned char. if (*type_str == 'v') { type_str = "C"; + type = rb_str_new2(type_str); } - rb_vm_pointer_t *ptr = (rb_vm_pointer_t *)xmalloc(sizeof(rb_vm_pointer_t)); - GC_WB(&ptr->type, rb_str_new2(type_str)); + GC_WB(&ptr->type, type); RoxorCore *core = GET_CORE(); @@ -592,9 +593,17 @@ ptr->type_size = core->get_sizeof(type_str); assert(ptr->type_size > 0); - ptr->len = len; +} +VALUE +rb_pointer_new(const char *type_str, void *val, size_t len) +{ + rb_vm_pointer_t *ptr = (rb_vm_pointer_t *)xmalloc(sizeof(rb_vm_pointer_t)); + + rb_pointer_init_type(ptr, rb_str_new2(type_str)); + GC_WB(&ptr->val, val); + ptr->len = len; return Data_Wrap_Struct(rb_cPointer, NULL, NULL, ptr); } @@ -663,8 +672,8 @@ rb_vm_pointer_t *ptr; Data_Get_Struct(rcv, rb_vm_pointer_t, ptr); - assert(*type == _C_PTR); - if (strcmp(RSTRING_PTR(ptr->type), type + 1) != 0) { + assert(type[0] == _C_PTR); + if (type[1] != _C_VOID && strcmp(RSTRING_PTR(ptr->type), &type[1]) != 0) { rb_raise(rb_eTypeError, "expected instance of Pointer of type `%s', got `%s'", type + 1, @@ -722,6 +731,17 @@ return ptr->type; } +static VALUE +rb_pointer_cast(VALUE rcv, SEL sel, VALUE type) +{ + rb_vm_pointer_t *ptr; + Data_Get_Struct(rcv, rb_vm_pointer_t, ptr); + + rb_pointer_init_type(ptr, type); + + return rcv; +} + bs_element_constant_t * RoxorCore::find_bs_const(ID name) { @@ -1201,6 +1221,8 @@ (void *)rb_pointer_assign, 1); rb_objc_define_method(rb_cPointer, "type", (void *)rb_pointer_type, 0); + rb_objc_define_method(rb_cPointer, "cast!", + (void *)rb_pointer_cast, 1); bs_const_magic_cookie = rb_str_new2("bs_const_magic_cookie"); rb_objc_retain((void *)bs_const_magic_cookie);

1 0

[3944] MacRuby/trunk/ext/digest/bubblebabble/bubblebabble.c
by source_changes＠macosforge.org 20 Apr '10

20 Apr '10

Revision: 3944 http://trac.macosforge.org/projects/ruby/changeset/3944 Author: lsansonetti(a)apple.com Date: 2010-04-20 13:43:36 -0700 (Tue, 20 Apr 2010) Log Message: ----------- fix warning Modified Paths: -------------- MacRuby/trunk/ext/digest/bubblebabble/bubblebabble.c Modified: MacRuby/trunk/ext/digest/bubblebabble/bubblebabble.c =================================================================== --- MacRuby/trunk/ext/digest/bubblebabble/bubblebabble.c 2010-04-20 20:24:50 UTC (rev 3943) +++ MacRuby/trunk/ext/digest/bubblebabble/bubblebabble.c 2010-04-20 20:43:36 UTC (rev 3944) @@ -21,7 +21,7 @@ { const char *digest; size_t digest_len; - UInt8 *p; + char *p; int i, j, seed = 1; static const char vowels[] = { 'a', 'e', 'i', 'o', 'u', 'y' @@ -40,7 +40,7 @@ } const size_t p_len = (digest_len | 1) * 3 + 2; - p = (UInt8 *)malloc(p_len + 1); + p = (char *)malloc(p_len + 1); i = j = 0; p[j++] = 'x';

1 0

[3943] MacRuby/trunk/objc.m
by source_changes＠macosforge.org 20 Apr '10

20 Apr '10

Revision: 3943 http://trac.macosforge.org/projects/ruby/changeset/3943 Author: lsansonetti(a)apple.com Date: 2010-04-20 13:24:50 -0700 (Tue, 20 Apr 2010) Log Message: ----------- do not auto-initialize classes that are not NSObject-based Modified Paths: -------------- MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2010-04-20 05:12:16 UTC (rev 3942) +++ MacRuby/trunk/objc.m 2010-04-20 20:24:50 UTC (rev 3943) @@ -650,6 +650,19 @@ void rb_objc_force_class_initialize(Class klass) { + // Do not do anything in case the class is not NSObject-based + // (likely Proxy). + bool ok = false; + for (Class k = klass; k != NULL; k = class_getSuperclass(k)) { + if (k == (Class)rb_cNSObject) { + ok = true; + break; + } + } + if (!ok) { + return; + } + // This forces +initialize to be called. class_getMethodImplementation(klass, @selector(initialize)); } @@ -678,7 +691,9 @@ rb_objc_define_method(rb_mKernel, "load_bridge_support_file", rb_objc_load_bs, 1); - Method m = class_getInstanceMethod(objc_getClass("NSKeyValueUnnestedProperty"), sel_registerName("isaForAutonotifying")); + Class k = objc_getClass("NSKeyValueUnnestedProperty"); + assert(k != NULL); + Method m = class_getInstanceMethod(k, @selector(isaForAutonotifying)); assert(m != NULL); old_imp_isaForAutonotifying = method_getImplementation(m); method_setImplementation(m, (IMP)rb_obj_imp_isaForAutonotifying);

1 0

[3942] MacRuby/trunk/spec/frozen/tags/macruby/language/BEGIN_tags.txt
by source_changes＠macosforge.org 20 Apr '10

20 Apr '10

Revision: 3942 http://trac.macosforge.org/projects/ruby/changeset/3942 Author: lsansonetti(a)apple.com Date: 2010-04-19 22:12:16 -0700 (Mon, 19 Apr 2010) Log Message: ----------- tag a BEGIN spec Added Paths: ----------- MacRuby/trunk/spec/frozen/tags/macruby/language/BEGIN_tags.txt Added: MacRuby/trunk/spec/frozen/tags/macruby/language/BEGIN_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/BEGIN_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/BEGIN_tags.txt 2010-04-20 05:12:16 UTC (rev 3942) @@ -0,0 +1 @@ +fails:The BEGIN keyword must appear in a top-level context

1 0

[3941] MacRuby/trunk/spec/macruby
by source_changes＠macosforge.org 18 Apr '10

18 Apr '10

Revision: 3941 http://trac.macosforge.org/projects/ruby/changeset/3941 Author: lsansonetti(a)apple.com Date: 2010-04-18 14:12:13 -0700 (Sun, 18 Apr 2010) Log Message: ----------- added specs for class with custom Objective-C method resolver Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/object_spec.rb MacRuby/trunk/spec/macruby/fixtures/object.m Modified: MacRuby/trunk/spec/macruby/core/object_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/object_spec.rb 2010-04-18 21:11:41 UTC (rev 3940) +++ MacRuby/trunk/spec/macruby/core/object_spec.rb 2010-04-18 21:12:13 UTC (rev 3941) @@ -62,4 +62,14 @@ obj = NSPredicate.predicateWithFormat("NOT (SELF in %@)", argumentArray: [[1,2,3,4]]) obj.kind_of?(NSPredicate).should == true end + + it "with a custom Objective-C method resolver can still be used to add new methods from Ruby" do + class TestCustomMethodResolverSub < ::TestCustomMethodResolver + def foo; 42; end + alias_method :bar, :foo + end + o = TestCustomMethodResolverSub.new + o.foo.should == 42 + o.bar.should == 42 + end end Modified: MacRuby/trunk/spec/macruby/fixtures/object.m =================================================================== --- MacRuby/trunk/spec/macruby/fixtures/object.m 2010-04-18 21:11:41 UTC (rev 3940) +++ MacRuby/trunk/spec/macruby/fixtures/object.m 2010-04-18 21:12:13 UTC (rev 3941) @@ -43,4 +43,21 @@ @end +@interface TestCustomMethodResolver : NSObject +@end + +@implementation TestCustomMethodResolver + ++ (BOOL)resolveInstanceMethod:(SEL)name +{ + return NO; +} + ++ (BOOL)resolveClassMethod:(SEL)name +{ + return NO; +} + +@end + void Init_object(void) {}

1 0

[3940] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 18 Apr '10

18 Apr '10

Revision: 3940 http://trac.macosforge.org/projects/ruby/changeset/3940 Author: lsansonetti(a)apple.com Date: 2010-04-18 14:11:41 -0700 (Sun, 18 Apr 2010) Log Message: ----------- disable lazy JIT in case the target class already has a custom Objective-C method resolver (CALayer is one) Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-04-17 02:09:53 UTC (rev 3939) +++ MacRuby/trunk/vm.cpp 2010-04-18 21:11:41 UTC (rev 3940) @@ -2092,6 +2092,8 @@ invalidate_respond_to_cache(); } +static bool class_has_custom_resolver(Class klass); + static void prepare_method(Class klass, bool dynamic_class, SEL sel, void *data, const rb_vm_arity_t &arity, int flags, bool precompiled) @@ -2122,6 +2124,7 @@ const char *sel_name = sel_getName(sel); const bool genuine_selector = sel_name[strlen(sel_name) - 1] == ':'; + const bool custom_resolver = class_has_custom_resolver(klass); bool redefined = false; bool added_modfunc = false; SEL orig_sel = sel; @@ -2144,8 +2147,9 @@ } else { Function *func = (Function *)data; - if (m != NULL) { - // The method already exists - we need to JIT it. + if (m != NULL || custom_resolver) { + // The method already exists _or_ the class implemented a custom + // Objective-C method resolver - we need to JIT it. if (imp == NULL) { imp = GET_CORE()->compile(func); } @@ -4881,6 +4885,8 @@ static IMP old_resolveClassMethod_imp = NULL; static IMP old_resolveInstanceMethod_imp = NULL; +static SEL sel_resolveClassMethod = 0; +static SEL sel_resolveInstanceMethod = 0; static BOOL resolveClassMethod_imp(void *self, SEL sel, SEL name) @@ -4900,6 +4906,23 @@ return NO; // TODO call old IMP } +static bool +class_has_custom_resolver(Class klass) +{ + if (!class_isMetaClass(klass)) { + klass = *(Class *)klass; + } + if (class_getMethodImplementation(klass, sel_resolveClassMethod) + != (IMP)resolveClassMethod_imp) { + return true; + } + if (class_getMethodImplementation(klass, sel_resolveInstanceMethod) + != (IMP)resolveInstanceMethod_imp) { + return true; + } + return false; +} + // We can't trust LLVM to pick the right target at runtime. #if __LP64__ # define TARGET_TRIPLE "x86_64-apple-darwin" @@ -4929,16 +4952,16 @@ setup_builtin_stubs(); + Class ns_object = (Class)objc_getClass("NSObject"); Method m; - Class ns_object = (Class)objc_getClass("NSObject"); - m = class_getInstanceMethod(*(Class *)ns_object, - sel_registerName("resolveClassMethod:")); + sel_resolveClassMethod = sel_registerName("resolveClassMethod:"); + m = class_getInstanceMethod(*(Class *)ns_object, sel_resolveClassMethod); assert(m != NULL); old_resolveClassMethod_imp = method_getImplementation(m); method_setImplementation(m, (IMP)resolveClassMethod_imp); - m = class_getInstanceMethod(*(Class *)ns_object, - sel_registerName("resolveInstanceMethod:")); + sel_resolveInstanceMethod = sel_registerName("resolveInstanceMethod:"); + m = class_getInstanceMethod(*(Class *)ns_object, sel_resolveInstanceMethod); assert(m != NULL); old_resolveInstanceMethod_imp = method_getImplementation(m); method_setImplementation(m, (IMP)resolveInstanceMethod_imp);

1 0

[3939] MacRuby/trunk/io.c
by source_changes＠macosforge.org 17 Apr '10

17 Apr '10

Revision: 3939 http://trac.macosforge.org/projects/ruby/changeset/3939 Author: martinlagardette(a)apple.com Date: 2010-04-16 19:09:53 -0700 (Fri, 16 Apr 2010) Log Message: ----------- Adds support for `Array` arguments in `IO.popen` Also adds support for the "|" argument in `IO.read` and `IO.open` Modified Paths: -------------- MacRuby/trunk/io.c Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2010-04-17 00:55:39 UTC (rev 3938) +++ MacRuby/trunk/io.c 2010-04-17 02:09:53 UTC (rev 3939) @@ -2111,11 +2111,31 @@ "could not add a close() to stdout"); pid_t pid; - // TODO: Split the process_name up into char* components? - char *spawnedArgs[] = {(char*)_PATH_BSHELL, "-c", - (char*)RSTRING_PTR(prog), NULL}; - errno = posix_spawn(&pid, spawnedArgs[0], &actions, NULL, spawnedArgs, - *(_NSGetEnviron())); + + VALUE argArray = rb_check_array_type(prog); + if (!NIL_P(argArray)) { + const long len = RARRAY_LEN(argArray); + char **spawnedArgs = + malloc((len + 1) * sizeof(char *)); + for (long i = 0; i < len; i++) { + VALUE str = RARRAY_AT(argArray, i); + spawnedArgs[i] = StringValuePtr(str); + } + spawnedArgs[len] = 0; + // using posix_spawnP (look up binary in PATH) + errno = posix_spawnp(&pid, spawnedArgs[0], &actions, NULL, spawnedArgs, + *(_NSGetEnviron())); + const int err = errno; + free(spawnedArgs); + errno = err; + } + else { + // TODO: Split the process_name up into char* components? + char *spawnedArgs[] = {(char*)_PATH_BSHELL, "-c", + StringValuePtr(prog), NULL}; + errno = posix_spawn(&pid, spawnedArgs[0], &actions, NULL, spawnedArgs, + *(_NSGetEnviron())); + } if (errno != 0) { const int err = errno; close(fd[0]); @@ -2153,7 +2173,6 @@ if (NIL_P(mode)) { mode = (VALUE)CFSTR("r"); } - StringValue(process_name); VALUE io = io_from_spawning_new_process(process_name, mode); if (rb_block_given_p()) { VALUE ret = rb_vm_yield(1, &io); @@ -2190,6 +2209,19 @@ return io; } +static VALUE +check_pipe_command(VALUE fname) +{ + const char *cname = StringValuePtr(fname); + const size_t len = strlen(cname); + + if (cname[0] == '|') { + VALUE cmd = rb_str_new(cname + 1, len - 1); + return cmd; + } + return Qnil; +} + /* * call-seq: * open(path [, mode_enc [, perm]] ) => io or nil @@ -2300,12 +2332,23 @@ static VALUE rb_file_open(VALUE io, int argc, VALUE *argv) { + if (argc > 0) { + // First argument must always be a path, we are checking it here to + // conform to RubySpecs which states that the conversion must only + // happen once. + FilePathValue(argv[0]); + } + if (argc >= 1) { + VALUE cmd = check_pipe_command(argv[0]); + if (cmd != Qnil) { + return rb_io_s_popen(rb_cIO, 0, 1, &cmd); + } + } VALUE path, modes, permissions; rb_scan_args(argc, argv, "12", &path, &modes, &permissions); if (NIL_P(modes)) { modes = (VALUE)CFSTR("r"); } - FilePathValue(path); const char *filepath = RSTRING_PTR(path); const int flags = convert_mode_string_to_oflags(modes); const mode_t perm = NIL_P(permissions) ? 0666 : NUM2UINT(permissions); @@ -2349,6 +2392,12 @@ VALUE rb_f_open(VALUE klass, SEL sel, int argc, VALUE *argv) { + if (argc >= 1) { + VALUE cmd = check_pipe_command(argv[0]); + if (cmd != Qnil) { + return rb_io_s_popen(rb_cIO, 0, 1, &cmd); + } + } VALUE io = rb_class_new_instance(argc, argv, rb_cFile); if (rb_block_given_p()) { return rb_ensure(f_open_body, io, f_open_ensure, io);

1 0

[3938] MacRuby/trunk/spec/macruby
by source_changes＠macosforge.org 17 Apr '10

17 Apr '10

Revision: 3938 http://trac.macosforge.org/projects/ruby/changeset/3938 Author: lsansonetti(a)apple.com Date: 2010-04-16 17:55:39 -0700 (Fri, 16 Apr 2010) Log Message: ----------- added specs to cover automatic class +initialize upon lazy lookup Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/object_spec.rb MacRuby/trunk/spec/macruby/fixtures/object.m Modified: MacRuby/trunk/spec/macruby/core/object_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/object_spec.rb 2010-04-16 23:59:45 UTC (rev 3937) +++ MacRuby/trunk/spec/macruby/core/object_spec.rb 2010-04-17 00:55:39 UTC (rev 3938) @@ -51,4 +51,15 @@ o2.frozen?.should == false end -end \ No newline at end of file +end + +describe "An Objective-C class" do + it "has its +initialize method called once it is accessed for the first time" do + 3.times { ::TestClassInitialization.result.should == 42 } + + # If +[NSPredicate initialize] is not properly called, this will raise a warning in the + # running terminal (see https://www.macruby.org/trac/ticket/458) + obj = NSPredicate.predicateWithFormat("NOT (SELF in %@)", argumentArray: [[1,2,3,4]]) + obj.kind_of?(NSPredicate).should == true + end +end Modified: MacRuby/trunk/spec/macruby/fixtures/object.m =================================================================== --- MacRuby/trunk/spec/macruby/fixtures/object.m 2010-04-16 23:59:45 UTC (rev 3937) +++ MacRuby/trunk/spec/macruby/fixtures/object.m 2010-04-17 00:55:39 UTC (rev 3938) @@ -22,4 +22,25 @@ @end +@interface TestClassInitialization : NSObject +@end + +@implementation TestClassInitialization + +static int res = 0; + ++ (void)initialize +{ + if (self == [TestClassInitialization class]) { + res += 42; + } +} + ++ (int)result +{ + return res; +} + +@end + void Init_object(void) {}

1 0