* eval.c (rb_eval): Class#inherited should be called after the

  execution of the class body.

* parse.y (primary): remove "return outside of method" check at
  compile time.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 1 deletions

diff --git a/eval.c b/eval.c
index 1bfdee87fb..3439af79ce 100644
--- a/eval.c
+++ b/eval.c
@@ -3281,6 +3281,7 @@ rb_eval(self, n)
 		    if (tmp != super) {
 			goto override_class;
 		    }
+		    super = 0;
 		}
 		if (ruby_safe_level >= 4) {
 		    rb_raise(rb_eSecurityError, "extending class prohibited");
@@ -3291,7 +3292,6 @@ rb_eval(self, n)
 		if (!super) super = rb_cObject;
 		klass = rb_define_class_id(node->nd_cname, super);
 		rb_set_class_path(klass,ruby_cbase,rb_id2name(node->nd_cname));
-		rb_class_inherited(super, klass);
 		rb_const_set(ruby_cbase, node->nd_cname, klass);
 	    }
 	    if (ruby_wrapper) {
@@ -3300,6 +3300,7 @@ rb_eval(self, n)
 	    }
 
 	    result = module_setup(klass, node->nd_body);
+	    if (super) rb_class_inherited(super, klass);
 	}
 	break;