From 4aa7c6693c2c56374d2de929adf96483b3abcf86 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Fri, 19 Sep 2014 17:58:16 -0700 Subject: [PATCH] Updating baselines. --- .../baselines/reference/Protected1.errors.txt | 9 +++---- .../baselines/reference/Protected2.errors.txt | 9 +++---- .../baselines/reference/Protected3.errors.txt | 23 +++------------- .../baselines/reference/Protected4.errors.txt | 23 +++------------- .../baselines/reference/Protected5.errors.txt | 24 ----------------- .../baselines/reference/Protected6.errors.txt | 26 +++---------------- .../baselines/reference/Protected7.errors.txt | 23 +++------------- .../baselines/reference/Protected9.errors.txt | 12 --------- 8 files changed, 22 insertions(+), 127 deletions(-) delete mode 100644 tests/baselines/reference/Protected5.errors.txt delete mode 100644 tests/baselines/reference/Protected9.errors.txt diff --git a/tests/baselines/reference/Protected1.errors.txt b/tests/baselines/reference/Protected1.errors.txt index fa40efbeaa..561e4cfd00 100644 --- a/tests/baselines/reference/Protected1.errors.txt +++ b/tests/baselines/reference/Protected1.errors.txt @@ -1,11 +1,8 @@ -tests/cases/conformance/parser/ecmascript5/Protected/Protected1.ts(1,11): error TS1005: ';' expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected1.ts(1,1): error TS2304: Cannot find name 'protected'. +tests/cases/conformance/parser/ecmascript5/Protected/Protected1.ts(1,1): error TS1044: 'protected' modifier cannot appear on a module element. -==== tests/cases/conformance/parser/ecmascript5/Protected/Protected1.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Protected/Protected1.ts (1 errors) ==== protected class C { - ~~~~~ -!!! error TS1005: ';' expected. ~~~~~~~~~ -!!! error TS2304: Cannot find name 'protected'. +!!! error TS1044: 'protected' modifier cannot appear on a module element. } \ No newline at end of file diff --git a/tests/baselines/reference/Protected2.errors.txt b/tests/baselines/reference/Protected2.errors.txt index 9a91897eeb..0f6de4d49e 100644 --- a/tests/baselines/reference/Protected2.errors.txt +++ b/tests/baselines/reference/Protected2.errors.txt @@ -1,11 +1,8 @@ -tests/cases/conformance/parser/ecmascript5/Protected/Protected2.ts(1,11): error TS1005: ';' expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected2.ts(1,1): error TS2304: Cannot find name 'protected'. +tests/cases/conformance/parser/ecmascript5/Protected/Protected2.ts(1,1): error TS1044: 'protected' modifier cannot appear on a module element. -==== tests/cases/conformance/parser/ecmascript5/Protected/Protected2.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Protected/Protected2.ts (1 errors) ==== protected module M { - ~~~~~~ -!!! error TS1005: ';' expected. ~~~~~~~~~ -!!! error TS2304: Cannot find name 'protected'. +!!! error TS1044: 'protected' modifier cannot appear on a module element. } \ No newline at end of file diff --git a/tests/baselines/reference/Protected3.errors.txt b/tests/baselines/reference/Protected3.errors.txt index c5e8d49376..688422a1e0 100644 --- a/tests/baselines/reference/Protected3.errors.txt +++ b/tests/baselines/reference/Protected3.errors.txt @@ -1,24 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/Protected/Protected3.ts(2,3): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected3.ts(2,13): error TS1005: ';' expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected3.ts(2,27): error TS1005: ';' expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected3.ts(3,1): error TS1128: Declaration or statement expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected3.ts(2,3): error TS2304: Cannot find name 'protected'. -tests/cases/conformance/parser/ecmascript5/Protected/Protected3.ts(2,13): error TS2304: Cannot find name 'constructor'. +tests/cases/conformance/parser/ecmascript5/Protected/Protected3.ts(2,3): error TS1089: 'protected' modifier cannot appear on a constructor declaration. -==== tests/cases/conformance/parser/ecmascript5/Protected/Protected3.ts (6 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Protected/Protected3.ts (1 errors) ==== class C { protected constructor() { } ~~~~~~~~~ -!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. - ~~~~~~~~~~~ -!!! error TS1005: ';' expected. - ~ -!!! error TS1005: ';' expected. - ~~~~~~~~~ -!!! error TS2304: Cannot find name 'protected'. - ~~~~~~~~~~~ -!!! error TS2304: Cannot find name 'constructor'. - } - ~ -!!! error TS1128: Declaration or statement expected. \ No newline at end of file +!!! error TS1089: 'protected' modifier cannot appear on a constructor declaration. + } \ No newline at end of file diff --git a/tests/baselines/reference/Protected4.errors.txt b/tests/baselines/reference/Protected4.errors.txt index 929c5f4849..fa4f410ab6 100644 --- a/tests/baselines/reference/Protected4.errors.txt +++ b/tests/baselines/reference/Protected4.errors.txt @@ -1,24 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/Protected/Protected4.ts(2,3): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected4.ts(2,13): error TS1005: ';' expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected4.ts(2,24): error TS1005: ';' expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected4.ts(3,1): error TS1128: Declaration or statement expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected4.ts(2,3): error TS2304: Cannot find name 'protected'. -tests/cases/conformance/parser/ecmascript5/Protected/Protected4.ts(2,20): error TS2304: Cannot find name 'm'. +tests/cases/conformance/parser/ecmascript5/Protected/Protected4.ts(2,13): error TS1028: Accessibility modifier already seen. -==== tests/cases/conformance/parser/ecmascript5/Protected/Protected4.ts (6 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Protected/Protected4.ts (1 errors) ==== class C { protected public m() { } - ~~~~~~~~~ -!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. ~~~~~~ -!!! error TS1005: ';' expected. - ~ -!!! error TS1005: ';' expected. - ~~~~~~~~~ -!!! error TS2304: Cannot find name 'protected'. - ~ -!!! error TS2304: Cannot find name 'm'. - } - ~ -!!! error TS1128: Declaration or statement expected. \ No newline at end of file +!!! error TS1028: Accessibility modifier already seen. + } \ No newline at end of file diff --git a/tests/baselines/reference/Protected5.errors.txt b/tests/baselines/reference/Protected5.errors.txt deleted file mode 100644 index 99bc6d9726..0000000000 --- a/tests/baselines/reference/Protected5.errors.txt +++ /dev/null @@ -1,24 +0,0 @@ -tests/cases/conformance/parser/ecmascript5/Protected/Protected5.ts(2,3): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected5.ts(2,13): error TS1005: ';' expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected5.ts(2,24): error TS1005: ';' expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected5.ts(3,1): error TS1128: Declaration or statement expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected5.ts(2,3): error TS2304: Cannot find name 'protected'. -tests/cases/conformance/parser/ecmascript5/Protected/Protected5.ts(2,20): error TS2304: Cannot find name 'm'. - - -==== tests/cases/conformance/parser/ecmascript5/Protected/Protected5.ts (6 errors) ==== - class C { - protected static m() { } - ~~~~~~~~~ -!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. - ~~~~~~ -!!! error TS1005: ';' expected. - ~ -!!! error TS1005: ';' expected. - ~~~~~~~~~ -!!! error TS2304: Cannot find name 'protected'. - ~ -!!! error TS2304: Cannot find name 'm'. - } - ~ -!!! error TS1128: Declaration or statement expected. \ No newline at end of file diff --git a/tests/baselines/reference/Protected6.errors.txt b/tests/baselines/reference/Protected6.errors.txt index 01c7974111..3b3804b0fb 100644 --- a/tests/baselines/reference/Protected6.errors.txt +++ b/tests/baselines/reference/Protected6.errors.txt @@ -1,27 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/Protected/Protected6.ts(2,3): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected6.ts(2,10): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected6.ts(2,20): error TS1005: ';' expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected6.ts(2,24): error TS1005: ';' expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected6.ts(3,1): error TS1128: Declaration or statement expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected6.ts(2,10): error TS2304: Cannot find name 'protected'. -tests/cases/conformance/parser/ecmascript5/Protected/Protected6.ts(2,20): error TS2304: Cannot find name 'm'. +tests/cases/conformance/parser/ecmascript5/Protected/Protected6.ts(2,10): error TS1029: 'protected' modifier must precede 'static' modifier. -==== tests/cases/conformance/parser/ecmascript5/Protected/Protected6.ts (7 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Protected/Protected6.ts (1 errors) ==== class C { static protected m() { } - ~~~~~~ -!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. ~~~~~~~~~ -!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. - ~ -!!! error TS1005: ';' expected. - ~ -!!! error TS1005: ';' expected. - ~~~~~~~~~ -!!! error TS2304: Cannot find name 'protected'. - ~ -!!! error TS2304: Cannot find name 'm'. - } - ~ -!!! error TS1128: Declaration or statement expected. \ No newline at end of file +!!! error TS1029: 'protected' modifier must precede 'static' modifier. + } \ No newline at end of file diff --git a/tests/baselines/reference/Protected7.errors.txt b/tests/baselines/reference/Protected7.errors.txt index 651defcc1c..e95f39eb1b 100644 --- a/tests/baselines/reference/Protected7.errors.txt +++ b/tests/baselines/reference/Protected7.errors.txt @@ -1,24 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/Protected/Protected7.ts(2,3): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected7.ts(2,13): error TS1005: ';' expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected7.ts(2,25): error TS1005: ';' expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected7.ts(3,1): error TS1128: Declaration or statement expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected7.ts(2,3): error TS2304: Cannot find name 'protected'. -tests/cases/conformance/parser/ecmascript5/Protected/Protected7.ts(2,21): error TS2304: Cannot find name 'm'. +tests/cases/conformance/parser/ecmascript5/Protected/Protected7.ts(2,13): error TS1028: Accessibility modifier already seen. -==== tests/cases/conformance/parser/ecmascript5/Protected/Protected7.ts (6 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Protected/Protected7.ts (1 errors) ==== class C { protected private m() { } - ~~~~~~~~~ -!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected. ~~~~~~~ -!!! error TS1005: ';' expected. - ~ -!!! error TS1005: ';' expected. - ~~~~~~~~~ -!!! error TS2304: Cannot find name 'protected'. - ~ -!!! error TS2304: Cannot find name 'm'. - } - ~ -!!! error TS1128: Declaration or statement expected. \ No newline at end of file +!!! error TS1028: Accessibility modifier already seen. + } \ No newline at end of file diff --git a/tests/baselines/reference/Protected9.errors.txt b/tests/baselines/reference/Protected9.errors.txt deleted file mode 100644 index c503ab319d..0000000000 --- a/tests/baselines/reference/Protected9.errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -tests/cases/conformance/parser/ecmascript5/Protected/Protected9.ts(2,26): error TS1005: '=' expected. -tests/cases/conformance/parser/ecmascript5/Protected/Protected9.ts(2,26): error TS2304: Cannot find name 'p'. - - -==== tests/cases/conformance/parser/ecmascript5/Protected/Protected9.ts (2 errors) ==== - class C { - constructor(protected p) { } - ~ -!!! error TS1005: '=' expected. - ~ -!!! error TS2304: Cannot find name 'p'. - } \ No newline at end of file