August 2008 - macruby-changes - lists.macosforge.org

[529] MacRuby/trunk/sample-macruby/HotCocoa/demo/config/build.yml
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 529 http://trac.macosforge.org/projects/ruby/changeset/529 Author: rich(a)infoether.com Date: 2008-08-30 10:47:03 -0700 (Sat, 30 Aug 2008) Log Message: ----------- add copying of resource files Modified Paths: -------------- MacRuby/trunk/sample-macruby/HotCocoa/demo/config/build.yml Modified: MacRuby/trunk/sample-macruby/HotCocoa/demo/config/build.yml =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/demo/config/build.yml 2008-08-30 07:34:47 UTC (rev 528) +++ MacRuby/trunk/sample-macruby/HotCocoa/demo/config/build.yml 2008-08-30 17:47:03 UTC (rev 529) @@ -4,3 +4,5 @@ icon: resources/HotCocoa.icns sources: - lib/**/*.rb +resources: + - resources/**/*.*

1 0

[528] MacRuby/trunk/test/ruby/test_objc.rb
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 528 http://trac.macosforge.org/projects/ruby/changeset/528 Author: lsansonetti(a)apple.com Date: 2008-08-30 00:34:47 -0700 (Sat, 30 Aug 2008) Log Message: ----------- added more tests Modified Paths: -------------- MacRuby/trunk/test/ruby/test_objc.rb Modified: MacRuby/trunk/test/ruby/test_objc.rb =================================================================== --- MacRuby/trunk/test/ruby/test_objc.rb 2008-08-30 07:34:32 UTC (rev 527) +++ MacRuby/trunk/test/ruby/test_objc.rb 2008-08-30 07:34:47 UTC (rev 528) @@ -363,4 +363,25 @@ assert_equal(Icon, o.class) assert_equal('Chad', o.name) end + + class TestKVCSetter + attr_accessor :foo + end + def test_KVO_setter_defined_by_attr_setter + o = TestKVCSetter.new + assert(o.respond_to?(:foo=)) + assert(o.respond_to?(:setFoo)) + o.setFoo(42) + assert(42, o.foo) + o.performSelector('setFoo:', withObject:42) + assert(42, o.foo) + end + + def test_respond_to_objc_methods + s = '' + assert(s.respond_to?(:strip)) + assert(s.respond_to?(:setString)) + assert(s.respond_to?('setString:')) + assert(s.respond_to?('performSelector:withObject:')) + end end

1 0

[527] MacRuby/trunk/objc.m
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 527 http://trac.macosforge.org/projects/ruby/changeset/527 Author: lsansonetti(a)apple.com Date: 2008-08-30 00:34:32 -0700 (Sat, 30 Aug 2008) Log Message: ----------- always return NULL in the kvo setter Modified Paths: -------------- MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-08-30 06:58:37 UTC (rev 526) +++ MacRuby/trunk/objc.m 2008-08-30 07:34:32 UTC (rev 527) @@ -1245,6 +1245,7 @@ if (ffi_rettype != &ffi_type_void) { ffi_ret = (void *)alloca(ffi_rettype->size); + memset(ffi_ret, 0, ffi_rettype->size); } else { ffi_ret = NULL; @@ -2777,7 +2778,7 @@ } } -static void +static void * rb_objc_kvo_setter_imp(void *recv, SEL sel, void *value) { const char *selname; @@ -2791,6 +2792,8 @@ buf[s + 1] = '\0'; rb_ivar_set((VALUE)recv, rb_intern(buf), value == NULL ? Qnil : OC2RB(value)); + + return NULL; /* we explicitely return NULL because otherwise a special constant may stay on the stack and be returned to Objective-C, and do some very nasty crap, especially if called via -[performSelector:]. */ } void

1 0

