Treat await as a reserved word when parsing as a module.

Fixes jquery#1234 Closes jquerygh-1235
ariya · Jul 14, 2015 · 3b17c76 · 3b17c76
1 parent 5917ae4
commit 3b17c76
Show file tree

Hide file tree

Showing 11 changed files with 223 additions and 0 deletions.
diff --git a/esprima.js b/esprima.js
@@ -3173,6 +3173,9 @@
         node = new Node();
 
         if (type === Token.Identifier) {
+            if (sourceType === 'module' && lookahead.value === 'await') {
+                tolerateUnexpectedToken(lookahead);
+            }
             expr = node.finishIdentifier(lex().value);
         } else if (type === Token.StringLiteral || type === Token.NumericLiteral) {
             isAssignmentTarget = isBindingElement = false;
@@ -3933,6 +3936,8 @@
             } else {
                 throwUnexpectedToken(token);
             }
+        } else if (sourceType === 'module' && token.type === Token.Identifier && token.value === 'await') {
+            tolerateUnexpectedToken(token);
         }
 
         return node.finishIdentifier(token.value);

diff --git a/test/fixtures/ES6/identifier/invalid_expression_await.js b/test/fixtures/ES6/identifier/invalid_expression_await.js
@@ -0,0 +1 @@
+export var answer = await + 1;
diff --git a/test/fixtures/ES6/identifier/invalid_expression_await.module.json b/test/fixtures/ES6/identifier/invalid_expression_await.module.json
@@ -0,0 +1 @@
+{"index":20,"lineNumber":1,"column":21,"message":"Error: Line 1: Unexpected identifier","description":"Unexpected identifier"}
diff --git a/test/fixtures/ES6/identifier/invalid_function_wait.js b/test/fixtures/ES6/identifier/invalid_function_wait.js
@@ -0,0 +1 @@
+function await() {}
diff --git a/test/fixtures/ES6/identifier/invalid_function_wait.module.json b/test/fixtures/ES6/identifier/invalid_function_wait.module.json
@@ -0,0 +1 @@
+{"index":9,"lineNumber":1,"column":10,"message":"Error: Line 1: Unexpected identifier","description":"Unexpected identifier"}
diff --git a/test/fixtures/ES6/identifier/invalid_var_await.js b/test/fixtures/ES6/identifier/invalid_var_await.js
@@ -0,0 +1 @@
+export var await;
diff --git a/test/fixtures/ES6/identifier/invalid_var_await.module.json b/test/fixtures/ES6/identifier/invalid_var_await.module.json
@@ -0,0 +1 @@
+{"index":11,"lineNumber":1,"column":12,"message":"Error: Line 1: Unexpected identifier","description":"Unexpected identifier"}
diff --git a/test/fixtures/ES6/identifier/module_await.js b/test/fixtures/ES6/identifier/module_await.js
@@ -0,0 +1 @@
+await = 0;
diff --git a/test/fixtures/ES6/identifier/module_await.tree.json b/test/fixtures/ES6/identifier/module_await.tree.json
@@ -0,0 +1,100 @@
+{
+    "range": [
+        0,
+        10
+    ],
+    "loc": {
+        "start": {
+            "line": 1,
+            "column": 0
+        },
+        "end": {
+            "line": 1,
+            "column": 10
+        }
+    },
+    "type": "Program",
+    "body": [
+        {
+            "range": [
+                0,
+                10
+            ],
+            "loc": {
+                "start": {
+                    "line": 1,
+                    "column": 0
+                },
+                "end": {
+                    "line": 1,
+                    "column": 10
+                }
+            },
+            "type": "ExpressionStatement",
+            "expression": {
+                "range": [
+                    0,
+                    9
+                ],
+                "loc": {
+                    "start": {
+                        "line": 1,
+                        "column": 0
+                    },
+                    "end": {
+                        "line": 1,
+                        "column": 9
+                    }
+                },
+                "type": "AssignmentExpression",
+                "operator": "=",
+                "left": {
+                    "range": [
+                        0,
+                        5
+                    ],
+                    "loc": {
+                        "start": {
+                            "line": 1,
+                            "column": 0
+                        },
+                        "end": {
+                            "line": 1,
+                            "column": 5
+                        }
+                    },
+                    "type": "Identifier",
+                    "name": "await"
+                },
+                "right": {
+                    "range": [
+                        8,
+                        9
+                    ],
+                    "loc": {
+                        "start": {
+                            "line": 1,
+                            "column": 8
+                        },
+                        "end": {
+                            "line": 1,
+                            "column": 9
+                        }
+                    },
+                    "type": "Literal",
+                    "value": 0,
+                    "raw": "0"
+                }
+            }
+        }
+    ],
+    "sourceType": "module",
+    "errors": [
+        {
+            "index": 0,
+            "lineNumber": 1,
+            "column": 1,
+            "message": "Error: Line 1: Unexpected identifier"
+        }
+    ]
+}
diff --git a/test/fixtures/ES6/identifier/valid_await.js b/test/fixtures/ES6/identifier/valid_await.js
@@ -0,0 +1 @@
+var await; (await);
diff --git a/test/fixtures/ES6/identifier/valid_await.tree.json b/test/fixtures/ES6/identifier/valid_await.tree.json
@@ -0,0 +1,110 @@
+{
+    "range": [
+        0,
+        19
+    ],
+    "loc": {
+        "start": {
+            "line": 1,
+            "column": 0
+        },
+        "end": {
+            "line": 1,
+            "column": 19
+        }
+    },
+    "type": "Program",
+    "body": [
+        {
+            "range": [
+                0,
+                10
+            ],
+            "loc": {
+                "start": {
+                    "line": 1,
+                    "column": 0
+                },
+                "end": {
+                    "line": 1,
+                    "column": 10
+                }
+            },
+            "type": "VariableDeclaration",
+            "declarations": [
+                {
+                    "range": [
+                        4,
+                        9
+                    ],
+                    "loc": {
+                        "start": {
+                            "line": 1,
+                            "column": 4
+                        },
+                        "end": {
+                            "line": 1,
+                            "column": 9
+                        }
+                    },
+                    "type": "VariableDeclarator",
+                    "id": {
+                        "range": [
+                            4,
+                            9
+                        ],
+                        "loc": {
+                            "start": {
+                                "line": 1,
+                                "column": 4
+                            },
+                            "end": {
+                                "line": 1,
+                                "column": 9
+                            }
+                        },
+                        "type": "Identifier",
+                        "name": "await"
+                    },
+                    "init": null
+                }
+            ],
+            "kind": "var"
+        },
+        {
+            "range": [
+                11,
+                19
+            ],
+            "loc": {
+                "start": {
+                    "line": 1,
+                    "column": 11
+                },
+                "end": {
+                    "line": 1,
+                    "column": 19
+                }
+            },
+            "type": "ExpressionStatement",
+            "expression": {
+                "range": [
+                    12,
+                    17
+                ],
+                "loc": {
+                    "start": {
+                        "line": 1,
+                        "column": 12
+                    },
+                    "end": {
+                        "line": 1,
+                        "column": 17
+                    }
+                },
+                "type": "Identifier",
+                "name": "await"
+            }
+        }
+    ]
+}