Merge pull request #217 from Microsoft/strict_mode

Strict mode support

Author: vladima

src/compiler/diagnosticInformationMap.generated.ts

@@ -99,6 +99,9 @@ module ts {
         A_constructor_implementation_cannot_be_declared_in_an_ambient_context: { code: 1111, category: DiagnosticCategory.Error, key: "A constructor implementation cannot be declared in an ambient context." },
         A_class_member_cannot_be_declared_optional: { code: 1112, category: DiagnosticCategory.Error, key: "A class member cannot be declared optional." },
         A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: DiagnosticCategory.Error, key: "A 'default' clause cannot appear more than once in a 'switch' statement." },
+        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: { code: 1114, category: DiagnosticCategory.Error, key: "An object literal cannot have multiple properties with the same name in strict mode." },
+        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: { code: 1115, category: DiagnosticCategory.Error, key: "An object literal cannot have multiple get/set accessors with the same name." },
+        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: { code: 1116, category: DiagnosticCategory.Error, key: "An object literal cannot have property and accessor with the same name." },
         Duplicate_identifier_0: { code: 2000, category: DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
         new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 2068, category: DiagnosticCategory.Error, key: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
         Multiple_constructor_implementations_are_not_allowed: { code: 2070, category: DiagnosticCategory.Error, key: "Multiple constructor implementations are not allowed." },

src/compiler/diagnosticMessages.json

@@ -388,7 +388,18 @@
         "category": "Error",
         "code": 1113
     },