[526] MacRuby/trunk
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 526 http://trac.macosforge.org/projects/ruby/changeset/526 Author: lsansonetti(a)apple.com Date: 2008-08-29 23:58:37 -0700 (Fri, 29 Aug 2008) Log Message: ----------- fix for #40 Modified Paths: -------------- MacRuby/trunk/objc.h MacRuby/trunk/objc.m MacRuby/trunk/vm_method.c Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2008-08-30 05:13:53 UTC (rev 525) +++ MacRuby/trunk/objc.h 2008-08-30 06:58:37 UTC (rev 526) @@ -16,6 +16,8 @@ struct rb_objc_method_sig *sig, bs_element_method_t *bs_method, int argc, VALUE *argv); +void rb_objc_define_kvo_setter(VALUE klass, ID mid); + static inline void rb_objc_install_method(Class klass, SEL sel, IMP imp) { Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-08-30 05:13:53 UTC (rev 525) +++ MacRuby/trunk/objc.m 2008-08-30 06:58:37 UTC (rev 526) @@ -2778,7 +2778,7 @@ } static void -rb_objc_ib_outlet_imp(void *recv, SEL sel, void *value) +rb_objc_kvo_setter_imp(void *recv, SEL sel, void *value) { const char *selname; char buf[128]; @@ -2790,38 +2790,44 @@ s = strlcpy(&buf[2], &selname[4], sizeof buf - 2); buf[s + 1] = '\0'; - rb_ivar_set((VALUE)recv, rb_intern(buf), value == NULL ? Qnil : (VALUE)value); + rb_ivar_set((VALUE)recv, rb_intern(buf), value == NULL ? Qnil : OC2RB(value)); } +void +rb_objc_define_kvo_setter(VALUE klass, ID mid) +{ + char buf[100]; + const char *mid_name; + + buf[0] = 's'; buf[1] = 'e'; buf[2] = 't'; + mid_name = rb_id2name(mid); + + buf[3] = toupper(mid_name[0]); + buf[4] = '\0'; + strlcat(buf, &mid_name[1], sizeof buf); + strlcat(buf, ":", sizeof buf); + + if (!class_addMethod((Class)klass, sel_registerName(buf), + (IMP)rb_objc_kvo_setter_imp, "v@:@")) { + rb_warn("can't register `%s' as an KVO setter (method `%s')", + mid_name, buf); + } +} + VALUE rb_mod_objc_ib_outlet(int argc, VALUE *argv, VALUE recv) { int i; - char buf[100]; - buf[0] = 's'; buf[1] = 'e'; buf[2] = 't'; + rb_warn("ib_outlet has been deprecated, please use attr_writer instead"); for (i = 0; i < argc; i++) { VALUE sym = argv[i]; - const char *symname; Check_Type(sym, T_SYMBOL); - symname = rb_sym2name(sym); + rb_objc_define_kvo_setter(recv, SYM2ID(sym)); + } - if (strlen(symname) == 0) - rb_raise(rb_eArgError, "empty symbol given"); - - buf[3] = toupper(symname[0]); - buf[4] = '\0'; - strlcat(buf, &symname[1], sizeof buf); - strlcat(buf, ":", sizeof buf); - - if (!class_addMethod((Class)recv, sel_registerName(buf), - (IMP)rb_objc_ib_outlet_imp, "v@:@")) - rb_raise(rb_eArgError, - "can't register `%s' (method %s) as an IB outlet", - symname, buf); - } return recv; } Modified: MacRuby/trunk/vm_method.c =================================================================== --- MacRuby/trunk/vm_method.c 2008-08-30 05:13:53 UTC (rev 525) +++ MacRuby/trunk/vm_method.c 2008-08-30 06:58:37 UTC (rev 526) @@ -549,6 +549,9 @@ } if (write) { rb_add_method(klass, rb_id_attrset(id), NEW_ATTRSET(attriv), noex); +#if WITH_OBJC + rb_objc_define_kvo_setter(klass, id); +#endif } }

1 0

[525] MacRuby/trunk
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 525 http://trac.macosforge.org/projects/ruby/changeset/525 Author: lsansonetti(a)apple.com Date: 2008-08-29 22:13:53 -0700 (Fri, 29 Aug 2008) Log Message: ----------- fixed #dup for boxed structs Modified Paths: -------------- MacRuby/trunk/objc.m MacRuby/trunk/test/ruby/test_objc.rb Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-08-30 04:26:04 UTC (rev 524) +++ MacRuby/trunk/objc.m 2008-08-30 05:13:53 UTC (rev 525) @@ -2150,11 +2150,32 @@ bs_element_boxed_t *bs_boxed = rb_klass_get_bs_boxed(CLASS_OF(recv)); bs_element_struct_t *bs_struct = (bs_element_struct_t *)bs_boxed->value; VALUE *data, *new_data; + int i; + static ID idDup = 0; + if (idDup == 0) { + idDup = rb_intern("dup"); + } + Data_Get_Struct(recv, VALUE, data); new_data = (VALUE *)xmalloc(bs_struct->fields_count * sizeof(VALUE)); - memcpy(new_data, data, bs_struct->fields_count * sizeof(VALUE)); + for (i = 0; i < bs_struct->fields_count; i++) { + bs_element_struct_field_t *bs_field = + (bs_element_struct_field_t *)&bs_struct->fields[i]; + size_t fdata_size; + void *fdata; + VALUE fval; + + fdata_size = rb_objc_octype_to_ffitype(bs_field->type)->size; + fdata = alloca(fdata_size); + + rb_objc_rval_to_ocval(data[i], bs_field->type, fdata); + rb_objc_ocval_to_rval(fdata, bs_field->type, &fval); + + GC_WB(&new_data[i], fval); + } + return Data_Wrap_Struct(CLASS_OF(recv), NULL, NULL, new_data); } Modified: MacRuby/trunk/test/ruby/test_objc.rb =================================================================== --- MacRuby/trunk/test/ruby/test_objc.rb 2008-08-30 04:26:04 UTC (rev 524) +++ MacRuby/trunk/test/ruby/test_objc.rb 2008-08-30 05:13:53 UTC (rev 525) @@ -260,6 +260,17 @@ r.inspect) end + def test_struct_dup + r = NSMakeRect(1, 2, 3, 4) + r2 = r.dup + assert_kind_of(NSRect, r2) + assert_equal(r, r2) + r2.origin.x = 42 + assert(r != r2) + r2.origin.x = 1 + assert_equal(r, r2) + end + class TestInitCallInitialize attr_reader :foo def initialize

