1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* proc.c (rb_hash_proc): get wrapped pointer properly. [Bug #6048]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-02-21 07:08:21 +00:00
parent a5e49f9901
commit 2e733be0b2
2 changed files with 7 additions and 4 deletions

View file

@ -1,3 +1,7 @@
Tue Feb 21 16:08:17 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (rb_hash_proc): get wrapped pointer properly. [Bug #6048]
Tue Feb 21 14:41:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* template/ruby.pc.in: added rubylibprefix, {rubylib,vendor,site}dir

7
proc.c
View file

@ -797,7 +797,8 @@ proc_eq(VALUE self, VALUE other)
st_index_t
rb_hash_proc(st_index_t hash, VALUE prc)
{
const rb_proc_t *proc = (const rb_proc_t *)prc;
rb_proc_t *proc;
GetProcPtr(prc, proc);
hash = rb_hash_uint(hash, (st_index_t)proc->block.iseq);
hash = rb_hash_uint(hash, (st_index_t)proc->envval);
return rb_hash_uint(hash, (st_index_t)proc->block.lfp >> 16);
@ -814,10 +815,8 @@ static VALUE
proc_hash(VALUE self)
{
st_index_t hash;
rb_proc_t *proc;
GetProcPtr(self, proc);
hash = rb_hash_start(0);
hash = rb_hash_proc(hash, proc);
hash = rb_hash_proc(hash, self);
hash = rb_hash_end(hash);
return LONG2FIX(hash);
}