-
+    "An object literal cannot have multiple properties with the same name in strict mode.": {
+        "category": "Error",
+        "code": 1114
+    },
+    "An object literal cannot have multiple get/set accessors with the same name.": {
+        "category": "Error",
+        "code": 1115
+    },
+    "An object literal cannot have property and accessor with the same name.": {
+        "category": "Error",
+        "code": 1116
+    },
     "Duplicate identifier '{0}'.": {
         "category": "Error",
         "code": 2000

src/compiler/emitter.ts

@@ -1669,8 +1669,7 @@ module ts {
 
             function emitDirectivePrologues(statements: Statement[], startWithNewLine: boolean): number {
                 for (var i = 0; i < statements.length; ++i) {
-                    if (statements[i].kind === SyntaxKind.ExpressionStatement &&
-                        (<ExpressionStatement>statements[i]).expression.kind === SyntaxKind.StringLiteral) {
+                    if (isPrologueDirective(statements[i])) {
                         if (startWithNewLine || i > 0) {
                             writeLine();
                         }

src/compiler/parser.ts

@@ -215,7 +215,9 @@ module ts {
         FirstReservedWord = BreakKeyword,
         LastReservedWord = WithKeyword,
         FirstKeyword = BreakKeyword,
-        LastKeyword = StringKeyword
+        LastKeyword = StringKeyword,
+        FirstFutureReservedWord = ImplementsKeyword,
+        LastFutureReservedWord = YieldKeyword
     }
 
     export enum NodeFlags {

src/compiler/types.ts

@@ -0,0 +1,8 @@
+==== tests/cases/compiler/constructorStaticParamNameErrors.ts (1 errors) ====
+    'use strict'
+    // static as constructor parameter name should give error if 'use strict'
+    class test {
+        constructor (static) { }
+                     ~~~~~~
+!!! Identifier expected.
+    }

tests/baselines/reference/constructorStaticParamNameErrors.errors.txt

@@ -1,4 +1,4 @@
-==== tests/cases/compiler/duplicateObjectLiteralProperty.ts (8 errors) ====
+==== tests/cases/compiler/duplicateObjectLiteralProperty.ts (9 errors) ====
     var x = {
         a: 1,
         b: true, // OK
@@ -30,6 +30,8 @@
             ~
 !!! Accessors are only available when targeting ECMAScript 5 and higher.
             ~
+!!! An object literal cannot have multiple get/set accessors with the same name.
+            ~
 !!! Duplicate identifier 'a'.
     };
 

tests/baselines/reference/constructorStaticParamNameErrors.js

@@ -0,0 +1,10 @@
+==== tests/cases/compiler/duplicatePropertiesInStrictMode.ts (2 errors) ====
+    "use strict";
+    var x = {
+      x: 1,
+      x: 2
+      ~
+!!! An object literal cannot have multiple properties with the same name in strict mode.
+      ~
+!!! Duplicate identifier 'x'.
+    }

tests/baselines/reference/duplicateObjectLiteralProperty.errors.txt

@@ -1,4 +1,4 @@
-==== tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts (41 errors) ====
+==== tests/cases/conformance/expressions/objectLiterals/objectLiteralErrors.ts (59 errors) ====
 
     // Multiple properties with the same name
     var e1 = { a: 0, a: 0 };
@@ -59,57 +59,93 @@
     // Accessor and property with the same name
     var f1 = { a: 0, get a() { return 0; } };
                          ~
+!!! An object literal cannot have property and accessor with the same name.
+                         ~
 !!! Duplicate identifier 'a'.
     var f2 = { a: '', get a() { return ''; } };
                           ~
+!!! An object literal cannot have property and accessor with the same name.
+                          ~
 !!! Duplicate identifier 'a'.
     var f3 = { a: 0, get a() { return ''; } };
                          ~
+!!! An object literal cannot have property and accessor with the same name.
+                         ~
 !!! Duplicate identifier 'a'.
     var f4 = { a: true, get a() { return false; } };
                             ~
+!!! An object literal cannot have property and accessor with the same name.
+                            ~
 !!! Duplicate identifier 'a'.
     var f5 = { a: {}, get a() { return {}; } };
                           ~
+!!! An object literal cannot have property and accessor with the same name.
+                          ~
 !!! Duplicate identifier 'a'.
     var f6 = { a: 0, get 'a'() { return 0; } };
                          ~~~
+!!! An object literal cannot have property and accessor with the same name.
+                         ~~~
 !!! Duplicate identifier ''a''.
     var f7 = { 'a': 0, get a() { return 0; } };
                            ~
+!!! An object literal cannot have property and accessor with the same name.
+                           ~
 !!! Duplicate identifier 'a'.
     var f8 = { 'a': 0, get "a"() { return 0; } };
                            ~~~
+!!! An object literal cannot have property and accessor with the same name.
+                           ~~~
 !!! Duplicate identifier '"a"'.
     var f9 = { 'a': 0, get 'a'() { return 0; } };
                            ~~~
+!!! An object literal cannot have property and accessor with the same name.
+                           ~~~
 !!! Duplicate identifier ''a''.
     var f10 = { "a": 0, get 'a'() { return 0; } };
                             ~~~
+!!! An object literal cannot have property and accessor with the same name.
+                            ~~~
 !!! Duplicate identifier ''a''.
     var f11 = { 1.0: 0, get '1'() { return 0; } };
                             ~~~
+!!! An object literal cannot have property and accessor with the same name.
+                            ~~~
 !!! Duplicate identifier ''1''.
     var f12 = { 0: 0, get 0() { return 0; } };
                           ~
+!!! An object literal cannot have property and accessor with the same name.
+                          ~
 !!! Duplicate identifier '0'.
     var f13 = { 0: 0, get 0() { return 0; } };
                           ~
+!!! An object literal cannot have property and accessor with the same name.
+                          ~
 !!! Duplicate identifier '0'.
     var f14 = { 0: 0, get 0x0() { return 0; } };
                           ~~~
+!!! An object literal cannot have property and accessor with the same name.
+                          ~~~
 !!! Duplicate identifier '0x0'.
     var f14 = { 0: 0, get 000() { return 0; } };
                           ~~~
+!!! An object literal cannot have property and accessor with the same name.
+                          ~~~
 !!! Duplicate identifier '000'.
     var f15 = { "100": 0, get 1e2() { return 0; } };
                               ~~~
+!!! An object literal cannot have property and accessor with the same name.
+                              ~~~
 !!! Duplicate identifier '1e2'.
     var f16 = { 0x20: 0, get 3.2e1() { return 0; } };
                              ~~~~~
+!!! An object literal cannot have property and accessor with the same name.
+                             ~~~~~
 !!! Duplicate identifier '3.2e1'.
     var f17 = { a: 0, get b() { return 1; }, get a() { return 0; } };
                                                  ~
+!!! An object literal cannot have property and accessor with the same name.
+                                                 ~
 !!! Duplicate identifier 'a'.
 
     // Get and set accessor with mismatched type annotations

tests/baselines/reference/duplicatePropertiesInStrictMode.errors.txt

@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/parser10.1.1-8gs.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/parser10.1.1-8gs.ts (4 errors) ====
     /// Copyright (c) 2012 Ecma International.  All rights reserved. 
     /// Ecma International makes this code available under the terms and conditions set
     /// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
@@ -18,4 +18,10 @@
           ~~~~~~~~~~~~~
 !!! Cannot find name 'NotEarlyError'.
     var public = 1;
+        ~~~~~~
+!!! Variable declaration expected.
+               ~
+!!! Variable declaration expected.
+                 ~
+!!! Variable declaration expected.
 

tests/baselines/reference/objectLiteralErrors.errors.txt

@@ -0,0 +1,9 @@
+==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser642331_1.ts (1 errors) ====
+    "use strict";
+    
+    class test {
+        constructor (static) { }
+                     ~~~~~~
+!!! Identifier expected.
+    }
+