From 17a476edaaf81f72e6b1c9d5903ddeb48dcd1e74 Mon Sep 17 00:00:00 2001
From: Nicolas Petton <nicolas@petton.fr>
Date: Wed, 26 Apr 2017 15:05:29 +0200
Subject: [PATCH] Optimize supercall installation

Do not lookup on which methods we need to install supercalls each time an
instance is created.

Instead, we cache in a non-enumerable variable `methodsWithSuperCall` on each
class all method names that need supercall installation.
---
 dist/klassified.js     | 48 ++++++++++++++++++++++++++++++++----------
 dist/klassified.min.js |  2 +-
 src/object.js          | 48 ++++++++++++++++++++++++++++++++----------
 3 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/dist/klassified.js b/dist/klassified.js
index 35c41da..df55f3d 100644
--- a/dist/klassified.js
+++ b/dist/klassified.js
@@ -628,9 +628,10 @@ define('object',[], function() {
 			});
 
 			builder(instance, my);
+
 			if (superCallRegex.test(builder)) {
-				installSuper(instance, superInstance);
-				installSuper(my, superMy);
+				installSuper(my, superMy, klass, "my");
+				installSuper(instance, superInstance, klass, "that");
 			}
 
 			if (!notFinal) {
@@ -704,15 +705,12 @@ define('object',[], function() {
 	 * `super` from within each public function of `obj` to the function in
 	 * `proto`.
 	 */
-	function installSuper(obj, proto) {
-		Object.keys(obj).forEach(function(name) {
-			if (typeof proto[name] === "function" &&
-				typeof obj[name] === "function" &&
-				superCallRegex.test(obj[name]) &&
-				!obj[name].superInstalled) {
-				var superFn = proto[name];
-				obj[name] = (function(name, fn) {
+	function installSuper(obj, proto, klass, receiverName) {
+		methodsWithSuperCall(obj, proto, klass, receiverName).forEach(function(name) {
+			if (!obj[name].superInstalled) {
+				obj[name] = (function(obj, fn, superFn) {
 					return function() {
+
 						var tmp = obj.super;
 						obj.super = superFn;
 						var returnValue = fn.apply(obj, arguments);
@@ -726,12 +724,40 @@ define('object',[], function() {
 
 						return returnValue;
 					};
-				})(name, obj[name]);
+				})(obj, obj[name], proto[name]);
 				obj[name].superInstalled = true;
 			}
 		});
 	}
 
+	/**
+	 * Return the list of methods in `obj` that perform a supercall to `proto`.
+	 * The list is cached in `klass`.
+	 *
+	 * `receiverName` is either "that" or "my".
+	 */
+	function methodsWithSuperCall(obj, proto, klass, receiverName) {
+		if (!klass.methodsWithSuperCall) {
+			Object.defineProperty(klass, "methodsWithSuperCall", {
+				enumerable: false,
+				writable: true,
+				value: {}
+			});
+		}
+
+		if (klass.methodsWithSuperCall[receiverName]) {
+			return klass.methodsWithSuperCall[receiverName];
+		}
+
+		klass.methodsWithSuperCall[receiverName] = Object.keys(obj).filter(function(name) {
+			return typeof(proto[name]) === "function" &&
+				typeof(obj[name]) === "function" &&
+				superCallRegex.test(obj[name]);
+		});
+
+		return klass.methodsWithSuperCall[receiverName];
+	}
+
 	/**
 	 * Extend the class with new methods/properties.
 	 * @param{function} builder takes the same arguments as
diff --git a/dist/klassified.min.js b/dist/klassified.min.js
index 0f5c1d3..3bfe83a 100644
--- a/dist/klassified.min.js
+++ b/dist/klassified.min.js
@@ -3,4 +3,4 @@
  * Released under MIT license, http://github.com/requirejs/almond/LICENSE
  */
 
-!function(e,n){"function"==typeof define&&define.amd?define(n):e.klassified=n(e.$)}(this,function(e){var n,t,s;return function(e){function r(e,n){return C.call(e,n)}function i(e,n){var t,s,r,i,c,o,u,a,f,l,p,b,h=n&&n.split("/"),d=m.map,g=d&&d["*"]||{};if(e){for(e=e.split("/"),c=e.length-1,m.nodeIdCompat&&A.test(e[c])&&(e[c]=e[c].replace(A,"")),"."===e[0].charAt(0)&&h&&(b=h.slice(0,h.length-1),e=b.concat(e)),f=0;f<e.length;f++)if(p=e[f],"."===p)e.splice(f,1),f-=1;else if(".."===p){if(0===f||1===f&&".."===e[2]||".."===e[f-1])continue;f>0&&(e.splice(f-1,2),f-=2)}e=e.join("/")}if((h||g)&&d){for(t=e.split("/"),f=t.length;f>0;f-=1){if(s=t.slice(0,f).join("/"),h)for(l=h.length;l>0;l-=1)if(r=d[h.slice(0,l).join("/")],r&&(r=r[s])){i=r,o=f;break}if(i)break;!u&&g&&g[s]&&(u=g[s],a=f)}!i&&u&&(i=u,o=a),i&&(t.splice(0,o,i),e=t.join("/"))}return e}function c(n,t){return function(){var s=j.call(arguments,0);return"string"!=typeof s[0]&&1===s.length&&s.push(null),h.apply(e,s.concat([n,t]))}}function o(e){return function(n){return i(n,e)}}function u(e){return function(n){E[e]=n}}function a(n){if(r(v,n)){var t=v[n];delete v[n],y[n]=!0,b.apply(e,t)}if(!r(E,n)&&!r(y,n))throw new Error("No "+n);return E[n]}function f(e){var n,t=e?e.indexOf("!"):-1;return t>-1&&(n=e.substring(0,t),e=e.substring(t+1,e.length)),[n,e]}function l(e){return e?f(e):[]}function p(e){return function(){return m&&m.config&&m.config[e]||{}}}var b,h,d,g,E={},v={},m={},y={},C=Object.prototype.hasOwnProperty,j=[].slice,A=/\.js$/;d=function(e,n){var t,s=f(e),r=s[0],c=n[1];return e=s[1],r&&(r=i(r,c),t=a(r)),r?e=t&&t.normalize?t.normalize(e,o(c)):i(e,c):(e=i(e,c),s=f(e),r=s[0],e=s[1],r&&(t=a(r))),{f:r?r+"!"+e:e,n:e,pr:r,p:t}},g={require:function(e){return c(e)},exports:function(e){var n=E[e];return"undefined"!=typeof n?n:E[e]={}},module:function(e){return{id:e,uri:"",exports:E[e],config:p(e)}}},b=function(n,t,s,i){var o,f,p,b,h,m,C,j=[],A=typeof s;if(i=i||n,m=l(i),"undefined"===A||"function"===A){for(t=!t.length&&s.length?["require","exports","module"]:t,h=0;h<t.length;h+=1)if(b=d(t[h],m),f=b.f,"require"===f)j[h]=g.require(n);else if("exports"===f)j[h]=g.exports(n),C=!0;else if("module"===f)o=j[h]=g.module(n);else if(r(E,f)||r(v,f)||r(y,f))j[h]=a(f);else{if(!b.p)throw new Error(n+" missing "+f);b.p.load(b.n,c(i,!0),u(f),{}),j[h]=E[f]}p=s?s.apply(E[n],j):void 0,n&&(o&&o.exports!==e&&o.exports!==E[n]?E[n]=o.exports:p===e&&C||(E[n]=p))}else n&&(E[n]=s)},n=t=h=function(n,t,s,r,i){if("string"==typeof n)return g[n]?g[n](t):a(d(n,l(t)).f);if(!n.splice){if(m=n,m.deps&&h(m.deps,m.callback),!t)return;t.splice?(n=t,t=s,s=null):n=e}return t=t||function(){},"function"==typeof s&&(s=r,r=i),r?b(e,n,t,s):setTimeout(function(){b(e,n,t,s)},4),h},h.config=function(e){return h(e)},n._defined=E,s=function(e,n,t){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");n.splice||(t=n,n=[]),r(E,e)||r(v,e)||(v[e]=[e,n,t])},s.amd={jQuery:!0}}(),s("object",[],function(){function e(n,t){n=n||{},t=t||{};var s={};return s.getClass=function(){return e},t.preInitialize=function(){},t.initialize=function(){},t.postInitialize=function(){},t.subclassResponsibility=i,t.get=function(e,n){n||(n=function(){return t[e]}),s["get"+r(e)]=n},t.set=function(e,n){n||(n=function(n){return t[e]=n,n}),s["set"+r(e)]=n},s.getClass().extensions.forEach(function(e){e(s,t)}),s}function n(e,n){Object.keys(e).forEach(function(t){if("function"==typeof n[t]&&"function"==typeof e[t]&&c.test(e[t])&&!e[t].superInstalled){var s=n[t];e[t]=function(n,t){return function(){var n=e.super;e.super=s;var r=t.apply(e,arguments);return e.super=n,void 0===e.super&&delete e.super,r}}(t,e[t]),e[t].superInstalled=!0}})}function t(e){throw new Error("Cannot instantiate an abstract class")}function s(e){throw new Error("Cannot create new instances of a singleton class, use `instance` instead.")}function r(e){return e[0].toUpperCase()+e.slice(1)}function i(){throw new Error("Subclass responsibility")}e.subclasses=[],e.allSubclasses=function(){var e=this.subclasses.slice();return this.subclasses.forEach(function(n){n.allSubclasses().forEach(function(n){e.push(n)})}),e},e.allConcreteSubclasses=function(){var e=this.subclasses.filter(function(e){return!e.isAbstract});return this.subclasses.forEach(function(n){n.allConcreteSubclasses().forEach(function(n){e.push(n)})}),e},e.subclassResponsibility=i,e.extensions=[];var c=/\bsuper\b/;return e.subclass=function(e){function r(o,u,a){o=o||{},u=u||{},r.isAbstract&&!a&&t(i),r.isSingleton&&!a&&s(i);var f=i(o,u,!0);f.getClass=function(){return r};var l=Object.assign({},f),p=Object.assign({},u);return r.extensions.forEach(function(e){e(f,u)}),e(f,u),c.test(e)&&(n(f,l),n(u,p)),a||(u.preInitialize(o),u.initialize(o),u.postInitialize(o)),f}var i=this;return r.superclass=i,r.subclasses=[],i.subclasses.push(r),r.classBuilder=i.classBuilder,r.classBuilder(r),r},e.singletonSubclass=function(e){var n=this.subclass(e),t=n();return n.isSingleton=!0,n.instance=function(){return t},n},e.abstractSubclass=function(e){var n=this.subclass(e);return n.isAbstract=!0,n},e.class=function(n){var t=this;if(t===e)throw new Error("object class should not be extended.");var s=t.classBuilder;t.classBuilder=function(e){s(e),n(e)},t.classBuilder(t)},e.classBuilder=function(n){n.class=e.class,n.subclass=e.subclass,n.singletonSubclass=e.singletonSubclass,n.abstractSubclass=e.abstractSubclass,n.allSubclasses=e.allSubclasses,n.allConcreteSubclasses=e.allConcreteSubclasses,n.subclassResponsibility=i,n.extend=e.extend,n.extensions=[]},e.extend=function(e){this.extensions.push(e)},"function"!=typeof Object.assign&&!function(){Object.assign=function(e){if(void 0===e||null===e)throw new TypeError("Cannot convert undefined or null to object");for(var n=Object(e),t=1;t<arguments.length;t++){var s=arguments[t];if(void 0!==s&&null!==s)for(var r in s)s.hasOwnProperty(r)&&(n[r]=s[r])}return n}}(),e}),s("testCase",["./object"],function(e){var n=e.abstractSubclass(function(e,n){function t(e,t){n.force()?fdescribe(e,function(){t()}):describe(e,function(){t()})}n.initialize=function(e){n.super(e);var s=n.registeredTests();t(n.name(),function(){beforeEach(n.beforeEach),afterEach(n.afterEach),beforeAll(n.beforeAll),afterAll(n.afterAll),s.forEach(function(e){it(e.name,e.fn)})})},n.force=function(){return!1},n.beforeEach=function(){},n.beforeAll=function(){},n.afterEach=function(){},n.afterAll=function(){},n.name=function(){return n.subclassResponsibility()},n.expect=expect,n.spyOn=spyOn,n.registeredTests=function(){var e=[],t=/Test$/;return Object.keys(n).forEach(function(s){"function"==typeof n[s]&&t.test(s)&&e.push({name:n.buildTestName(s),fn:n[s]})}),e},n.buildTestName=function(e){e=e.slice(0,-4);var n=/([A-Z][^A-Z]*)/g;return e=e.replace(n," $1"),e=e.toLowerCase()}});return n.class(function(e){e.isTestCase=function(){return!0},e.subclass=function(n){return function(t,s){var r=n.apply(e,[t]);if(s&&s.isAbstract)return r;var i=r();return r.isSingleton=!0,r.instance=function(){return i},r}}(e.subclass),e.abstractSubclass=function(e){return function(e){var n=this.subclass(e,{isAbstract:!0});return n.isAbstract=!0,n}}(e.abstractSubclass)}),n}),s("propertiesEventEmitter",["./object"],function(e){return e.subclass(function(e,n){n.initialize=function(e){n.super(e),n.instance=e.instance,n.accessListeners={},n.changeListeners={}},e.onAccess=function(e,t){n.accessListeners[e]||(n.accessListeners[e]=[]),n.accessListeners[e].indexOf(t)===-1&&n.accessListeners[e].push(t)},e.onChange=function(e,t){n.changeListeners[e]||(n.changeListeners[e]=[]),n.changeListeners[e].indexOf(t)===-1&&n.changeListeners[e].push(t)},e.emitAccess=function(e){n.accessListeners[e]&&n.accessListeners[e].forEach(function(t){t(n.instance,e)})},e.emitChange=function(e,t){n.changeListeners[e]&&n.changeListeners[e].forEach(function(s){s(n.instance,e,t)})}})}),s("globalPropertyEventEmitter",["./object"],function(e){return e.singletonSubclass(function(e,n){n.initialize=function(e){n.super(e),n.accessListeners=[],n.changeListeners=[]},e.onAccess=function(e){n.accessListeners.push(e)},e.onChange=function(e){n.changeListeners.push(e)},e.emitAccess=function(e,t){n.accessListeners.forEach(function(n){n(e,t)})},e.emitChange=function(e,t,s){n.changeListeners.forEach(function(n){n(e,t,s)})}})}),s("property",["./object","./propertiesEventEmitter","./globalPropertyEventEmitter"],function(e,n,t){e.extend(function(e,s){function r(n){var r=s.ensurePropertiesEventEmitter();r.emitAccess(n),t.instance().emitAccess(e,n)}function i(n,r){var i=s.ensurePropertiesEventEmitter();i.emitChange(n,r),t.instance().emitChange(e,n,r)}e.onPropertyAccess=function(e,n){var t=s.ensurePropertiesEventEmitter();t.onAccess(e,n)},e.onPropertyChange=function(e,n){var t=s.ensurePropertiesEventEmitter();t.onChange(e,n)},s.property=function(e,n){var t=n;Object.defineProperty(s,e,{configurable:!0,enumerable:!0,get:function(){return r(e),t},set:function(n){t=n,i(e,t)}})},s.ensurePropertiesEventEmitter=function(){return s.propertiesEventEmitter?s.propertiesEventEmitter:(s.propertiesEventEmitter=n({instance:e}),s.propertiesEventEmitter)}})}),s("klassified",["./object","./testCase","./property","./globalPropertyEventEmitter"],function(e,n,t,s){return{object:e,testCase:n,property:t,propertyEventEmitter:s}}),t(["klassified"]),t("klassified")});
\ No newline at end of file
+!function(e,n){"function"==typeof define&&define.amd?define(n):e.klassified=n(e.$)}(this,function(e){var n,t,s;return function(e){function r(e,n){return C.call(e,n)}function i(e,n){var t,s,r,i,c,o,u,a,f,l,p,b,h=n&&n.split("/"),d=m.map,g=d&&d["*"]||{};if(e){for(e=e.split("/"),c=e.length-1,m.nodeIdCompat&&j.test(e[c])&&(e[c]=e[c].replace(j,"")),"."===e[0].charAt(0)&&h&&(b=h.slice(0,h.length-1),e=b.concat(e)),f=0;f<e.length;f++)if(p=e[f],"."===p)e.splice(f,1),f-=1;else if(".."===p){if(0===f||1===f&&".."===e[2]||".."===e[f-1])continue;f>0&&(e.splice(f-1,2),f-=2)}e=e.join("/")}if((h||g)&&d){for(t=e.split("/"),f=t.length;f>0;f-=1){if(s=t.slice(0,f).join("/"),h)for(l=h.length;l>0;l-=1)if(r=d[h.slice(0,l).join("/")],r&&(r=r[s])){i=r,o=f;break}if(i)break;!u&&g&&g[s]&&(u=g[s],a=f)}!i&&u&&(i=u,o=a),i&&(t.splice(0,o,i),e=t.join("/"))}return e}function c(n,t){return function(){var s=S.call(arguments,0);return"string"!=typeof s[0]&&1===s.length&&s.push(null),h.apply(e,s.concat([n,t]))}}function o(e){return function(n){return i(n,e)}}function u(e){return function(n){E[e]=n}}function a(n){if(r(v,n)){var t=v[n];delete v[n],y[n]=!0,b.apply(e,t)}if(!r(E,n)&&!r(y,n))throw new Error("No "+n);return E[n]}function f(e){var n,t=e?e.indexOf("!"):-1;return t>-1&&(n=e.substring(0,t),e=e.substring(t+1,e.length)),[n,e]}function l(e){return e?f(e):[]}function p(e){return function(){return m&&m.config&&m.config[e]||{}}}var b,h,d,g,E={},v={},m={},y={},C=Object.prototype.hasOwnProperty,S=[].slice,j=/\.js$/;d=function(e,n){var t,s=f(e),r=s[0],c=n[1];return e=s[1],r&&(r=i(r,c),t=a(r)),r?e=t&&t.normalize?t.normalize(e,o(c)):i(e,c):(e=i(e,c),s=f(e),r=s[0],e=s[1],r&&(t=a(r))),{f:r?r+"!"+e:e,n:e,pr:r,p:t}},g={require:function(e){return c(e)},exports:function(e){var n=E[e];return"undefined"!=typeof n?n:E[e]={}},module:function(e){return{id:e,uri:"",exports:E[e],config:p(e)}}},b=function(n,t,s,i){var o,f,p,b,h,m,C,S=[],j=typeof s;if(i=i||n,m=l(i),"undefined"===j||"function"===j){for(t=!t.length&&s.length?["require","exports","module"]:t,h=0;h<t.length;h+=1)if(b=d(t[h],m),f=b.f,"require"===f)S[h]=g.require(n);else if("exports"===f)S[h]=g.exports(n),C=!0;else if("module"===f)o=S[h]=g.module(n);else if(r(E,f)||r(v,f)||r(y,f))S[h]=a(f);else{if(!b.p)throw new Error(n+" missing "+f);b.p.load(b.n,c(i,!0),u(f),{}),S[h]=E[f]}p=s?s.apply(E[n],S):void 0,n&&(o&&o.exports!==e&&o.exports!==E[n]?E[n]=o.exports:p===e&&C||(E[n]=p))}else n&&(E[n]=s)},n=t=h=function(n,t,s,r,i){if("string"==typeof n)return g[n]?g[n](t):a(d(n,l(t)).f);if(!n.splice){if(m=n,m.deps&&h(m.deps,m.callback),!t)return;t.splice?(n=t,t=s,s=null):n=e}return t=t||function(){},"function"==typeof s&&(s=r,r=i),r?b(e,n,t,s):setTimeout(function(){b(e,n,t,s)},4),h},h.config=function(e){return h(e)},n._defined=E,s=function(e,n,t){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");n.splice||(t=n,n=[]),r(E,e)||r(v,e)||(v[e]=[e,n,t])},s.amd={jQuery:!0}}(),s("object",[],function(){function e(n,t){n=n||{},t=t||{};var s={};return s.getClass=function(){return e},t.preInitialize=function(){},t.initialize=function(){},t.postInitialize=function(){},t.subclassResponsibility=c,t.get=function(e,n){n||(n=function(){return t[e]}),s["get"+i(e)]=n},t.set=function(e,n){n||(n=function(n){return t[e]=n,n}),s["set"+i(e)]=n},s.getClass().extensions.forEach(function(e){e(s,t)}),s}function n(e,n,s,r){t(e,n,s,r).forEach(function(t){e[t].superInstalled||(e[t]=function(e,n,t){return function(){var s=e.super;e.super=t;var r=n.apply(e,arguments);return e.super=s,void 0===e.super&&delete e.super,r}}(e,e[t],n[t]),e[t].superInstalled=!0)})}function t(e,n,t,s){return t.methodsWithSuperCall||Object.defineProperty(t,"methodsWithSuperCall",{enumerable:!1,writable:!0,value:{}}),t.methodsWithSuperCall[s]?t.methodsWithSuperCall[s]:(t.methodsWithSuperCall[s]=Object.keys(e).filter(function(t){return"function"==typeof n[t]&&"function"==typeof e[t]&&o.test(e[t])}),t.methodsWithSuperCall[s])}function s(e){throw new Error("Cannot instantiate an abstract class")}function r(e){throw new Error("Cannot create new instances of a singleton class, use `instance` instead.")}function i(e){return e[0].toUpperCase()+e.slice(1)}function c(){throw new Error("Subclass responsibility")}e.subclasses=[],e.allSubclasses=function(){var e=this.subclasses.slice();return this.subclasses.forEach(function(n){n.allSubclasses().forEach(function(n){e.push(n)})}),e},e.allConcreteSubclasses=function(){var e=this.subclasses.filter(function(e){return!e.isAbstract});return this.subclasses.forEach(function(n){n.allConcreteSubclasses().forEach(function(n){e.push(n)})}),e},e.subclassResponsibility=c,e.extensions=[];var o=/\bsuper\b/;return e.subclass=function(e){function t(c,u,a){c=c||{},u=u||{},t.isAbstract&&!a&&s(i),t.isSingleton&&!a&&r(i);var f=i(c,u,!0);f.getClass=function(){return t};var l=Object.assign({},f),p=Object.assign({},u);return t.extensions.forEach(function(e){e(f,u)}),e(f,u),o.test(e)&&(n(u,p,t,"my"),n(f,l,t,"that")),a||(u.preInitialize(c),u.initialize(c),u.postInitialize(c)),f}var i=this;return t.superclass=i,t.subclasses=[],i.subclasses.push(t),t.classBuilder=i.classBuilder,t.classBuilder(t),t},e.singletonSubclass=function(e){var n=this.subclass(e),t=n();return n.isSingleton=!0,n.instance=function(){return t},n},e.abstractSubclass=function(e){var n=this.subclass(e);return n.isAbstract=!0,n},e.class=function(n){var t=this;if(t===e)throw new Error("object class should not be extended.");var s=t.classBuilder;t.classBuilder=function(e){s(e),n(e)},t.classBuilder(t)},e.classBuilder=function(n){n.class=e.class,n.subclass=e.subclass,n.singletonSubclass=e.singletonSubclass,n.abstractSubclass=e.abstractSubclass,n.allSubclasses=e.allSubclasses,n.allConcreteSubclasses=e.allConcreteSubclasses,n.subclassResponsibility=c,n.extend=e.extend,n.extensions=[]},e.extend=function(e){this.extensions.push(e)},"function"!=typeof Object.assign&&!function(){Object.assign=function(e){if(void 0===e||null===e)throw new TypeError("Cannot convert undefined or null to object");for(var n=Object(e),t=1;t<arguments.length;t++){var s=arguments[t];if(void 0!==s&&null!==s)for(var r in s)s.hasOwnProperty(r)&&(n[r]=s[r])}return n}}(),e}),s("testCase",["./object"],function(e){var n=e.abstractSubclass(function(e,n){function t(e,t){n.force()?fdescribe(e,function(){t()}):describe(e,function(){t()})}n.initialize=function(e){n.super(e);var s=n.registeredTests();t(n.name(),function(){beforeEach(n.beforeEach),afterEach(n.afterEach),beforeAll(n.beforeAll),afterAll(n.afterAll),s.forEach(function(e){it(e.name,e.fn)})})},n.force=function(){return!1},n.beforeEach=function(){},n.beforeAll=function(){},n.afterEach=function(){},n.afterAll=function(){},n.name=function(){return n.subclassResponsibility()},n.expect=expect,n.spyOn=spyOn,n.registeredTests=function(){var e=[],t=/Test$/;return Object.keys(n).forEach(function(s){"function"==typeof n[s]&&t.test(s)&&e.push({name:n.buildTestName(s),fn:n[s]})}),e},n.buildTestName=function(e){e=e.slice(0,-4);var n=/([A-Z][^A-Z]*)/g;return e=e.replace(n," $1"),e=e.toLowerCase()}});return n.class(function(e){e.isTestCase=function(){return!0},e.subclass=function(n){return function(t,s){var r=n.apply(e,[t]);if(s&&s.isAbstract)return r;var i=r();return r.isSingleton=!0,r.instance=function(){return i},r}}(e.subclass),e.abstractSubclass=function(e){return function(e){var n=this.subclass(e,{isAbstract:!0});return n.isAbstract=!0,n}}(e.abstractSubclass)}),n}),s("propertiesEventEmitter",["./object"],function(e){return e.subclass(function(e,n){n.initialize=function(e){n.super(e),n.instance=e.instance,n.accessListeners={},n.changeListeners={}},e.onAccess=function(e,t){n.accessListeners[e]||(n.accessListeners[e]=[]),n.accessListeners[e].indexOf(t)===-1&&n.accessListeners[e].push(t)},e.onChange=function(e,t){n.changeListeners[e]||(n.changeListeners[e]=[]),n.changeListeners[e].indexOf(t)===-1&&n.changeListeners[e].push(t)},e.emitAccess=function(e){n.accessListeners[e]&&n.accessListeners[e].forEach(function(t){t(n.instance,e)})},e.emitChange=function(e,t){n.changeListeners[e]&&n.changeListeners[e].forEach(function(s){s(n.instance,e,t)})}})}),s("globalPropertyEventEmitter",["./object"],function(e){return e.singletonSubclass(function(e,n){n.initialize=function(e){n.super(e),n.accessListeners=[],n.changeListeners=[]},e.onAccess=function(e){n.accessListeners.push(e)},e.onChange=function(e){n.changeListeners.push(e)},e.emitAccess=function(e,t){n.accessListeners.forEach(function(n){n(e,t)})},e.emitChange=function(e,t,s){n.changeListeners.forEach(function(n){n(e,t,s)})}})}),s("property",["./object","./propertiesEventEmitter","./globalPropertyEventEmitter"],function(e,n,t){e.extend(function(e,s){function r(n){var r=s.ensurePropertiesEventEmitter();r.emitAccess(n),t.instance().emitAccess(e,n)}function i(n,r){var i=s.ensurePropertiesEventEmitter();i.emitChange(n,r),t.instance().emitChange(e,n,r)}e.onPropertyAccess=function(e,n){var t=s.ensurePropertiesEventEmitter();t.onAccess(e,n)},e.onPropertyChange=function(e,n){var t=s.ensurePropertiesEventEmitter();t.onChange(e,n)},s.property=function(e,n){var t=n;Object.defineProperty(s,e,{configurable:!0,enumerable:!0,get:function(){return r(e),t},set:function(n){t=n,i(e,t)}})},s.ensurePropertiesEventEmitter=function(){return s.propertiesEventEmitter?s.propertiesEventEmitter:(s.propertiesEventEmitter=n({instance:e}),s.propertiesEventEmitter)}})}),s("klassified",["./object","./testCase","./property","./globalPropertyEventEmitter"],function(e,n,t,s){return{object:e,testCase:n,property:t,propertyEventEmitter:s}}),t(["klassified"]),t("klassified")});
\ No newline at end of file
diff --git a/src/object.js b/src/object.js
index 4887804..aadb2e7 100644
--- a/src/object.js
+++ b/src/object.js
@@ -188,9 +188,10 @@ define([], function() {
 			});
 
 			builder(instance, my);
+
 			if (superCallRegex.test(builder)) {
-				installSuper(instance, superInstance);
-				installSuper(my, superMy);
+				installSuper(my, superMy, klass, "my");
+				installSuper(instance, superInstance, klass, "that");
 			}
 
 			if (!notFinal) {
@@ -264,15 +265,12 @@ define([], function() {
 	 * `super` from within each public function of `obj` to the function in
 	 * `proto`.
 	 */
-	function installSuper(obj, proto) {
-		Object.keys(obj).forEach(function(name) {
-			if (typeof proto[name] === "function" &&
-				typeof obj[name] === "function" &&
-				superCallRegex.test(obj[name]) &&
-				!obj[name].superInstalled) {
-				var superFn = proto[name];
-				obj[name] = (function(name, fn) {
+	function installSuper(obj, proto, klass, receiverName) {
+		methodsWithSuperCall(obj, proto, klass, receiverName).forEach(function(name) {
+			if (!obj[name].superInstalled) {
+				obj[name] = (function(obj, fn, superFn) {
 					return function() {
+
 						var tmp = obj.super;
 						obj.super = superFn;
 						var returnValue = fn.apply(obj, arguments);
@@ -286,12 +284,40 @@ define([], function() {
 
 						return returnValue;
 					};
-				})(name, obj[name]);
+				})(obj, obj[name], proto[name]);
 				obj[name].superInstalled = true;
 			}
 		});
 	}
 
+	/**
+	 * Return the list of methods in `obj` that perform a supercall to `proto`.
+	 * The list is cached in `klass`.
+	 *
+	 * `receiverName` is either "that" or "my".
+	 */
+	function methodsWithSuperCall(obj, proto, klass, receiverName) {
+		if (!klass.methodsWithSuperCall) {
+			Object.defineProperty(klass, "methodsWithSuperCall", {
+				enumerable: false,
+				writable: true,
+				value: {}
+			});
+		}
+
+		if (klass.methodsWithSuperCall[receiverName]) {
+			return klass.methodsWithSuperCall[receiverName];
+		}
+
+		klass.methodsWithSuperCall[receiverName] = Object.keys(obj).filter(function(name) {
+			return typeof(proto[name]) === "function" &&
+				typeof(obj[name]) === "function" &&
+				superCallRegex.test(obj[name]);
+		});
+
+		return klass.methodsWithSuperCall[receiverName];
+	}
+
 	/**
 	 * Extend the class with new methods/properties.
 	 * @param{function} builder takes the same arguments as