From 7ce1604c53789ee43bc7586e052a2b272422ebaf Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 16 Apr 2015 16:41:11 -0700 Subject: [PATCH] Accepted baselines. --- ...dingPatternKeywordIdentifiers01.errors.txt | 8 ++++++ ...bjectBindingPatternKeywordIdentifiers01.js | 2 +- ...ctBindingPatternKeywordIdentifiers01.types | 8 ------ ...dingPatternKeywordIdentifiers02.errors.txt | 7 +++-- ...bjectBindingPatternKeywordIdentifiers02.js | 2 +- ...dingPatternKeywordIdentifiers04.errors.txt | 7 +++-- ...bjectBindingPatternKeywordIdentifiers04.js | 2 +- ...BindingPatternKeywordIdentifiers05.symbols | 6 +++++ ...BindingPatternKeywordIdentifiers06.symbols | 6 +++++ .../reference/reservedWords2.errors.txt | 26 ++++++++++++++++++- tests/baselines/reference/reservedWords2.js | 4 +-- 11 files changed, 60 insertions(+), 18 deletions(-) create mode 100644 tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.errors.txt delete mode 100644 tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.types create mode 100644 tests/baselines/reference/objectBindingPatternKeywordIdentifiers05.symbols create mode 100644 tests/baselines/reference/objectBindingPatternKeywordIdentifiers06.symbols diff --git a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.errors.txt b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.errors.txt new file mode 100644 index 00000000000..b5dc0ac3c4b --- /dev/null +++ b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.errors.txt @@ -0,0 +1,8 @@ +tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers01.ts(2,13): error TS1005: ':' expected. + + +==== tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers01.ts (1 errors) ==== + + var { while } = { while: 1 } + ~ +!!! error TS1005: ':' expected. \ No newline at end of file diff --git a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.js b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.js index 6ee9c4e6550..cd339bb5907 100644 --- a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.js +++ b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.js @@ -3,4 +3,4 @@ var { while } = { while: 1 } //// [objectBindingPatternKeywordIdentifiers01.js] -var while = { while: 1 }.while; +var = { while: 1 }.while; diff --git a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.types b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.types deleted file mode 100644 index 89a0a0f0caa..00000000000 --- a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.types +++ /dev/null @@ -1,8 +0,0 @@ -=== tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers01.ts === - -var { while } = { while: 1 } ->while : number ->{ while: 1 } : { while: number; } ->while : number ->1 : number - diff --git a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers02.errors.txt b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers02.errors.txt index 4394854833c..7ac72469d08 100644 --- a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers02.errors.txt +++ b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers02.errors.txt @@ -1,8 +1,11 @@ tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers02.ts(2,14): error TS1003: Identifier expected. +tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers02.ts(2,20): error TS1005: ':' expected. -==== tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers02.ts (1 errors) ==== +==== tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers02.ts (2 errors) ==== var { while: while } = { while: 1 } ~~~~~ -!!! error TS1003: Identifier expected. \ No newline at end of file +!!! error TS1003: Identifier expected. + ~ +!!! error TS1005: ':' expected. \ No newline at end of file diff --git a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers02.js b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers02.js index f0401bdf375..0286a78ba82 100644 --- a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers02.js +++ b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers02.js @@ -3,4 +3,4 @@ var { while: while } = { while: 1 } //// [objectBindingPatternKeywordIdentifiers02.js] -var _a = { while: 1 }, = _a.while, while = _a.while; +var _a = { while: 1 }, = _a.while, = _a.while; diff --git a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers04.errors.txt b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers04.errors.txt index 6fa8c29fc62..69a8b48b2f1 100644 --- a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers04.errors.txt +++ b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers04.errors.txt @@ -1,8 +1,11 @@ tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers04.ts(2,16): error TS1003: Identifier expected. +tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers04.ts(2,22): error TS1005: ':' expected. -==== tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers04.ts (1 errors) ==== +==== tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers04.ts (2 errors) ==== var { "while": while } = { while: 1 } ~~~~~ -!!! error TS1003: Identifier expected. \ No newline at end of file +!!! error TS1003: Identifier expected. + ~ +!!! error TS1005: ':' expected. \ No newline at end of file diff --git a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers04.js b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers04.js index 6f0cde82ce8..4e53b13c0a6 100644 --- a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers04.js +++ b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers04.js @@ -3,4 +3,4 @@ var { "while": while } = { while: 1 } //// [objectBindingPatternKeywordIdentifiers04.js] -var _a = { while: 1 }, = _a["while"], while = _a.while; +var _a = { while: 1 }, = _a["while"], = _a.while; diff --git a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers05.symbols b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers05.symbols new file mode 100644 index 00000000000..5ac9bb815f8 --- /dev/null +++ b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers05.symbols @@ -0,0 +1,6 @@ +=== tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers05.ts === + +var { as } = { as: 1 } +>as : Symbol(as, Decl(objectBindingPatternKeywordIdentifiers05.ts, 1, 5)) +>as : Symbol(as, Decl(objectBindingPatternKeywordIdentifiers05.ts, 1, 14)) + diff --git a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers06.symbols b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers06.symbols new file mode 100644 index 00000000000..7cee5f3009b --- /dev/null +++ b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers06.symbols @@ -0,0 +1,6 @@ +=== tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers06.ts === + +var { as: as } = { as: 1 } +>as : Symbol(as, Decl(objectBindingPatternKeywordIdentifiers06.ts, 1, 5)) +>as : Symbol(as, Decl(objectBindingPatternKeywordIdentifiers06.ts, 1, 18)) + diff --git a/tests/baselines/reference/reservedWords2.errors.txt b/tests/baselines/reference/reservedWords2.errors.txt index ec4b7b09887..3b3fe2c502c 100644 --- a/tests/baselines/reference/reservedWords2.errors.txt +++ b/tests/baselines/reference/reservedWords2.errors.txt @@ -15,6 +15,14 @@ tests/cases/compiler/reservedWords2.ts(5,10): error TS1003: Identifier expected. tests/cases/compiler/reservedWords2.ts(5,18): error TS1005: '=>' expected. tests/cases/compiler/reservedWords2.ts(6,7): error TS2300: Duplicate identifier '(Missing)'. tests/cases/compiler/reservedWords2.ts(6,8): error TS1003: Identifier expected. +tests/cases/compiler/reservedWords2.ts(7,11): error TS2300: Duplicate identifier '(Missing)'. +tests/cases/compiler/reservedWords2.ts(7,11): error TS1005: ':' expected. +tests/cases/compiler/reservedWords2.ts(7,19): error TS2300: Duplicate identifier '(Missing)'. +tests/cases/compiler/reservedWords2.ts(7,19): error TS1005: ':' expected. +tests/cases/compiler/reservedWords2.ts(8,10): error TS2300: Duplicate identifier '(Missing)'. +tests/cases/compiler/reservedWords2.ts(8,10): error TS1005: ':' expected. +tests/cases/compiler/reservedWords2.ts(8,30): error TS2300: Duplicate identifier '(Missing)'. +tests/cases/compiler/reservedWords2.ts(8,30): error TS1005: ':' expected. tests/cases/compiler/reservedWords2.ts(9,6): error TS1181: Array element destructuring pattern expected. tests/cases/compiler/reservedWords2.ts(9,14): error TS1005: ';' expected. tests/cases/compiler/reservedWords2.ts(9,18): error TS1005: '(' expected. @@ -23,7 +31,7 @@ tests/cases/compiler/reservedWords2.ts(10,5): error TS2300: Duplicate identifier tests/cases/compiler/reservedWords2.ts(10,6): error TS1003: Identifier expected. -==== tests/cases/compiler/reservedWords2.ts (23 errors) ==== +==== tests/cases/compiler/reservedWords2.ts (31 errors) ==== import while = require("dfdf"); ~~~~~~ !!! error TS1148: Cannot compile external modules unless the '--module' flag is provided. @@ -65,7 +73,23 @@ tests/cases/compiler/reservedWords2.ts(10,6): error TS1003: Identifier expected. ~~~~ !!! error TS1003: Identifier expected. var {while, return} = { while: 1, return: 2 }; + +!!! error TS2300: Duplicate identifier '(Missing)'. + ~ +!!! error TS1005: ':' expected. + +!!! error TS2300: Duplicate identifier '(Missing)'. + ~ +!!! error TS1005: ':' expected. var {this, switch: { continue} } = { this: 1, switch: { continue: 2 }}; + +!!! error TS2300: Duplicate identifier '(Missing)'. + ~ +!!! error TS1005: ':' expected. + +!!! error TS2300: Duplicate identifier '(Missing)'. + ~ +!!! error TS1005: ':' expected. var [debugger, if] = [1, 2]; ~~~~~~~~ !!! error TS1181: Array element destructuring pattern expected. diff --git a/tests/baselines/reference/reservedWords2.js b/tests/baselines/reference/reservedWords2.js index 4bda38842a3..6d5a5f530c5 100644 --- a/tests/baselines/reference/reservedWords2.js +++ b/tests/baselines/reference/reservedWords2.js @@ -24,8 +24,8 @@ typeof ; 10; throw function () { }; void {}; -var _a = { while: 1, return: 2 }, while = _a.while, return = _a.return; -var _b = { this: 1, switch: { continue: 2 } }, this = _b.this, continue = _b.switch.continue; +var _a = { while: 1, return: 2 }, = _a.while, = _a.return; +var _b = { this: 1, switch: { continue: 2 } }, = _b.this, = _b.switch.continue; var _c = void 0; debugger; if ()