Cleanup dispatch_super runtime helper

opal · Aug 2, 2013 · e9a8db5 · e9a8db5
1 parent 8c43aa4
commit e9a8db5
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/corelib/opal/runtime.js b/corelib/opal/runtime.js
@@ -298,20 +298,16 @@
 
   // Super dispatcher
   Opal.dispatch_super = function(obj, jsid, args, defs) {
+    var dispatcher;
+
     if (defs) {
-      if (obj._isClass) {
-        return defs._super['$' + jsid].apply(obj, args);
-      }
-      else {
-        return obj._klass._proto['$' + jsid].apply(obj, args);
-      }
-    }
-    if (obj._isClass) {
-      return obj._klass['$' + jsid].apply(obj, args);
+      dispatcher = obj._isClass ? defs._super : obj._klass._proto;
     }
     else {
-      return obj._klass._super._proto['$' + jsid].apply(obj, args);
+      dispatcher = obj._isClass ? obj._klass : obj._klass._super._proto;
     }
+
+    return dispatcher['$' + jsid].apply(obj, args);
   };
 
   // return helper