1 0

[524] MacRuby/trunk
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 524 http://trac.macosforge.org/projects/ruby/changeset/524 Author: lsansonetti(a)apple.com Date: 2008-08-29 21:26:04 -0700 (Fri, 29 Aug 2008) Log Message: ----------- fix for #113 Modified Paths: -------------- MacRuby/trunk/objc.m MacRuby/trunk/test/ruby/test_objc.rb Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-08-30 02:49:58 UTC (rev 523) +++ MacRuby/trunk/objc.m 2008-08-30 04:26:04 UTC (rev 524) @@ -630,12 +630,17 @@ else { void *data; - Data_Get_Struct(rval, void, data); - if (data == NULL) { + if (rval == Qnil) { *(void **)ocval = NULL; } else { - memcpy(ocval, data, bs_boxed->ffi_type->size); + Data_Get_Struct(rval, void, data); + if (data == NULL) { + *(void **)ocval = NULL; + } + else { + memcpy(ocval, data, bs_boxed->ffi_type->size); + } } } @@ -3065,6 +3070,32 @@ RUBY_VM_CHECK_INTS(); } +static IMP old_imp_isaForAutonotifying; + +static Class +rb_obj_imp_isaForAutonotifying(void *rcv, SEL sel) +{ + Class ret; + +#define KVO_CHECK_DONE 0x100000 + + ret = ((Class (*)(void *, SEL)) old_imp_isaForAutonotifying)(rcv, sel); + if (ret != NULL && (RCLASS_VERSION(ret) & KVO_CHECK_DONE) == 0) { + const char *name = class_getName(ret); + if (strncmp(name, "NSKVONotifying_", 15) == 0) { + Class ret_orig; + name += 15; + ret_orig = objc_getClass(name); + if (ret_orig != NULL && RCLASS_VERSION(ret_orig) & RCLASS_IS_OBJECT_SUBCLASS) { + DLOG("XXX", "marking KVO generated klass %p (%s) as RObject", ret, class_getName(ret)); + RCLASS_VERSION(ret) |= RCLASS_IS_OBJECT_SUBCLASS; + } + } + RCLASS_VERSION(ret) |= KVO_CHECK_DONE; + } + return ret; +} + void Init_ObjC(void) { @@ -3103,6 +3134,11 @@ } rb_define_method(rb_cBasicObject, "__super_objc_send__", rb_super_objc_send, -1); + + Method m = class_getInstanceMethod(objc_getClass("NSKeyValueUnnestedProperty"), sel_registerName("isaForAutonotifying")); + assert(m != NULL); + old_imp_isaForAutonotifying = method_getImplementation(m); + method_setImplementation(m, (IMP)rb_obj_imp_isaForAutonotifying); } // for debug in gdb Modified: MacRuby/trunk/test/ruby/test_objc.rb =================================================================== --- MacRuby/trunk/test/ruby/test_objc.rb 2008-08-30 02:49:58 UTC (rev 523) +++ MacRuby/trunk/test/ruby/test_objc.rb 2008-08-30 04:26:04 UTC (rev 524) @@ -65,6 +65,7 @@ def setup framework 'Foundation' + framework 'AppKit' end def test_all_objects_inherit_from_nsobject @@ -330,4 +331,25 @@ d.testCallGetRectMethod(obj, expectedValue:obj.val) end + class Icon + attr_accessor :name + def initialize(name) + @name = name + end + end + def test_NSKVONotifying_class_preserve_ivars + array_controller = NSArrayController.new + array_controller.setAvoidsEmptySelection(false) + array_controller.setPreservesSelection(false) + array_controller.setSelectsInsertedObjects(false) + array_controller.setAutomaticallyRearrangesObjects(true) + array_controller.setSortDescriptors([NSSortDescriptor.alloc.initWithKey("name", ascending: false)]) + array_controller.addObjects([Icon.new("Rich"), Icon.new("Chad")]) + o = array_controller.arrangedObjects[0] + assert_equal(Icon, o.class) + assert_equal('Rich', o.name) + o = array_controller.arrangedObjects[1] + assert_equal(Icon, o.class) + assert_equal('Chad', o.name) + end end

1 0

