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

[3385] MacRubyWebsite/trunk/content/hotcocoa.txt
by source_changes＠macosforge.org 31 Jan '10

31 Jan '10

Revision: 3385 http://trac.macosforge.org/projects/ruby/changeset/3385 Author: lsansonetti(a)apple.com Date: 2010-01-31 15:46:27 -0800 (Sun, 31 Jan 2010) Log Message: ----------- we cannot promess that Modified Paths: -------------- MacRubyWebsite/trunk/content/hotcocoa.txt Modified: MacRubyWebsite/trunk/content/hotcocoa.txt =================================================================== --- MacRubyWebsite/trunk/content/hotcocoa.txt 2010-01-31 23:28:17 UTC (rev 3384) +++ MacRubyWebsite/trunk/content/hotcocoa.txt 2010-01-31 23:46:27 UTC (rev 3385) @@ -7,7 +7,7 @@ --- h1(title). <%= h((a)page.title) %> -HotCocoa is a thin, idiomatic Ruby layer that sits above Cocoa and other frameworks. HotCocoa will be included with MacRuby when it ships in future versions of OS X and is currently included in the MacRuby distributions. +HotCocoa is a thin, idiomatic Ruby layer that sits above Cocoa and other frameworks. HotCocoa is currently included in the MacRuby distributions. Cocoa classes have extremely large method and constant names. A substantial amount of code is written to just instantiate and configure instances of these classes. Interface Builder is used by most developers because it hides the complexity of manually configuring controls, but at the expense have having to use a GUI builder and the obscuring those configuration options inside the IB user interface. One of HotCocoa's chief goals is to allow Interface Builder simplicity, but in Ruby code. @@ -47,4 +47,4 @@ h3. Want to learn more about HotCocoa? -Now that you understand the basics of what HotCocoa is and why we are building it, please look at the "HotCocoa Tutorial":# (coming soon) for examples of how to build OS X applications with it. For a more detailed understanding of how to read, create, edit or contribute mapping files, see "HotCocoa Mappings Tutorial":/hotcocoa/mappings.html. For the current status of the project, see "HotCocoa Mapping Status":/hotcocoa/status.html. \ No newline at end of file +Now that you understand the basics of what HotCocoa is and why we are building it, please look at the "HotCocoa Tutorial":# (coming soon) for examples of how to build OS X applications with it. For a more detailed understanding of how to read, create, edit or contribute mapping files, see "HotCocoa Mappings Tutorial":/hotcocoa/mappings.html. For the current status of the project, see "HotCocoa Mapping Status":/hotcocoa/status.html.

1 0

[3384] MacRubyWebsite/trunk/content
by source_changes＠macosforge.org 31 Jan '10

31 Jan '10

