Simplify es2015 visitor, replace function tracking with flags

rbuckton · rbuckton · commit 25c7caaef96f · 2016-12-08T15:30:12.000-08:00
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
@@ -1754,6 +1754,19 @@ namespace ts {
 
     // Utilities
 
+    export function restoreEnclosingLabels(node: Statement, enclosingLabeledStatements: LabeledStatement[]) {
+        if (enclosingLabeledStatements) {
+            for (const labeledStatement of enclosingLabeledStatements) {
+                node = updateLabel(
+                    labeledStatement,
+                    labeledStatement.label,
+                    node
+                );
+            }
+        }
+        return node;
+    }
+
     export interface CallBinding {
         target: LeftHandSideExpression;
         thisArg: Expression;
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -883,6 +883,18 @@ namespace ts {
         return false;
     }
 
+    export function getAllLabeledStatements(node: LabeledStatement): { statement: Statement; labeledStatements: LabeledStatement[]; } {
+        switch (node.statement.kind) {
+            case SyntaxKind.LabeledStatement:
+                const result = getAllLabeledStatements(<LabeledStatement>node.statement);
+                if (result) {
+                    result.labeledStatements.push(node);
+                }
+                return result;
+            default:
+                return { statement: <IterationStatement>node.statement, labeledStatements: [node] };
+        }
+    }
 
     export function isFunctionBlock(node: Node) {
         return node && node.kind === SyntaxKind.Block && isFunctionLike(node.parent);
diff --git a/tests/baselines/reference/superAccess2.js b/tests/baselines/reference/superAccess2.js
@@ -41,9 +41,9 @@ var Q = (function (_super) {
     __extends(Q, _super);
     // Super is not allowed in constructor args
     function Q(z, zz, zzz) {
-        if (z === void 0) { z = _super.; }
-        if (zz === void 0) { zz = _super.; }
-        if (zzz === void 0) { zzz = function () { return _super.; }; }
+        if (z === void 0) { z = _super.prototype.; }
+        if (zz === void 0) { zz = _super.prototype.; }
+        if (zzz === void 0) { zzz = function () { return _super.prototype.; }; }
         var _this = _super.call(this) || this;
         _this.z = z;
         _this.xx = _super.prototype.;
diff --git a/tests/baselines/reference/superInConstructorParam1.js b/tests/baselines/reference/superInConstructorParam1.js
@@ -27,7 +27,7 @@ var B = (function () {
 var C = (function (_super) {
     __extends(C, _super);
     function C(a) {
-        if (a === void 0) { a = _super.foo.call(_this); }
+        if (a === void 0) { a = _super.prototype.foo.call(_this); }
         var _this;
         return _this;
     }
diff --git a/tests/baselines/reference/superInObjectLiterals_ES5.js b/tests/baselines/reference/superInObjectLiterals_ES5.js
@@ -72,14 +72,14 @@ var obj = {
         }
     },
     method: function () {
-        _super.prototype.method.call(this);
+        _super.method.call(this);
     },
     get prop() {
-        _super.prototype.method.call(this);
+        _super.method.call(this);
         return 10;
     },
     set prop(value) {
-        _super.prototype.method.call(this);
+        _super.method.call(this);
     },
     p1: function () {
         _super.method.call(this);
@@ -110,14 +110,14 @@ var B = (function (_super) {
                 }
             },
             method: function () {
-                _super.prototype.method.call(this);
+                _super.method.call(this);
             },
             get prop() {
-                _super.prototype.method.call(this);
+                _super.method.call(this);
                 return 10;
             },
             set prop(value) {
-                _super.prototype.method.call(this);
+                _super.method.call(this);
             },
             p1: function () {
                 _super.method.call(this);
diff --git a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
@@ -40,7 +40,7 @@ var C1 = (function (_super) {
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
-        return _super.call(this, _super.x.call(_this)) || this;
+        return _super.call(this, _super.prototype.x.call(_this)) || this;
     }
     return C2;
 }(B));
diff --git a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js
@@ -38,10 +38,10 @@ var ObjectLiteral;
     var ThisInObjectLiteral = {
         _foo: '1',
         get foo() {
-            return _super.prototype._foo;
+            return _super._foo;
         },
         set foo(value) {
-            _super.prototype._foo = value;
+            _super._foo = value;
         },
         test: function () {
             return _super._foo;
@@ -62,7 +62,7 @@ var SuperObjectTest = (function (_super) {
     SuperObjectTest.prototype.testing = function () {
         var test = {
             get F() {
-                return _super.prototype.test.call(this);
+                return _super.test.call(this);
             }
         };
     };

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ var B = (function () {`
`27`	`27`	`var C = (function (_super) {`
`28`	`28`	`__extends(C, _super);`
`29`	`29`	`function C(a) {`
`30`		`- if (a === void 0) { a = _super.foo.call(_this); }`
	`30`	`+ if (a === void 0) { a = _super.prototype.foo.call(_this); }`
`31`	`31`	`var _this;`
`32`	`32`	`return _this;`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ var C1 = (function (_super) {`
`40`	`40`	`var C2 = (function (_super) {`
`41`	`41`	`__extends(C2, _super);`
`42`	`42`	`function C2() {`
`43`		`- return _super.call(this, _super.x.call(_this)) \|\| this;`
	`43`	`+ return _super.call(this, _super.prototype.x.call(_this)) \|\| this;`
`44`	`44`	`}`
`45`	`45`	`return C2;`
`46`	`46`	`}(B));`