[523] MacRuby/trunk/objc.m
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 523 http://trac.macosforge.org/projects/ruby/changeset/523 Author: lsansonetti(a)apple.com Date: 2008-08-29 19:49:58 -0700 (Fri, 29 Aug 2008) Log Message: ----------- refactoring of the C structure boxing code, should also fix the memory crashers Modified Paths: -------------- MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-08-30 02:47:11 UTC (rev 522) +++ MacRuby/trunk/objc.m 2008-08-30 02:49:58 UTC (rev 523) @@ -436,53 +436,6 @@ return true; } -static void * -bs_element_boxed_get_data(bs_element_boxed_t *bs_boxed, VALUE rval, - bool *success) -{ - void *data; - - assert(bs_boxed->ffi_type != NULL); - - if (NIL_P(rval) && bs_boxed->ffi_type == &ffi_type_pointer) { - *success = true; - return NULL; - } - - if (rb_obj_is_kind_of(rval, rb_cBoxed) == Qfalse) { - *success = false; - return NULL; - } - - Data_Get_Struct(rval, void, data); - - if (bs_boxed->type == BS_ELEMENT_STRUCT) { - bs_element_struct_t *bs_struct; - unsigned i; - - bs_struct = (bs_element_struct_t *)bs_boxed->value; - - /* Resync the ivars if necessary. - * This is required as a field may nest another structure, which - * could have been modified as a copy in the Ruby world. - */ - for (i = 0; i < bs_struct->fields_count; i++) { - VALUE *v; - v = &((VALUE *)(data + bs_boxed->ffi_type->size))[i]; - if (*v != 0) { - char buf[512]; - snprintf(buf, sizeof buf, "%s=", bs_struct->fields[i].name); - rb_funcall(rval, rb_intern(buf), 1, *v); - *v = 0; - } - } - } - - *success = true; - - return data; -} - static void rb_bs_boxed_assert_ffitype_ok(bs_element_boxed_t *bs_boxed) { @@ -494,12 +447,11 @@ assert(bs_boxed->ffi_type != NULL); } +static void rb_objc_ocval_to_rval(void **ocval, const char *octype, VALUE *rbval); + static VALUE rb_bs_boxed_new_from_ocdata(bs_element_boxed_t *bs_boxed, void *ocval) { - void *data; - size_t soffset; - if (ocval == NULL) return Qnil; @@ -508,17 +460,32 @@ rb_bs_boxed_assert_ffitype_ok(bs_boxed); - soffset = 0; if (bs_boxed->type == BS_ELEMENT_STRUCT) { - soffset = ((bs_element_struct_t *)bs_boxed->value)->fields_count - * sizeof(VALUE); + bs_element_struct_t *bs_struct = (bs_element_struct_t *)bs_boxed->value; + VALUE *data; + int i; + size_t pos; + + data = (VALUE *)xmalloc(bs_struct->fields_count * sizeof(VALUE)); + for (i = 0, pos = 0; i < bs_struct->fields_count; i++) { + bs_element_struct_field_t *bs_field = + (bs_element_struct_field_t *)&bs_struct->fields[i]; + VALUE fval; + + rb_objc_ocval_to_rval(ocval + pos, bs_field->type, &fval); + GC_WB(&data[i], fval); + pos += rb_objc_octype_to_ffitype(bs_field->type)->size; + } + return Data_Wrap_Struct(bs_boxed->klass, NULL, NULL, data); } + else { + void *data; - data = xmalloc(soffset + bs_boxed->ffi_type->size); - memcpy(data, ocval, bs_boxed->ffi_type->size); - memset(data + bs_boxed->ffi_type->size, 0, soffset); + data = xmalloc(bs_boxed->ffi_type->size); + memcpy(data, ocval, bs_boxed->ffi_type->size); - return Data_Wrap_Struct(bs_boxed->klass, NULL, NULL, data); + return Data_Wrap_Struct(bs_boxed->klass, NULL, NULL, data); + } } static long @@ -583,8 +550,6 @@ return val; } -static void rb_objc_ocval_to_rbval(void **ocval, const char *octype, VALUE *rbval); - static VALUE rb_pointer_aref(VALUE recv, VALUE i) { @@ -600,71 +565,81 @@ idx = FIX2INT(i); - rb_objc_ocval_to_rbval(data->ptr + (idx * rb_objc_octype_size(data->type)), - data->type, &ret); + rb_objc_ocval_to_rval(data->ptr + (idx * rb_objc_octype_size(data->type)), + data->type, &ret); return ret; } -static void * -rb_objc_rval_to_boxed_data(VALUE rval, bs_element_boxed_t *bs_boxed, bool *ok) +static bool +rb_objc_rval_copy_boxed_data(VALUE rval, bs_element_boxed_t *bs_boxed, void *ocval) { - void *data; + rb_bs_boxed_assert_ffitype_ok(bs_boxed); - if (TYPE(rval) == T_ARRAY && bs_boxed->type == BS_ELEMENT_STRUCT) { - bs_element_struct_t *bs_struct; + if (bs_boxed->type == BS_ELEMENT_STRUCT) { + bs_element_struct_t *bs_struct = (bs_element_struct_t *)bs_boxed->value; + bool is_ary; long i, n; size_t pos; + VALUE *data = NULL; - bs_struct = (bs_element_struct_t *)bs_boxed->value; - - rb_bs_boxed_assert_ffitype_ok(bs_boxed); - - n = RARRAY_LEN(rval); - if (n < bs_struct->fields_count) - rb_raise(rb_eArgError, - "not enough elements in array `%s' to create " \ - "structure `%s' (%ld for %d)", - RSTRING_PTR(rb_inspect(rval)), bs_struct->name, n, - bs_struct->fields_count); - - if (n > bs_struct->fields_count) { - VALUE new_rval = rb_ary_new(); - VALUE orig = rval; - rval = rb_ary_dup(rval); - rebuild_new_struct_ary(bs_boxed->ffi_type->elements, rval, - new_rval); - n = RARRAY_LEN(new_rval); - if (RARRAY_LEN(rval) != 0 || n != bs_struct->fields_count) { + is_ary = TYPE(rval) == T_ARRAY; + if (is_ary) { + n = RARRAY_LEN(rval); + if (n < bs_struct->fields_count) rb_raise(rb_eArgError, - "too much elements in array `%s' to create " \ + "not enough elements in array `%s' to create " \ "structure `%s' (%ld for %d)", - RSTRING_PTR(rb_inspect(orig)), - bs_struct->name, RARRAY_LEN(orig), + RSTRING_PTR(rb_inspect(rval)), bs_struct->name, n, bs_struct->fields_count); + + if (n > bs_struct->fields_count) { + VALUE new_rval = rb_ary_new(); + VALUE orig = rval; + rval = rb_ary_dup(rval); + rebuild_new_struct_ary(bs_boxed->ffi_type->elements, rval, + new_rval); + n = RARRAY_LEN(new_rval); + if (RARRAY_LEN(rval) != 0 || n != bs_struct->fields_count) { + rb_raise(rb_eArgError, + "too much elements in array `%s' to create " \ + "structure `%s' (%ld for %d)", + RSTRING_PTR(rb_inspect(orig)), + bs_struct->name, RARRAY_LEN(orig), + bs_struct->fields_count); + } + rval = new_rval; } - rval = new_rval; } + else { + if (TYPE(rval) != T_DATA) + return false; + Data_Get_Struct(rval, VALUE, data); + } - pos = bs_struct->fields_count * sizeof(VALUE); - data = xmalloc(bs_boxed->ffi_type->size + pos); - memset(data + bs_boxed->ffi_type->size, 0, pos); - pos = 0; + for (i = 0, pos = 0; i < bs_struct->fields_count; i++) { + char *field_type; + VALUE o; - for (i = 0; i < bs_struct->fields_count; i++) { - VALUE o = RARRAY_AT(rval, i); - char *field_type = bs_struct->fields[i].type; - rb_objc_rval_to_ocval(o, field_type, data + pos); + field_type = bs_struct->fields[i].type; + o = is_ary ? RARRAY_AT(rval, i) : data[i]; + rb_objc_rval_to_ocval(o, field_type, ocval + pos); pos += rb_objc_octype_to_ffitype(field_type)->size; } - - *ok = true; } else { - data = bs_element_boxed_get_data(bs_boxed, rval, ok); + void *data; + + Data_Get_Struct(rval, void, data); + if (data == NULL) { + *(void **)ocval = NULL; + } + else { + memcpy(ocval, data, bs_boxed->ffi_type->size); + } } - return data; + return true; } static void @@ -682,17 +657,7 @@ if (bs_boxeds != NULL && st_lookup(bs_boxeds, (st_data_t)octype, (st_data_t *)&bs_boxed)) { - void *data; - - data = rb_objc_rval_to_boxed_data(rval, bs_boxed, &ok); - if (ok) { - if (data == NULL) - *(void **)ocval = NULL; - else { - memcpy(ocval, data, bs_boxed->ffi_type->size); - xfree(data); - } - } + ok = rb_objc_rval_copy_boxed_data(rval, bs_boxed, (void *)ocval); goto bails; } @@ -752,12 +717,9 @@ } } else if (st_lookup(bs_boxeds, (st_data_t)octype + 1, - (st_data_t *)&bs_boxed)) { - void *data; - - data = rb_objc_rval_to_boxed_data(rval, bs_boxed, &ok); - if (ok) - *(void **)ocval = data; + (st_data_t *)&bs_boxed)) { + *(void **)ocval = xmalloc(bs_boxed->ffi_type->size); + ok = rb_objc_rval_copy_boxed_data(rval, bs_boxed, *(void **)ocval); } else { ok = false; @@ -881,7 +843,7 @@ } static void -rb_objc_ocval_to_rbval(void **ocval, const char *octype, VALUE *rbval) +rb_objc_ocval_to_rval(void **ocval, const char *octype, VALUE *rbval) { bool ok; @@ -1208,7 +1170,7 @@ VALUE retval; buf[0] = sig->types[0]; buf[1] = '\0'; - rb_objc_ocval_to_rbval(&ffi_ret, buf, &retval); + rb_objc_ocval_to_rval(&ffi_ret, buf, &retval); return retval; } return Qnil; @@ -1292,7 +1254,7 @@ if (ffi_rettype != &ffi_type_void) { VALUE resp; - rb_objc_ocval_to_rbval(ffi_ret, rettype, &resp); + rb_objc_ocval_to_rval(ffi_ret, rettype, &resp); return resp; } else { @@ -1563,7 +1525,7 @@ type = rb_objc_method_get_type(method, cif->nargs, bs_method, i, buf, sizeof buf); - rb_objc_ocval_to_rbval(args[i + 2], type, &val); + rb_objc_ocval_to_rval(args[i + 2], type, &val); argv[i] = val; } } @@ -1947,7 +1909,7 @@ resp = Qnil; if (ffi_rettype != &ffi_type_void) { - rb_objc_ocval_to_rbval(ffi_ret, bs_func->retval->type, &resp); + rb_objc_ocval_to_rval(ffi_ret, bs_func->retval->type, &resp); if (bs_func->retval->already_retained && !rb_objc_resourceful(resp)) CFMakeCollectable((void *)resp); } @@ -1970,7 +1932,7 @@ rb_bug("cannot locate symbol for unresolved bridgesupport " \ "constant `%s'", bs_const->name); - rb_objc_ocval_to_rbval(sym, bs_const->type, &v); + rb_objc_ocval_to_rval(sym, bs_const->type, &v); CFMutableDictionaryRef iv_dict = rb_class_ivar_dict(rb_cObject); assert(iv_dict != NULL); @@ -2006,26 +1968,32 @@ { bs_element_boxed_t *bs_boxed = rb_klass_get_bs_boxed(recv); bs_element_struct_t *bs_struct = (bs_element_struct_t *)bs_boxed->value; - void *data; + VALUE *data; unsigned i; - size_t pos; if (argc > 0 && argc != bs_struct->fields_count) rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, bs_struct->fields_count); - pos = bs_struct->fields_count * sizeof(VALUE); - data = (void *)xmalloc(pos + bs_boxed->ffi_type->size); - memset(data, 0, pos + bs_boxed->ffi_type->size); - pos = 0; + data = (VALUE *)xmalloc(bs_struct->fields_count * sizeof(VALUE)); - for (i = 0; i < argc; i++) { + for (i = 0; i < bs_struct->fields_count; i++) { bs_element_struct_field_t *bs_field = (bs_element_struct_field_t *)&bs_struct->fields[i]; + size_t fdata_size; + void *fdata; + VALUE fval; - rb_objc_rval_to_ocval(argv[i], bs_field->type, data + pos); - - pos += rb_objc_octype_to_ffitype(bs_field->type)->size; + fdata_size = rb_objc_octype_to_ffitype(bs_field->type)->size; + fdata = alloca(fdata_size); + if (i < argc) { + rb_objc_rval_to_ocval(argv[i], bs_field->type, fdata); + } + else { + memset(fdata, 0, fdata_size); + } + rb_objc_ocval_to_rval(fdata, bs_field->type, &fval); + GC_WB(&data[i], fval); } return Data_Wrap_Struct(recv, NULL, NULL, data); @@ -2057,8 +2025,7 @@ bs_element_struct_t *bs_struct = (bs_element_struct_t *)bs_boxed->value; unsigned i; const char *ivar_id_str; - void *data; - size_t pos; + VALUE *data; /* FIXME we should cache the ivar IDs somewhere in the * bs_element_struct_fields @@ -2067,26 +2034,16 @@ ivar_id_str = rb_id2name(rb_bs_struct_field_ivar_id()); ivar_id_str++; /* skip first '@' */ - Data_Get_Struct(recv, void, data); + Data_Get_Struct(recv, VALUE, data); assert(data != NULL); - rb_objc_wb_range(data + bs_boxed->ffi_type->size, - bs_struct->fields_count * sizeof(VALUE)); - - for (i = 0, pos = 0; i < bs_struct->fields_count; i++) { + for (i = 0; i < bs_struct->fields_count; i++) { bs_element_struct_field_t *bs_field = (bs_element_struct_field_t *)&bs_struct->fields[i]; if (strcmp(ivar_id_str, bs_field->name) == 0) { - VALUE *pval; - - pval = &((VALUE *)(data + bs_boxed->ffi_type->size))[i]; - if (*pval == 0) { - rb_objc_ocval_to_rbval(data + pos, bs_field->type, pval); - } - return *pval; + return data[i]; } - pos += rb_objc_octype_to_ffitype(bs_field->type)->size; } rb_bug("can't find field `%s' in recv `%s'", ivar_id_str, @@ -2102,7 +2059,7 @@ bs_element_struct_t *bs_struct = (bs_element_struct_t *)bs_boxed->value; unsigned i; const char *ivar_id_str; - void *data; + VALUE *data; size_t pos; /* FIXME we should cache the ivar IDs somewhere in the @@ -2112,7 +2069,7 @@ ivar_id_str = rb_id2name(rb_bs_struct_field_ivar_id()); ivar_id_str++; /* skip first '@' */ - Data_Get_Struct(recv, void, data); + Data_Get_Struct(recv, VALUE, data); assert(data != NULL); for (i = 0, pos = 0; i < bs_struct->fields_count; i++) { @@ -2120,11 +2077,18 @@ (bs_element_struct_field_t *)&bs_struct->fields[i]; if (strcmp(ivar_id_str, bs_field->name) == 0) { - rb_objc_rval_to_ocval(value, bs_field->type, data + pos); - /* We do not update the cache because `value' may have been - * transformed (ex. fixnum to float). - */ - ((VALUE *)(data + bs_boxed->ffi_type->size))[i] = 0; + size_t fdata_size; + void *fdata; + VALUE fval; + + fdata_size = rb_objc_octype_to_ffitype(bs_field->type)->size; + fdata = alloca(fdata_size); + + rb_objc_rval_to_ocval(value, bs_field->type, fdata); + rb_objc_ocval_to_rval(fdata, bs_field->type, &fval); + + GC_WB(&data[i], fval); + return value; } pos += rb_objc_octype_to_ffitype(bs_field->type)->size; @@ -2141,16 +2105,17 @@ { bs_element_boxed_t *bs_boxed = rb_klass_get_bs_boxed(CLASS_OF(recv)); bs_element_struct_t *bs_struct = (bs_element_struct_t *)bs_boxed->value; + VALUE *data; VALUE ary; unsigned i; - + + Data_Get_Struct(recv, VALUE, data); + assert(data != NULL); + ary = rb_ary_new(); for (i = 0; i < bs_struct->fields_count; i++) { - VALUE obj; - - obj = rb_funcall(recv, rb_intern(bs_struct->fields[i].name), 0, NULL); - rb_ary_push(ary, obj); + rb_ary_push(ary, data[i]); } return ary; @@ -2160,8 +2125,6 @@ rb_bs_boxed_is_equal(VALUE recv, VALUE other) { bs_element_boxed_t *bs_boxed; - bool ok; - void *d1, *d2; if (recv == other) return Qtrue; @@ -2173,40 +2136,21 @@ if (bs_boxed != rb_klass_get_bs_boxed(CLASS_OF(other))) return Qfalse; - d1 = bs_element_boxed_get_data(bs_boxed, recv, &ok); - if (!ok) - rb_raise(rb_eRuntimeError, "can't retrieve data for boxed `%s'", - RSTRING_PTR(rb_inspect(recv))); - - d2 = bs_element_boxed_get_data(bs_boxed, other, &ok); - if (!ok) - rb_raise(rb_eRuntimeError, "can't retrieve data for boxed `%s'", - RSTRING_PTR(rb_inspect(recv))); - - if (d1 == d2) - return Qtrue; - else if (d1 == NULL || d2 == NULL) - return Qfalse; - - return memcmp(d1, d2, bs_boxed->ffi_type->size) == 0 ? Qtrue : Qfalse; + return CFEqual((CFTypeRef)recv, (CFTypeRef)other) ? Qtrue : Qfalse; } static VALUE rb_bs_struct_dup(VALUE recv) { bs_element_boxed_t *bs_boxed = rb_klass_get_bs_boxed(CLASS_OF(recv)); - void *data; - bool ok; + bs_element_struct_t *bs_struct = (bs_element_struct_t *)bs_boxed->value; + VALUE *data, *new_data; - data = bs_element_boxed_get_data(bs_boxed, recv, &ok); - if (!ok) - rb_raise(rb_eRuntimeError, "can't retrieve data for boxed `%s'", - RSTRING_PTR(rb_inspect(recv))); + Data_Get_Struct(recv, VALUE, data); + new_data = (VALUE *)xmalloc(bs_struct->fields_count * sizeof(VALUE)); + memcpy(new_data, data, bs_struct->fields_count * sizeof(VALUE)); - if (data == NULL) - return Qnil; - - return rb_bs_boxed_new_from_ocdata(bs_boxed, data); + return Data_Wrap_Struct(CLASS_OF(recv), NULL, NULL, new_data); } static VALUE @@ -2221,15 +2165,15 @@ rb_str_cat2(str, rb_obj_classname(recv)); if (!bs_struct->opaque) { - for (i = 0; i < bs_struct->fields_count; i++) { - VALUE obj; + VALUE *data; - obj = rb_funcall(recv, rb_intern(bs_struct->fields[i].name), - 0, NULL); + Data_Get_Struct(recv, VALUE, data); + + for (i = 0; i < bs_struct->fields_count; i++) { rb_str_cat2(str, " "); rb_str_cat2(str, bs_struct->fields[i].name); rb_str_cat2(str, "="); - rb_str_append(str, rb_inspect(obj)); + rb_str_append(str, rb_inspect(data[i])); } } @@ -2278,8 +2222,9 @@ if (bs_boxed->type == BS_ELEMENT_STRUCT) { bs_element_struct_t *bs_struct; bs_struct = (bs_element_struct_t *)bs_boxed->value; - for (i = 0; i < bs_struct->fields_count; i++) + for (i = 0; i < bs_struct->fields_count; i++) { rb_ary_push(ary, ID2SYM(rb_intern(bs_struct->fields[i].name))); + } } return ary; } @@ -2733,22 +2678,9 @@ imp_rb_boxed_getValue(void *rcv, SEL sel, void *buffer) { bs_element_boxed_t *bs_boxed; - void *data; - bool ok; bs_boxed = rb_klass_get_bs_boxed(CLASS_OF(rcv)); - - data = bs_element_boxed_get_data(bs_boxed, (VALUE)rcv, &ok); - if (!ok) - [NSException raise:@"NSException" - format:@"can't get internal data for boxed type `%s'", - RSTRING_PTR(rb_inspect((VALUE)rcv))]; - if (data == NULL) { - *(void **)buffer = NULL; - } - else { - memcpy(buffer, data, bs_boxed->ffi_type->size); - } + assert(rb_objc_rval_copy_boxed_data((VALUE)rcv, bs_boxed, buffer)); } static void

