1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* eval.c (identify_hash_new): new function to create a new identity

Browse Source 
hash.

* eval.c (rb_overlay_module, rb_mod_using, rb_mod_refine): use
  identify_hash_new().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2012-10-01 13:56:37 +00:00
parent a0f43fad5e
commit e56eb1b163
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Mon Oct 1 22:54:02 2012 Shugo Maeda <shugo@ruby-lang.org>
* eval.c (identify_hash_new): new function to create a new identity
hash.
* eval.c (rb_overlay_module, rb_mod_using, rb_mod_refine): use
identify_hash_new().
Mon Oct 1 02:34:53 2012 Akinori MUSHA <knu@iDaemons.org> Mon Oct 1 02:34:53 2012 Akinori MUSHA <knu@iDaemons.org>
* configure.in (--with-opt-dir): Make this also work on DLDFLAGS * configure.in (--with-opt-dir): Make this also work on DLDFLAGS

23
eval.c
View File

@ -1040,6 +1040,20 @@ void check_class_or_module(VALUE obj)
} }
} }
static VALUE
identity_hash_new()
{
VALUE hash = rb_hash_new();
rb_funcall(hash, rb_intern("compare_by_identity"), 0);
#if 0
/* FIXME: The following code hides hash, but causes "method `default'
* called on hidden T_HASH object" error. */
RBASIC(hash)->klass = 0;
#endif
return hash;
}
void void
rb_overlay_module(NODE *cref, VALUE klass, VALUE module) rb_overlay_module(NODE *cref, VALUE klass, VALUE module)
{ {
@ -1048,8 +1062,7 @@ rb_overlay_module(NODE *cref, VALUE klass, VALUE module)
check_class_or_module(klass); check_class_or_module(klass);
Check_Type(module, T_MODULE); Check_Type(module, T_MODULE);
if (NIL_P(cref->nd_omod)) { if (NIL_P(cref->nd_omod)) {
cref->nd_omod = rb_hash_new(); cref->nd_omod = identity_hash_new();
rb_funcall(cref->nd_omod, rb_intern("compare_by_identity"), 0);
} }
else { else {
if (cref->flags & NODE_FL_CREF_OMOD_SHARED) { if (cref->flags & NODE_FL_CREF_OMOD_SHARED) {
@ -1121,8 +1134,7 @@ rb_mod_using(VALUE self, VALUE module)
CONST_ID(id_using_modules, "__using_modules__"); CONST_ID(id_using_modules, "__using_modules__");
using_modules = rb_attr_get(self, id_using_modules); using_modules = rb_attr_get(self, id_using_modules);
if (NIL_P(using_modules)) { if (NIL_P(using_modules)) {
using_modules = rb_hash_new(); using_modules = identity_hash_new();
rb_funcall(using_modules, rb_intern("compare_by_identity"), 0);
rb_ivar_set(self, id_using_modules, using_modules); rb_ivar_set(self, id_using_modules, using_modules);
} }
rb_hash_aset(using_modules, module, Qtrue); rb_hash_aset(using_modules, module, Qtrue);
@ -1199,8 +1211,7 @@ rb_mod_refine(VALUE module, VALUE klass)
CONST_ID(id_overlaid_modules, "__overlaid_modules__"); CONST_ID(id_overlaid_modules, "__overlaid_modules__");
overlaid_modules = rb_attr_get(module, id_overlaid_modules); overlaid_modules = rb_attr_get(module, id_overlaid_modules);
if (NIL_P(overlaid_modules)) { if (NIL_P(overlaid_modules)) {
overlaid_modules = rb_hash_new(); overlaid_modules = identity_hash_new();
rb_funcall(overlaid_modules, rb_intern("compare_by_identity"), 0);
rb_ivar_set(module, id_overlaid_modules, overlaid_modules); rb_ivar_set(module, id_overlaid_modules, overlaid_modules);
} }
mod = rb_hash_aref(overlaid_modules, klass); mod = rb_hash_aref(overlaid_modules, klass);