Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid generated helpers in baseline

Browse Source
This commit is contained in:
Klaus Meinhardt
2018-04-20 16:39:37 +02:00
parent 4827728b16
commit 8e565fb4a6
5 changed files with 32 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/baselines/reference/controlFlowIIFE.errors.txt
+1 -8
View File
@@ -1,13 +1,8 @@
error TS2318: Cannot find global type 'IterableIterator'.
error TS2468: Cannot find global value 'Promise'.
tests/cases/conformance/controlFlow/controlFlowIIFE.ts(64,5): error TS2454: Variable 'v' is used before being assigned.
tests/cases/conformance/controlFlow/controlFlowIIFE.ts(69,6): error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor. Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.
tests/cases/conformance/controlFlow/controlFlowIIFE.ts(72,5): error TS2454: Variable 'v' is used before being assigned.
!!! error TS2318: Cannot find global type 'IterableIterator'.
!!! error TS2468: Cannot find global value 'Promise'.
==== tests/cases/conformance/controlFlow/controlFlowIIFE.ts (3 errors) ====
==== tests/cases/conformance/controlFlow/controlFlowIIFE.ts (2 errors) ====
declare function getStringOrNumber(): string | number;
function f1() {
@@ -79,8 +74,6 @@ tests/cases/conformance/controlFlow/controlFlowIIFE.ts(72,5): error TS2454: Vari
function f6() {
let v: number;
(async function() {
~~~~~
!!! error TS2705: An async function or method in ES5/ES3 requires the 'Promise' constructor. Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option.
v = await 1;
})();
v; // still undefined
tests/baselines/reference/controlFlowIIFE.js
+18 -69
View File
@@ -74,66 +74,31 @@ function f6() {
}
//// [controlFlowIIFE.js]
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __generator = (this && this.__generator) || function (thisArg, body) {
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) {
if (f) throw new TypeError("Generator is already executing.");
while (_) try {
if (f = 1, y && (t = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t;
if (y = 0, t) op = [0, t.value];
switch (op[0]) {
case 0: case 1: t = op; break;
case 4: _.label++; return { value: op[1], done: false };
case 5: _.label++; y = op[1]; op = [0]; continue;
case 7: op = _.ops.pop(); _.trys.pop(); continue;
default:
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
if (t[2]) _.ops.pop();
_.trys.pop(); continue;
}
op = body.call(thisArg, _);
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
}
};
function f1() {
var x = getStringOrNumber();
let x = getStringOrNumber();
if (typeof x === "string") {
var n = function () {
let n = function () {
return x.length;
}();
}
}
function f2() {
var x = getStringOrNumber();
let x = getStringOrNumber();
if (typeof x === "string") {
var n = (function () {
let n = (function () {
return x.length;
})();
}
}
function f3() {
var x = getStringOrNumber();
var y;
let x = getStringOrNumber();
let y;
if (typeof x === "string") {
var n = (function (z) { return x.length + y + z; })(y = 1);
let n = (z => x.length + y + z)(y = 1);
}
}
// Repros from #8381
var maybeNumber;
let maybeNumber;
(function () {
maybeNumber = 1;
})();
@@ -141,49 +106,33 @@ maybeNumber++;
if (maybeNumber !== undefined) {
maybeNumber++;
}
var test;
let test;
if (!test) {
throw new Error('Test is not defined');
}
(function () {
(() => {
test.slice(1); // No error
})();
// Repro from #23565
function f4() {
var v;
let v;
(function () {
v = 1;
})();
v;
}
function f5() {
var v;
(function () {
return __generator(this, function (_a) {
switch (_a.label) {
case 0: return [4 /*yield*/, 1];
case 1:
_a.sent();
v = 1;
return [2 /*return*/];
}
});
let v;
(function* () {
yield 1;
v = 1;
})();
v; // still undefined
}
function f6() {
var v;
(function () {
return __awaiter(this, void 0, void 0, function () {
return __generator(this, function (_a) {
switch (_a.label) {
case 0: return [4 /*yield*/, 1];
case 1:
v = _a.sent();
return [2 /*return*/];
}
});
});
let v;
(async function () {
v = await 1;
})();
v; // still undefined
}
tests/baselines/reference/controlFlowIIFE.symbols
+9 -9
View File
@@ -16,9 +16,9 @@ function f1() {
>n : Symbol(n, Decl(controlFlowIIFE.ts, 5, 11))
return x.length;
>x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
>x.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
>x : Symbol(x, Decl(controlFlowIIFE.ts, 3, 7))
>length : Symbol(String.length, Decl(lib.d.ts, --, --))
>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
}();
}
@@ -38,9 +38,9 @@ function f2() {
>n : Symbol(n, Decl(controlFlowIIFE.ts, 14, 11))
return x.length;
>x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
>x.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
>x : Symbol(x, Decl(controlFlowIIFE.ts, 12, 7))
>length : Symbol(String.length, Decl(lib.d.ts, --, --))
>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
})();
}
@@ -62,9 +62,9 @@ function f3() {
let n = (z => x.length + y + z)(y = 1);
>n : Symbol(n, Decl(controlFlowIIFE.ts, 24, 11))
>z : Symbol(z, Decl(controlFlowIIFE.ts, 24, 17))
>x.length : Symbol(String.length, Decl(lib.d.ts, --, --))
>x.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
>x : Symbol(x, Decl(controlFlowIIFE.ts, 21, 7))
>length : Symbol(String.length, Decl(lib.d.ts, --, --))
>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
>y : Symbol(y, Decl(controlFlowIIFE.ts, 22, 7))
>z : Symbol(z, Decl(controlFlowIIFE.ts, 24, 17))
>y : Symbol(y, Decl(controlFlowIIFE.ts, 22, 7))
@@ -99,13 +99,13 @@ if (!test) {
>test : Symbol(test, Decl(controlFlowIIFE.ts, 39, 3))
throw new Error('Test is not defined');
>Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
}
(() => {
test.slice(1); // No error
>test.slice : Symbol(String.slice, Decl(lib.d.ts, --, --))
>test.slice : Symbol(String.slice, Decl(lib.es5.d.ts, --, --))
>test : Symbol(test, Decl(controlFlowIIFE.ts, 39, 3))
>slice : Symbol(String.slice, Decl(lib.d.ts, --, --))
>slice : Symbol(String.slice, Decl(lib.es5.d.ts, --, --))
})();
tests/baselines/reference/controlFlowIIFE.types
+3 -3
View File
@@ -181,9 +181,9 @@ function f5() {
>v : number
(function*() {
>(function*() { yield 1; v = 1; })() : {}
>(function*() { yield 1; v = 1; }) : () => {}
>function*() { yield 1; v = 1; } : () => {}
>(function*() { yield 1; v = 1; })() : IterableIterator<number>
>(function*() { yield 1; v = 1; }) : () => IterableIterator<number>
>function*() { yield 1; v = 1; } : () => IterableIterator<number>
yield 1;
>yield 1 : any
tests/cases/conformance/controlFlow/controlFlowIIFE.ts
+1
View File
@@ -1,4 +1,5 @@
// @strictNullChecks: true
// @target: ES2017
declare function getStringOrNumber(): string | number;