1 0

[522] MacRuby/trunk/test/ruby/test_objc.rb
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 522 http://trac.macosforge.org/projects/ruby/changeset/522 Author: lsansonetti(a)apple.com Date: 2008-08-29 19:47:11 -0700 (Fri, 29 Aug 2008) Log Message: ----------- testing Boxed#inspect Modified Paths: -------------- MacRuby/trunk/test/ruby/test_objc.rb Modified: MacRuby/trunk/test/ruby/test_objc.rb =================================================================== --- MacRuby/trunk/test/ruby/test_objc.rb 2008-08-30 02:46:43 UTC (rev 521) +++ MacRuby/trunk/test/ruby/test_objc.rb 2008-08-30 02:47:11 UTC (rev 522) @@ -249,6 +249,16 @@ assert_raise(ArgumentError) { NSStringFromRect([1, 2, 3, 4, 5]) } end + def test_struct_inspect + r = NSRect.new + assert_equal("#<NSRect origin=#<NSPoint x=0.0 y=0.0> size=#<NSSize width=0.0 height=0.0>>", + r.inspect) + r.origin.x = 42 + r.size.width = 42 + assert_equal("#<NSRect origin=#<NSPoint x=42.0 y=0.0> size=#<NSSize width=42.0 height=0.0>>", + r.inspect) + end + class TestInitCallInitialize attr_reader :foo def initialize

