microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 16:38:05 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Disallow initializers in for-in and for-of loops

Browse Source
This commit is contained in:
Jason Freeman 2015-02-17 17:52:55 -08:00
parent f7a6354470
commit 147cc204b8
10 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/checker.ts
View File

@ -10769,6 +10769,12 @@ module ts {
Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
}
if (variableList.declarations[0].initializer) {
var diagnostic = forInOrOfStatement.kind === SyntaxKind.ForInStatement ?
Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer :
Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
return grammarErrorOnNode(variableList.declarations[0].name, diagnostic);
}
}
}

2
src/compiler/diagnosticInformationMap.generated.ts
View File

@ -148,6 +148,8 @@ module ts {
A_rest_element_cannot_have_an_initializer: { code: 1186, category: DiagnosticCategory.Error, key: "A rest element cannot have an initializer." },
A_parameter_property_may_not_be_a_binding_pattern: { code: 1187, category: DiagnosticCategory.Error, key: "A parameter property may not be a binding pattern." },
Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: { code: 1188, category: DiagnosticCategory.Error, key: "Only a single variable declaration is allowed in a 'for...of' statement." },
The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: { code: 1189, category: DiagnosticCategory.Error, key: "The variable declaration of a 'for...in' statement cannot have an initializer." },
The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: { code: 1190, category: DiagnosticCategory.Error, key: "The variable declaration of a 'for...of' statement cannot have an initializer." },
Duplicate_identifier_0: { code: 2300, category: DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: DiagnosticCategory.Error, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
Static_members_cannot_reference_class_type_parameters: { code: 2302, category: DiagnosticCategory.Error, key: "Static members cannot reference class type parameters." },

8
src/compiler/diagnosticMessages.json
View File

@ -583,6 +583,14 @@
"category": "Error",
"code": 1188
},
"The variable declaration of a 'for...in' statement cannot have an initializer.": {
"category": "Error",
"code": 1189
},
"The variable declaration of a 'for...of' statement cannot have an initializer.": {
"category": "Error",
"code": 1190
},
"Duplicate identifier '{0}'.": {
"category": "Error",

7
tests/baselines/reference/parserES5ForOfStatement20.errors.txt Normal file
View File

@ -0,0 +1,7 @@
tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts(1,10): error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts (1 errors) ====
for (var of = 0 in of) { }
~~
!!! error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.

5
tests/baselines/reference/parserES5ForOfStatement20.types
View File

@ -1,5 +0,0 @@
=== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts ===
for (var of = 0 in of) { }
>of : any
>of : any

6
tests/baselines/reference/parserES5ForOfStatement4.errors.txt
View File

@ -1,8 +1,8 @@
tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement4.ts(1,1): error TS2482: For-of statements are only available when targeting ECMAScript 6 or higher
tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement4.ts(1,10): error TS1190: The variable declaration of a 'for...of' statement cannot have an initializer.
==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement4.ts (1 errors) ====
for (var a = 1 of X) {
~~~
!!! error TS2482: For-of statements are only available when targeting ECMAScript 6 or higher
~
!!! error TS1190: The variable declaration of a 'for...of' statement cannot have an initializer.
}

5
tests/baselines/reference/parserForInStatement4.errors.txt
View File

@ -1,8 +1,11 @@
tests/cases/conformance/parser/ecmascript5/Statements/parserForInStatement4.ts(1,10): error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
tests/cases/conformance/parser/ecmascript5/Statements/parserForInStatement4.ts(1,19): error TS2304: Cannot find name 'X'.
==== tests/cases/conformance/parser/ecmascript5/Statements/parserForInStatement4.ts (1 errors) ====
==== tests/cases/conformance/parser/ecmascript5/Statements/parserForInStatement4.ts (2 errors) ====
for (var a = 1 in X) {
~
!!! error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
~
!!! error TS2304: Cannot find name 'X'.
}

7
tests/baselines/reference/parserForOfStatement20.errors.txt Normal file
View File

@ -0,0 +1,7 @@
tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts(1,10): error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts (1 errors) ====
for (var of = 0 in of) { }
~~
!!! error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.

5
tests/baselines/reference/parserForOfStatement20.types
View File

@ -1,5 +0,0 @@
=== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts ===
for (var of = 0 in of) { }
>of : any
>of : any

8
tests/baselines/reference/parserForOfStatement4.errors.txt Normal file
View File

@ -0,0 +1,8 @@
tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement4.ts(1,10): error TS1190: The variable declaration of a 'for...of' statement cannot have an initializer.
==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement4.ts (1 errors) ====
for (var a = 1 of X) {
~
!!! error TS1190: The variable declaration of a 'for...of' statement cannot have an initializer.
}