Revision: 3384 http://trac.macosforge.org/projects/ruby/changeset/3384 Author: lsansonetti(a)apple.com Date: 2010-01-31 15:28:17 -0800 (Sun, 31 Jan 2010) Log Message: ----------- prepared website for 0.5 release Modified Paths: -------------- MacRubyWebsite/trunk/content/_header.txt MacRubyWebsite/trunk/content/downloads.txt MacRubyWebsite/trunk/content/index.txt MacRubyWebsite/trunk/content/source.txt Modified: MacRubyWebsite/trunk/content/_header.txt =================================================================== --- MacRubyWebsite/trunk/content/_header.txt 2010-01-31 23:24:35 UTC (rev 3383) +++ MacRubyWebsite/trunk/content/_header.txt 2010-01-31 23:28:17 UTC (rev 3384) @@ -2,8 +2,8 @@ filter: erb --- <div id="current_version"> - Current Version 0.4 + Current Version 0.5 </div> <div id="logo"> <a href="/"><img src="/images/macruby_logo.png" alt="MacRuby" id="logo" /></a> -</div> \ No newline at end of file +</div> Modified: MacRubyWebsite/trunk/content/downloads.txt =================================================================== --- MacRubyWebsite/trunk/content/downloads.txt 2010-01-31 23:24:35 UTC (rev 3383) +++ MacRubyWebsite/trunk/content/downloads.txt 2010-01-31 23:28:17 UTC (rev 3384) @@ -10,17 +10,10 @@ h2. Latest Stable Release <p> -You can download <a href="http://www.macruby.org/files/MacRuby%200.4.zip">MacRuby 0.4</a> as a standalone binary installer. -<em>Note: this release will not work on Snow Leopard or higher.</em> +You can download <a href="http://www.macruby.org/files/MacRuby%200.5.zip">MacRuby 0.5</a> as a standalone binary installer. +<em>Note: this release will only work on Intel machines running Mac OS v10.6 or higher. Users on Mac OS v10.5 can build the sources.</em> </p> -h2. Latest Beta Release - -<p> -You can download <a href="http://www.macruby.org/files/MacRuby%200.5%20beta%201.zip">MacRuby 0.5 beta 1</a> as a standalone binary installer. -<em>Note: this release is intended for testing purposes and will only work on Intel machines running on Snow Leopard or higher.</em> -</p> - h2. Nightly builds <p> Modified: MacRubyWebsite/trunk/content/index.txt =================================================================== --- MacRubyWebsite/trunk/content/index.txt 2010-01-31 23:24:35 UTC (rev 3383) +++ MacRubyWebsite/trunk/content/index.txt 2010-01-31 23:28:17 UTC (rev 3384) @@ -5,7 +5,7 @@ filter: - erb --- -<p class="callout"><strong>MacRuby</strong> is a version of Ruby 1.9, ported to run directly on top of Mac OS X core technologies such as the Objective-C common runtime and garbage collector, and the CoreFoundation framework. While still a work in progress, it is the goal of MacRuby to enable the creation of full-fledged Mac OS X applications which do not sacrifice performance in order to enjoy the benefits of using Ruby. <a href="/documentation/overview.html"><i>Read more...</i></a></p> +<p class="callout"><strong>MacRuby</strong> is a version of Ruby 1.9, ported to run directly on top of Mac OS X core technologies such as the Objective-C common runtime and garbage collector, the CoreFoundation framework and the LLVM compiler infrastructure. While still a work in progress, it is the goal of MacRuby to enable the creation of full-fledged Mac OS X applications which do not sacrifice performance in order to enjoy the benefits of using Ruby. <a href="/documentation/overview.html"><i>Read more...</i></a></p> <hr size="0" noshade class="harvardrule" /> <div id="newsbox"> @@ -28,6 +28,7 @@ <h2>HotCocoa Is For Me!</h2> <p>If you've done any amount of programming on OS X, you know that the API can be quite verbose. HotCocoa simplifies this down to very elegant and simple methods that then return super sexy UI elements. <a href="/hotcocoa.html">Read more...</a></p> <% coderay :lang => 'ruby' do -%> +require 'rubygems' require 'hotcocoa' include HotCocoa application do |app| @@ -41,4 +42,4 @@ <h2>Why MacRuby?</h2> <p>MacRuby began as an attempt to work around many problems inherent in RubyCocoa. In the course of solving these problems, MacRuby has also solved numerous problems in Ruby 1.8. Consequently, there are a number of reasons (e.g. convenience, efficiency, flexibility, performance) why one might wish to use MacRuby for new (and ongoing) Ruby applications... <a href="/documentation/why-macruby.html"><i>Read more...</i></a></p> -<hr size="0" noshade class="doublerule" /> \ No newline at end of file +<hr size="0" noshade class="doublerule" /> Modified: MacRubyWebsite/trunk/content/source.txt =================================================================== --- MacRubyWebsite/trunk/content/source.txt 2010-01-31 23:24:35 UTC (rev 3383) +++ MacRubyWebsite/trunk/content/source.txt 2010-01-31 23:28:17 UTC (rev 3384) @@ -15,7 +15,12 @@ $ svn co http://svn.macosforge.org/repository/ruby/MacRuby/trunk MacRuby-trunk </pre> +If you want to grab the sources of a specific release, look into the tags directory. For example, to grab the sources of the 0.5 release: +<pre class="commands"> +$ svn co http://svn.macosforge.org/repository/ruby/MacRuby/tags/0.5 MacRuby-0.5 +</pre> + For building instructions, please refer to README.rdoc file, but the basic build instructions are: <pre class="commands">

