From 9abfc3bd1a1c8ae538621af372f32fb51ebca958 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Thu, 23 Apr 2015 14:07:01 -0700
Subject: [PATCH] Added test.

---
 ...rtsWithContextualKeywordNames01.errors.txt | 29 +++++++++++++++++
 ...sAndImportsWithContextualKeywordNames01.js | 32 +++++++++++++++++++
 ...sAndImportsWithContextualKeywordNames01.ts | 20 ++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.errors.txt
 create mode 100644 tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
 create mode 100644 tests/cases/conformance/es6/modules/exportsAndImportsWithContextualKeywordNames01.ts

diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.errors.txt b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.errors.txt
new file mode 100644
index 0000000000..fa9635da3e
--- /dev/null
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.errors.txt
@@ -0,0 +1,29 @@
+tests/cases/conformance/es6/modules/t2.ts(1,13): error TS1212: Identifier expected. 'set' is a reserved word in strict mode
+tests/cases/conformance/es6/modules/t3.ts(1,17): error TS1212: Identifier expected. 'yield' is a reserved word in strict mode
+tests/cases/conformance/es6/modules/t4.ts(1,10): error TS1212: Identifier expected. 'get' is a reserved word in strict mode
+
+
+==== tests/cases/conformance/es6/modules/t1.ts (0 errors) ====
+    
+    let set = {
+        set foo(x: number) {
+        }
+    }
+    let get = 10;
+    
+    export { set, get };
+    
+==== tests/cases/conformance/es6/modules/t2.ts (1 errors) ====
+    import * as set from "./t1";
+                ~~~
+!!! error TS1212: Identifier expected. 'set' is a reserved word in strict mode
+    
+==== tests/cases/conformance/es6/modules/t3.ts (1 errors) ====
+    import { set as yield } from "./t1";
+                    ~~~~~
+!!! error TS1212: Identifier expected. 'yield' is a reserved word in strict mode
+    
+==== tests/cases/conformance/es6/modules/t4.ts (1 errors) ====
+    import { get } from "./t1";
+             ~~~
+!!! error TS1212: Identifier expected. 'get' is a reserved word in strict mode
\ No newline at end of file
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
new file mode 100644
index 0000000000..4b1564b5ab
--- /dev/null
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
@@ -0,0 +1,32 @@
+//// [tests/cases/conformance/es6/modules/exportsAndImportsWithContextualKeywordNames01.ts] ////
+
+//// [t1.ts]
+
+let set = {
+    set foo(x: number) {
+    }
+}
+let get = 10;
+
+export { set, get };
+
+//// [t2.ts]
+import * as set from "./t1";
+
+//// [t3.ts]
+import { set as yield } from "./t1";
+
+//// [t4.ts]
+import { get } from "./t1";
+
+//// [t1.js]
+var set = {
+    set foo(x) {
+    }
+};
+exports.set = set;
+var get = 10;
+exports.get = get;
+//// [t2.js]
+//// [t3.js]
+//// [t4.js]
diff --git a/tests/cases/conformance/es6/modules/exportsAndImportsWithContextualKeywordNames01.ts b/tests/cases/conformance/es6/modules/exportsAndImportsWithContextualKeywordNames01.ts
new file mode 100644
index 0000000000..fff5f9833a
--- /dev/null
+++ b/tests/cases/conformance/es6/modules/exportsAndImportsWithContextualKeywordNames01.ts
@@ -0,0 +1,20 @@
+// @module: commonjs
+// @target: es5
+
+// @filename: t1.ts
+let set = {
+    set foo(x: number) {
+    }
+}
+let get = 10;
+
+export { set, get };
+
+// @filename: t2.ts 
+import * as set from "./t1";
+
+// @filename: t3.ts 
+import { set as yield } from "./t1";
+
+// @filename: t4.ts 
+import { get } from "./t1";
\ No newline at end of file