From 90b8654fcd3acfaab6339f3d039e12410595e3c8 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 11 Jun 2002 07:02:23 +0000 Subject: * eval.c (rb_eval): ruby_frame->last_func may be null, if it's called outside of a method. * parse.y (arg): use INT2NUM, not INT2FIX for tUMINUS. * parse.y (arg): unnecessary negative tPOW treatment. * parse.y (tokadd_escape): wrong backslash escapement. * parse.y (stmt,arg): too much void value check. * parse.y (stmt,arg): need to check void value on rules which does not use node_assign(). * ext/socket/socket.c (ipaddr): need not to taint hostnames. * range.c (range_include): should be based on "<=>", whereas member? still is based on "each". * range.c (range_min,range_max): redefine methods based on "<=>". git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 9de3d374c..b75edd115 100644 --- a/eval.c +++ b/eval.c @@ -2745,9 +2745,14 @@ rb_eval(self, n) TMP_PROTECT; if (ruby_frame->last_class == 0) { - rb_name_error(ruby_frame->last_func, - "superclass method `%s' disabled", - rb_id2name(ruby_frame->last_func)); + if (ruby_frame->last_func) { + rb_name_error(ruby_frame->last_func, + "superclass method `%s' disabled", + rb_id2name(ruby_frame->last_func)); + } + else { + rb_raise(rb_eNoMethodError, "super called outside of method"); + } } if (nd_type(node) == NODE_ZSUPER) { argc = ruby_frame->argc; -- cgit