1 0

[3383] MacRuby/tags/0.5/
by source_changes＠macosforge.org 31 Jan '10

31 Jan '10

Revision: 3383 http://trac.macosforge.org/projects/ruby/changeset/3383 Author: lsansonetti(a)apple.com Date: 2010-01-31 15:24:35 -0800 (Sun, 31 Jan 2010) Log Message: ----------- tagging for final 0.5 release Added Paths: ----------- MacRuby/tags/0.5/

1 0

[3382] MacRuby/branches/0.5/re.c
by source_changes＠macosforge.org 31 Jan '10

31 Jan '10

Revision: 3382 http://trac.macosforge.org/projects/ruby/changeset/3382 Author: lsansonetti(a)apple.com Date: 2010-01-31 14:52:52 -0800 (Sun, 31 Jan 2010) Log Message: ----------- backported a fix from trunk Modified Paths: -------------- MacRuby/branches/0.5/re.c Modified: MacRuby/branches/0.5/re.c =================================================================== --- MacRuby/branches/0.5/re.c 2010-01-31 22:40:44 UTC (rev 3381) +++ MacRuby/branches/0.5/re.c 2010-01-31 22:52:52 UTC (rev 3382) @@ -2188,6 +2188,7 @@ return code; } +__attribute__((noinline)) static int unescape_escaped_nonascii(const char **pp, const char *end, rb_encoding *enc, VALUE buf, rb_encoding **encp, onig_errmsg_buffer err)

1 0

[3381] MacRuby/branches/0.5/vm.cpp
by source_changes＠macosforge.org 31 Jan '10

31 Jan '10

Revision: 3381 http://trac.macosforge.org/projects/ruby/changeset/3381 Author: lsansonetti(a)apple.com Date: 2010-01-31 14:40:44 -0800 (Sun, 31 Jan 2010) Log Message: ----------- backporting symbolication fixes from trunk Modified Paths: -------------- MacRuby/branches/0.5/vm.cpp Modified: MacRuby/branches/0.5/vm.cpp =================================================================== --- MacRuby/branches/0.5/vm.cpp 2010-01-31 05:57:38 UTC (rev 3380) +++ MacRuby/branches/0.5/vm.cpp 2010-01-31 22:40:44 UTC (rev 3381) @@ -569,37 +569,40 @@ *startp = start; } - if (name != NULL || path != NULL || ln != NULL) { - std::map<IMP, rb_vm_method_node_t *>::iterator iter = - ruby_imps.find((IMP)start); - if (iter == ruby_imps.end()) { - // TODO symbolize objc selectors - return false; - } - - rb_vm_method_node_t *node = iter->second; + if (f != NULL) { if (ln != NULL) { *ln = 0; - if (f != NULL) { - for (std::vector<RoxorFunction::Line>::iterator iter = - f->lines.begin(); iter != f->lines.end(); ++iter) { - if ((*iter).address == (uintptr_t)addr) { - *ln = (*iter).line; - break; - } + for (std::vector<RoxorFunction::Line>::iterator iter = + f->lines.begin(); iter != f->lines.end(); ++iter) { + *ln = (*iter).line; + if ((*iter).address <= (uintptr_t)addr) { + break; } } } if (path != NULL) { - if (f != NULL && f->file.size() > 0) { - strncpy(path, f->file.c_str(), path_len); + strncpy(path, f->file.c_str(), path_len); + } + if (name != NULL) { + std::map<IMP, rb_vm_method_node_t *>::iterator iter = + ruby_imps.find((IMP)start); + if (iter == ruby_imps.end()) { + strncpy(name, "block", name_len); } else { - strncpy(path, "core", path_len); + strncpy(name, sel_getName(iter->second->sel), name_len); } } + } + else { + if (ln != NULL) { + *ln = 0; + } + if (path != NULL) { + strncpy(path, "core", path_len); + } if (name != NULL) { - strncpy(name, sel_getName(node->sel), name_len); + name[0] = '\0'; } } @@ -3531,8 +3534,11 @@ char name[100]; unsigned long ln = 0; + path[0] = name[0] = '\0'; + if (GET_CORE()->symbolize_call_address(callstack[i], NULL, - path, sizeof path, &ln, name, sizeof name)) { + path, sizeof path, &ln, name, sizeof name) + && path[0] != '\0' && name[0] != '\0') { char entry[PATH_MAX]; if (ln == 0) { snprintf(entry, sizeof entry, "%s:in `%s'",

