mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* proc.c (proc_eq): equivalence check should not done by pointer
comparison, but should be based on iseq contents. [ruby-dev:37101] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
e606e7e32b
commit
256e8b9afc
2 changed files with 11 additions and 3 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Tue Nov 18 23:02:23 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
|
* proc.c (proc_eq): equivalence check should not done by pointer
|
||||||
|
comparison, but should be based on iseq contents. [ruby-dev:37101]
|
||||||
|
|
||||||
Tue Nov 18 20:30:08 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Tue Nov 18 20:30:08 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete.
|
* lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete.
|
||||||
|
|
9
proc.c
9
proc.c
|
@ -666,12 +666,15 @@ proc_eq(VALUE self, VALUE other)
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (TYPE(other) == T_DATA &&
|
if (TYPE(other) == T_DATA &&
|
||||||
RBASIC(other)->klass == rb_cProc &&
|
RDATA(other)->dmark == proc_mark) {
|
||||||
CLASS_OF(self) == CLASS_OF(other)) {
|
|
||||||
rb_proc_t *p1, *p2;
|
rb_proc_t *p1, *p2;
|
||||||
GetProcPtr(self, p1);
|
GetProcPtr(self, p1);
|
||||||
GetProcPtr(other, p2);
|
GetProcPtr(other, p2);
|
||||||
if (p1->block.iseq == p2->block.iseq && p1->envval == p2->envval) {
|
if (p1->envval == p2->envval &&
|
||||||
|
p1->block.iseq->iseq_size == p2->block.iseq->iseq_size &&
|
||||||
|
p1->block.iseq->local_size == p2->block.iseq->local_size &&
|
||||||
|
MEMCMP(p1->block.iseq->iseq, p2->block.iseq->iseq, VALUE,
|
||||||
|
p1->block.iseq->iseq_size) == 0) {
|
||||||
return Qtrue;
|
return Qtrue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue