Some minor code cleanup in findMethodInstanceContainer

jruby · Jul 31, 2015 · b82e3c4 · b82e3c4
1 parent 2babe92
commit b82e3c4
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -735,13 +735,13 @@ public static RubyModule findInstanceMethodContainer(ThreadContext context, Dyna
         for (DynamicScope ds = currDynScope; ds != null; ) {
             IRScopeType scopeType = ds.getStaticScope().getScopeType();
             switch (ds.getEvalType()) {
-                // The most common use case here is where :
-                // - a method is defined inside a closure
+                // The most common use case in the MODULE_EVAL case is:
+                //   a method is defined inside a closure
                 //   that is nested inside a module_eval.
                 //   here self = the module
-                // - in the rare case where it is not (looks like it can
-                //   happen in some testing frameworks), we have to add
-                //   the method to self itself => its metaclass.
+                // In the rare case where it is not (looks like it can
+                // happen in some testing frameworks), we have to add
+                // the method to self itself => its metaclass.
                 //
                 // SSS FIXME: Looks like this rare case happens when
                 // the closure is used in a "define_method &block" scenario
@@ -769,22 +769,22 @@ public static RubyModule findInstanceMethodContainer(ThreadContext context, Dyna
                 case BINDING_EVAL : ds = ds.getParentScope(); break;
                 case NONE:
                     if (scopeType == null || scopeType.isClosureType()) {
+                        // Walk up the dynscope hierarchy
                         ds = ds.getParentScope();
                     } else if (inBindingEval) {
                         // Binding evals are special!
                         return ds.getStaticScope().getModule();
-                    } else if (scopeType == IRScopeType.CLASS_METHOD) {
-                        return (RubyModule) self;
-                    } else if (scopeType == IRScopeType.INSTANCE_METHOD) {
-                        return self.getMetaClass();
                     } else {
                         switch (scopeType) {
+                            case CLASS_METHOD:
                             case MODULE_BODY:
                             case CLASS_BODY:
-                                return (RubyModule)self;
                             case METACLASS_BODY:
                                 return (RubyModule) self;
 
+                            case INSTANCE_METHOD:
+                                return self.getMetaClass();
+
                             default:
                                 throw new RuntimeException("Should not get here! scopeType is " + scopeType);
                         }