1 0

[521] MacRuby/trunk/sample-macruby/PathDemo/DemoView.rb
by source_changes＠macosforge.org 30 Aug '08

30 Aug '08

Revision: 521 http://trac.macosforge.org/projects/ruby/changeset/521 Author: lsansonetti(a)apple.com Date: 2008-08-29 19:46:43 -0700 (Fri, 29 Aug 2008) Log Message: ----------- removed unnecessary code Modified Paths: -------------- MacRuby/trunk/sample-macruby/PathDemo/DemoView.rb Modified: MacRuby/trunk/sample-macruby/PathDemo/DemoView.rb =================================================================== --- MacRuby/trunk/sample-macruby/PathDemo/DemoView.rb 2008-08-29 20:30:29 UTC (rev 520) +++ MacRuby/trunk/sample-macruby/PathDemo/DemoView.rb 2008-08-30 02:46:43 UTC (rev 521) @@ -1,9 +1,3 @@ -class NSRect - def to_cgrect - CGRect.new(CGPoint.new(origin.x, origin.y), CGSize.new(size.width, size.height)) - end -end - class DemoView < NSView attr_accessor :demoNumber @@ -16,17 +10,16 @@ end def drawRect(rect) - r = rect.to_cgrect context = NSGraphicsContext.currentContext.graphicsPort CGContextSetGrayFillColor(context, 1.0, 1.0) - CGContextFillRect(context, r) + CGContextFillRect(context, rect) case @demoNumber - when 0 then rectangles(context, r) - when 1 then circles(context, r) - when 2 then bezierPaths(context, r) - when 3 then circleClipping(context, r) + when 0 then rectangles(context, rect) + when 1 then circles(context, rect) + when 2 then bezierPaths(context, rect) + when 3 then circleClipping(context, rect) else NSLog("Invalid demo number #{@demoNumber}") end

1 0

[520] MacRuby/trunk/lib/hotcocoa/mappings/alert.rb
by source_changes＠macosforge.org 29 Aug '08

29 Aug '08

Revision: 520 http://trac.macosforge.org/projects/ruby/changeset/520 Author: rich(a)infoether.com Date: 2008-08-29 13:30:29 -0700 (Fri, 29 Aug 2008) Log Message: ----------- add info default as nil Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/alert.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/alert.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/alert.rb 2008-08-29 20:25:24 UTC (rev 519) +++ MacRuby/trunk/lib/hotcocoa/mappings/alert.rb 2008-08-29 20:30:29 UTC (rev 520) @@ -1,6 +1,6 @@ HotCocoa::Mappings.map :alert => :NSAlert do - defaults :default => "OK", :alternate => nil, :other => nil, :info => nil, :show => true + defaults :default => "OK", :alternate => nil, :other => nil, :info => "", :show => true def alloc_with_options(options) if options[:message]

1 0