1 0

[3380] MacRuby/trunk/HACKING.rdoc
by source_changes＠macosforge.org 31 Jan '10

31 Jan '10

Revision: 3380 http://trac.macosforge.org/projects/ruby/changeset/3380 Author: lsansonetti(a)apple.com Date: 2010-01-30 21:57:38 -0800 (Sat, 30 Jan 2010) Log Message: ----------- mention rb_symbolicate Modified Paths: -------------- MacRuby/trunk/HACKING.rdoc Modified: MacRuby/trunk/HACKING.rdoc =================================================================== --- MacRuby/trunk/HACKING.rdoc 2010-01-31 03:33:31 UTC (rev 3379) +++ MacRuby/trunk/HACKING.rdoc 2010-01-31 05:57:38 UTC (rev 3380) @@ -132,4 +132,7 @@ (gdb) p (char *)RoxorVM::current->debug_exceptions() * To determine if a given object is thread-local: - (gdb) p (int)gdb_is_local(<address>); + (gdb) p (int)gdb_is_local(<address>) + +* To symbolize a Ruby address (named as ??) in the backtrace: + (gdb) p (void)rb_symbolicate(<address>)

1 0

[3379] MacRuby/trunk/ext/zlib/zlib.c
by source_changes＠macosforge.org 31 Jan '10

31 Jan '10

Revision: 3379 http://trac.macosforge.org/projects/ruby/changeset/3379 Author: lsansonetti(a)apple.com Date: 2010-01-30 19:33:31 -0800 (Sat, 30 Jan 2010) Log Message: ----------- fixed rb_rescue() call Modified Paths: -------------- MacRuby/trunk/ext/zlib/zlib.c Modified: MacRuby/trunk/ext/zlib/zlib.c =================================================================== --- MacRuby/trunk/ext/zlib/zlib.c 2010-01-31 03:20:35 UTC (rev 3378) +++ MacRuby/trunk/ext/zlib/zlib.c 2010-01-31 03:33:31 UTC (rev 3379) @@ -111,7 +111,7 @@ static void gzfile_close _((struct gzfile*, int)); static void gzfile_write_raw _((struct gzfile*)); static VALUE gzfile_read_raw_partial _((VALUE)); -static VALUE gzfile_read_raw_rescue _((VALUE)); +static VALUE gzfile_read_raw_rescue _((VALUE, VALUE)); static VALUE gzfile_read_raw _((struct gzfile*)); static int gzfile_read_raw_ensure _((struct gzfile*, int)); static char *gzfile_read_raw_until_zero _((struct gzfile*, long)); @@ -1703,14 +1703,12 @@ return str; } -VALUE rb_vm_current_exception(void); - static VALUE -gzfile_read_raw_rescue(VALUE arg) +gzfile_read_raw_rescue(VALUE arg, VALUE exc) { struct gzfile *gz = (struct gzfile*)arg; VALUE str = Qnil; - if (rb_obj_is_kind_of(rb_vm_current_exception(), rb_eNoMethodError)) { + if (rb_obj_is_kind_of(exc, rb_eNoMethodError)) { str = rb_funcall(gz->io, id_read, 1, INT2FIX(GZFILE_READ_SIZE)); if (!NIL_P(str)) { Check_Type(str, T_STRING);

1 0

[3378] MacRuby/trunk
by source_changes＠macosforge.org 31 Jan '10

31 Jan '10

