From d1bd418715091794dc207198a0fe4152b5f40cb1 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 24 Jun 2007 07:35:49 +0000 Subject: * proc.c (proc_to_s): used a variable before initialized. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ proc.c | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e52ed28ee..5b818b9793 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 24 16:35:46 2007 Nobuyoshi Nakada + + * proc.c (proc_to_s): used a variable before initialized. + Sun Jun 24 16:05:45 2007 Koichi Sasada * vm.c (callee_setup_arg): added. support correct post arg. diff --git a/proc.c b/proc.c index 1b7208244a..8671ce54d5 100644 --- a/proc.c +++ b/proc.c @@ -542,10 +542,11 @@ proc_to_s(VALUE self) rb_proc_t *proc; char *cname = rb_obj_classname(self); rb_iseq_t *iseq; - const char *is_lambda = proc->is_lambda ? " (lambda)" : ""; + const char *is_lambda; GetProcPtr(self, proc); iseq = proc->block.iseq; + is_lambda = proc->is_lambda ? " (lambda)" : ""; if (RUBY_VM_NORMAL_ISEQ_P(iseq)) { int line_no = 0; @@ -1164,22 +1165,21 @@ umethod_bind(VALUE method, VALUE recv) int rb_node_arity(NODE* body) { - int n; - switch (nd_type(body)) { - case NODE_CFUNC: + case NODE_CFUNC: if (body->nd_argc < 0) return -1; return body->nd_argc; - case NODE_ZSUPER: + case NODE_ZSUPER: return -1; - case NODE_ATTRSET: + case NODE_ATTRSET: return 1; - case NODE_IVAR: + case NODE_IVAR: return 0; - case NODE_BMETHOD: + case NODE_BMETHOD: return rb_proc_arity(body->nd_cval); - case RUBY_VM_METHOD_NODE:{ + case RUBY_VM_METHOD_NODE: + { rb_iseq_t *iseq; GetISeqPtr((VALUE)body->nd_body, iseq); if (iseq->arg_rest == -1 && iseq->arg_opts == 0) { @@ -1189,7 +1189,7 @@ rb_node_arity(NODE* body) return -(iseq->argc + 1 + iseq->arg_post_len); } } - default: + default: rb_raise(rb_eArgError, "invalid node 0x%x", nd_type(body)); } } -- cgit v1.2.3