From c223709c3b95127e7a0c0b3812ea2e89ecb8646f Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 18 Mar 2004 10:09:43 +0000 Subject: * eval.c (proc_eq): avoid false positive by using scope and dyna_vars. no longer use frame.uniq. * eval.c (proc_arity): arity is now defined as number of parameters that would not be ignored. i.e. Proc.new{}.arity returns zero. update test suites too. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5972 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 46418a5560..ab46894f70 100644 --- a/eval.c +++ b/eval.c @@ -8160,9 +8160,8 @@ proc_arity(proc) data->body->nd_cfnc == bmcall) { return method_arity(data->body->nd_tval); } - return INT2FIX(-1); + return INT2FIX(0); } - if (!(data->flags & BLOCK_LAMBDA)) return INT2FIX(-1); if (data->var == (NODE*)1) return INT2FIX(0); if (data->var == (NODE*)2) return INT2FIX(0); switch (nd_type(data->var)) { @@ -8202,7 +8201,8 @@ proc_eq(self, other) Data_Get_Struct(other, struct BLOCK, data2); if (data->body != data2->body) return Qfalse; if (data->var != data2->var) return Qfalse; - if (data->frame.uniq != data2->frame.uniq) return Qfalse; + if (data->scope != data2->scope) return Qfalse; + if (data->dyna_vars != data2->dyna_vars) return Qfalse; if (data->flags != data2->flags) return Qfalse; return Qtrue; -- cgit v1.2.3