Revision: 3378 http://trac.macosforge.org/projects/ruby/changeset/3378 Author: lsansonetti(a)apple.com Date: 2010-01-30 19:20:35 -0800 (Sat, 30 Jan 2010) Log Message: ----------- introduce RubyObject, a hidden class used as the basic class of all ruby-created classes Modified Paths: -------------- MacRuby/trunk/class.c MacRuby/trunk/object.c Modified: MacRuby/trunk/class.c =================================================================== --- MacRuby/trunk/class.c 2010-01-31 03:18:54 UTC (rev 3377) +++ MacRuby/trunk/class.c 2010-01-31 03:20:35 UTC (rev 3378) @@ -117,6 +117,16 @@ return rcv; } +static VALUE +rb_obj_superclass(VALUE klass, SEL sel) +{ + VALUE cl = RCLASS_SUPER(klass); + while (RCLASS_SINGLETON(cl)) { + cl = RCLASS_SUPER(cl); + } + return rb_class_real(cl); +} + void rb_define_object_special_methods(VALUE klass) { @@ -125,8 +135,6 @@ 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); rb_objc_define_private_method(klass, "initialize", rb_objc_init, 0); rb_objc_define_private_method(klass, "initialize_copy", @@ -134,6 +142,7 @@ rb_objc_define_method(klass, "hash", rb_obj_id, 0); // To make sure singleton classes will be filtered. + rb_objc_define_method(*(VALUE *)klass, "superclass", rb_obj_superclass, 0); rb_objc_define_method(klass, "class", rb_obj_class, 0); rb_objc_install_method(*(Class *)klass, selAllocWithZone, @@ -153,6 +162,8 @@ (IMP)rb_obj_imp_copyWithZone, method_getTypeEncoding(m)); } +extern VALUE rb_cRubyObject; + static VALUE rb_objc_alloc_class(const char *name, VALUE super, VALUE flags, VALUE klass) { @@ -246,11 +257,10 @@ static VALUE rb_class_boot2(VALUE super, const char *name) { - VALUE klass = rb_objc_create_class(name, super); - if (super == rb_cNSObject) { - rb_define_object_special_methods(klass); - } - return klass; + if (super == rb_cObject && rb_cRubyObject != 0) { + super = rb_cRubyObject; + } + return rb_objc_create_class(name, super); } VALUE @@ -435,7 +445,6 @@ } RBASIC(obj)->klass = klass; rb_singleton_class_attached(klass, obj); - return klass; } } Modified: MacRuby/trunk/object.c =================================================================== --- MacRuby/trunk/object.c 2010-01-31 03:18:54 UTC (rev 3377) +++ MacRuby/trunk/object.c 2010-01-31 03:20:35 UTC (rev 3378) @@ -26,6 +26,7 @@ VALUE rb_mKernel; VALUE rb_cNSObject; VALUE rb_cObject; +VALUE rb_cRubyObject; VALUE rb_cModule; VALUE rb_cClass; VALUE rb_cData; @@ -1874,15 +1875,16 @@ rb_scan_args(argc, argv, "01", &super); rb_check_inheritable(super); } + if (super == rb_cObject) { + super = rb_cRubyObject; + } RCLASS_SET_SUPER(klass, super); - if ((RCLASS_VERSION(super) & RCLASS_IS_OBJECT_SUBCLASS) != RCLASS_IS_OBJECT_SUBCLASS) { + if ((RCLASS_VERSION(super) & RCLASS_IS_OBJECT_SUBCLASS) + != RCLASS_IS_OBJECT_SUBCLASS) { long v = RCLASS_VERSION(klass) ^ RCLASS_IS_OBJECT_SUBCLASS; RCLASS_SET_VERSION(klass, v); } rb_objc_install_primitives((Class)klass, (Class)super); - if (super == rb_cObject) { - rb_define_object_special_methods(klass); - } rb_class_inherited(super, klass); rb_mod_initialize(klass, 0); @@ -2927,13 +2929,18 @@ rb_cObject = rb_cNSObject = (VALUE)objc_getClass("NSObject"); rb_const_set(rb_cObject, rb_intern("Object"), rb_cNSObject); rb_set_class_path(rb_cObject, rb_cObject, "NSObject"); - rb_cBasicObject = (VALUE)objc_duplicateClass((Class)rb_cObject, "BasicObject", 0); + rb_cBasicObject = (VALUE)objc_duplicateClass((Class)rb_cObject, + "BasicObject", 0); rb_const_set(rb_cObject, rb_intern("BasicObject"), rb_cBasicObject); rb_cModule = boot_defclass("Module", rb_cNSObject); RCLASS_SET_VERSION_FLAG(rb_cModule, RCLASS_NO_IV_SLOTS); rb_define_object_special_methods(rb_cModule); rb_cClass = boot_defclass("Class", rb_cModule); RCLASS_SET_VERSION_FLAG(rb_cClass, RCLASS_NO_IV_SLOTS); + rb_cRubyObject = boot_defclass("RubyObject", rb_cObject); + RCLASS_SET_VERSION_FLAG(rb_cRubyObject, RCLASS_IS_SINGLETON); + RCLASS_SET_VERSION_FLAG(rb_cRubyObject, RCLASS_IS_OBJECT_SUBCLASS); + rb_define_object_special_methods(rb_cRubyObject); allocCache = rb_vm_get_call_cache(selAlloc); initializeCache = rb_vm_get_call_cache(selInitialize);

1 0

[3377] MacRuby/trunk/spec/frozen/language/def_spec.rb
by source_changes＠macosforge.org 31 Jan '10

31 Jan '10

Revision: 3377 http://trac.macosforge.org/projects/ruby/changeset/3377 Author: lsansonetti(a)apple.com Date: 2010-01-30 19:18:54 -0800 (Sat, 30 Jan 2010) Log Message: ----------- let's define initialize_copy correctly Modified Paths: -------------- MacRuby/trunk/spec/frozen/language/def_spec.rb Modified: MacRuby/trunk/spec/frozen/language/def_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/language/def_spec.rb 2010-01-31 03:18:30 UTC (rev 3376) +++ MacRuby/trunk/spec/frozen/language/def_spec.rb 2010-01-31 03:18:54 UTC (rev 3377) @@ -24,7 +24,7 @@ describe "Defining an 'initialize_copy' method" do it "should make it private" do class DefInitializeCopySpec - def initialize_copy + def initialize_copy(obj) end end DefInitializeCopySpec.should have_private_instance_method(:initialize_copy, false)

1 0

[3376] MacRuby/trunk/variable.c
by source_changes＠macosforge.org 31 Jan '10

31 Jan '10

Revision: 3376 http://trac.macosforge.org/projects/ruby/changeset/3376 Author: lsansonetti(a)apple.com Date: 2010-01-30 19:18:30 -0800 (Sat, 30 Jan 2010) Log Message: ----------- changed generic/native/class ivars to use GC associative references and keep the global hash for immediates Modified Paths: -------------- MacRuby/trunk/variable.c Modified: MacRuby/trunk/variable.c =================================================================== --- MacRuby/trunk/variable.c 2010-01-30 04:33:25 UTC (rev 3375) +++ MacRuby/trunk/variable.c 2010-01-31 03:18:30 UTC (rev 3376) @@ -840,24 +840,65 @@ entry1->var = entry2->var; } -// TODO: should use an associative reference instead. static CFMutableDictionaryRef generic_iv_dict = NULL; -static VALUE -generic_ivar_get(VALUE obj, ID id, bool warn, bool undef) +static CFMutableDictionaryRef +generic_ivar_dict(VALUE obj, bool create) { - if (generic_iv_dict != NULL) { - CFDictionaryRef obj_dict; + CFMutableDictionaryRef obj_dict = NULL; + if (SPECIAL_CONST_P(obj)) { + if (generic_iv_dict == NULL) { + generic_iv_dict = CFDictionaryCreateMutable(NULL, 0, NULL, + &kCFTypeDictionaryValueCallBacks); + } + if (!CFDictionaryGetValueIfPresent(generic_iv_dict, + (const void *)obj, (const void **)&obj_dict) && create) { + obj_dict = CFDictionaryCreateMutable(NULL, 0, NULL, + &rb_cfdictionary_value_cb); + CFMakeCollectable(obj_dict); + CFDictionarySetValue(generic_iv_dict, (const void *)obj, + (const void *)obj_dict); + } + } + else { + obj_dict = rb_objc_get_associative_ref((void *)obj, &generic_iv_dict); + if (obj_dict == NULL && create) { + obj_dict = CFDictionaryCreateMutable(NULL, 0, NULL, + &rb_cfdictionary_value_cb); + CFMakeCollectable(obj_dict); + rb_objc_set_associative_ref((void *)obj, &generic_iv_dict, + (void *)obj_dict); + } + } + return obj_dict; +} - if (CFDictionaryGetValueIfPresent(generic_iv_dict, - (const void *)obj, (const void **)&obj_dict) - && obj_dict != NULL) { +static void +generic_ivar_dict_set(VALUE obj, CFMutableDictionaryRef obj_dict) +{ + if (SPECIAL_CONST_P(obj)) { + if (generic_iv_dict == NULL) { + generic_iv_dict = CFDictionaryCreateMutable(NULL, 0, NULL, + &kCFTypeDictionaryValueCallBacks); + } + CFDictionarySetValue(generic_iv_dict, (const void *)obj, + (const void *)obj_dict); + } + else { + rb_objc_set_associative_ref((void *)obj, &generic_iv_dict, + (void *)obj_dict); + } +} - VALUE val; - if (CFDictionaryGetValueIfPresent(obj_dict, (const void *)id, - (const void **)&val)) { - return val; - } +static VALUE +generic_ivar_get(VALUE obj, ID id, bool warn, bool undef) +{ + CFDictionaryRef obj_dict = generic_ivar_dict(obj, false); + if (obj_dict != NULL) { + VALUE val; + if (CFDictionaryGetValueIfPresent(obj_dict, (const void *)id, + (const void **)&val)) { + return val; } } if (warn) { @@ -869,105 +910,53 @@ static void generic_ivar_set(VALUE obj, ID id, VALUE val) { - CFMutableDictionaryRef obj_dict; - if (rb_special_const_p(obj)) { - if (rb_obj_frozen_p(obj)) + if (rb_obj_frozen_p(obj)) { rb_error_frozen("object"); + } } - if (generic_iv_dict == NULL) { - generic_iv_dict = CFDictionaryCreateMutable(NULL, 0, NULL, - &rb_cfdictionary_value_cb); - rb_objc_retain(generic_iv_dict); - obj_dict = NULL; - } - else { - obj_dict = (CFMutableDictionaryRef)CFDictionaryGetValue( - (CFDictionaryRef)generic_iv_dict, (const void *)obj); - } - if (obj_dict == NULL) { - obj_dict = CFDictionaryCreateMutable(NULL, 0, NULL, - &rb_cfdictionary_value_cb); - CFDictionarySetValue(generic_iv_dict, (const void *)obj, - (const void *)obj_dict); - CFMakeCollectable(obj_dict); - } + CFMutableDictionaryRef obj_dict = generic_ivar_dict(obj, true); +//printf("generic_ivar_set %p %ld %p dict %p\n", (void*)obj,id,(void*)val,obj_dict); CFDictionarySetValue(obj_dict, (const void *)id, (const void *)val); } static VALUE generic_ivar_defined(VALUE obj, ID id) { - CFMutableDictionaryRef obj_dict; - - if (generic_iv_dict != NULL - && CFDictionaryGetValueIfPresent((CFDictionaryRef)generic_iv_dict, - (const void *)obj, (const void **)&obj_dict) - && obj_dict != NULL) { - if (CFDictionaryGetValueIfPresent(obj_dict, (const void *)id, NULL)) { + CFDictionaryRef obj_dict = generic_ivar_dict(obj, false); + if (obj_dict != NULL) { + if (CFDictionaryGetValueIfPresent(obj_dict, (const void *)id, NULL)) { return Qtrue; } } return Qfalse; } -static int +static bool generic_ivar_remove(VALUE obj, ID id, VALUE *valp) { - CFMutableDictionaryRef obj_dict; - VALUE val; - - if (generic_iv_dict == NULL) - return 0; - - obj_dict = (CFMutableDictionaryRef)CFDictionaryGetValue( - (CFDictionaryRef)generic_iv_dict, (const void *)obj); - if (obj_dict == NULL) - return 0; - - if (CFDictionaryGetValueIfPresent(obj_dict, (const void *)id, - (const void **)&val)) { - *valp = val; - CFDictionaryRemoveValue(obj_dict, (const void *)id); - return 1; + CFMutableDictionaryRef obj_dict = generic_ivar_dict(obj, false); + if (obj_dict != NULL) { + VALUE val; + if (CFDictionaryGetValueIfPresent(obj_dict, (const void *)id, + (const void **)&val)) { + *valp = val; + CFDictionaryRemoveValue(obj_dict, (const void *)id); + return true; + } } - - return 0; + return false; } void -rb_free_generic_ivar(VALUE obj) +rb_copy_generic_ivar(VALUE clone, VALUE obj) { - if (generic_iv_dict != NULL) { - CFDictionaryRemoveValue(generic_iv_dict, (const void *)obj); + CFMutableDictionaryRef obj_dict = generic_ivar_dict(obj, false); + if (obj_dict != NULL) { + generic_ivar_dict_set(clone, obj_dict); } } -void -rb_copy_generic_ivar(VALUE clone, VALUE obj) -{ - CFMutableDictionaryRef obj_dict; - CFMutableDictionaryRef clone_dict; - - if (generic_iv_dict == NULL) - return; - - obj_dict = (CFMutableDictionaryRef)CFDictionaryGetValue( - (CFDictionaryRef)generic_iv_dict, (const void *)obj); - if (obj_dict == NULL) - return; - - if (CFDictionaryGetValueIfPresent((CFDictionaryRef)generic_iv_dict, - (const void *)clone, (const void **)&clone_dict) - && clone_dict != NULL) - CFDictionaryRemoveValue(generic_iv_dict, (const void *)clone); - - clone_dict = CFDictionaryCreateMutableCopy(NULL, 0, obj_dict); - CFDictionarySetValue(generic_iv_dict, (const void *)clone, - (const void *)clone_dict); - CFMakeCollectable(clone_dict); -} - static inline bool rb_class_has_ivar_dict(VALUE mod) { @@ -983,19 +972,10 @@ CFMutableDictionaryRef rb_class_ivar_dict(VALUE mod) { - CFMutableDictionaryRef dict; - if (rb_class_has_ivar_dict(mod)) { - dict = RCLASS_RUBY_IVAR_DICT(mod); + return RCLASS_RUBY_IVAR_DICT(mod); } - else { - dict = NULL; - if (generic_iv_dict != NULL) { - CFDictionaryGetValueIfPresent(generic_iv_dict, - (const void *)mod, (const void **)&dict); - } - } - return dict; + return generic_ivar_dict(mod, false); } void @@ -1005,18 +985,14 @@ CFMutableDictionaryRef old_dict = RCLASS_RUBY_IVAR_DICT(mod); if (old_dict != dict) { if (old_dict != NULL) { - CFRelease(old_dict); + GC_RELEASE(old_dict); } - CFRetain(dict); + GC_RETAIN(dict); RCLASS_RUBY_IVAR_DICT(mod) = dict; } } else { - if (generic_iv_dict == NULL) { - generic_iv_dict = CFDictionaryCreateMutable(NULL, 0, NULL, &rb_cfdictionary_value_cb); - rb_objc_retain(generic_iv_dict); - } - CFDictionarySetValue(generic_iv_dict, (const void *)mod, (const void *)dict); + generic_ivar_dict_set(mod, dict); } } @@ -1193,8 +1169,6 @@ } case T_NATIVE: - return generic_ivar_defined(obj, id); - default: return generic_ivar_defined(obj, id); } @@ -1224,19 +1198,15 @@ return; case T_NATIVE: - goto generic; + default: + { + CFDictionaryRef obj_dict = generic_ivar_dict(obj, false); + if (obj_dict != NULL) { + CFDictionaryApplyFunction(obj_dict, (CFDictionaryApplierFunction)func, + (void *)arg); + } + } } -generic: - if (generic_iv_dict != NULL) { - CFDictionaryRef obj_dict; - - obj_dict = (CFDictionaryRef)CFDictionaryGetValue( - (CFDictionaryRef)generic_iv_dict, (const void *)obj); - if (obj_dict != NULL) { - CFDictionaryApplyFunction(obj_dict, - (CFDictionaryApplierFunction)func, (void *)arg); - } - } } static int

1 0