Throw error for reserved words enum and await (#195)

* Throw error for reserved words enum and await when source type is module

* Extract reserved word check into method

* Fix tests

src/parser/expression.js

@@ -827,13 +827,7 @@ pp.parseObjPropValue = function (prop, startPos, startLoc, isGenerator, isAsync,
 
   if (!prop.computed && prop.key.type === "Identifier") {
     if (isPattern) {
-      let illegalBinding = this.isKeyword(prop.key.name);
-      if (!illegalBinding && this.state.strict) {
-        illegalBinding = reservedWords.strictBind(prop.key.name) || reservedWords.strict(prop.key.name);
-      }
-      if (illegalBinding) {
-        this.raise(prop.key.start, "Binding " + prop.key.name);
-      }
+      this.checkReservedWord(prop.key.name, prop.key.start, true, true);
       prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key.__clone());
     } else if (this.match(tt.eq) && refShorthandDefaultPos) {
       if (!refShorthandDefaultPos.start) {
@@ -843,6 +837,7 @@ pp.parseObjPropValue = function (prop, startPos, startLoc, isGenerator, isAsync,
     } else {
       prop.value = prop.key.__clone();
     }
+
     prop.shorthand = true;
     return this.finishNode(prop, "ObjectProperty");
   }
@@ -998,8 +993,8 @@ pp.parseIdentifier = function (liberal) {
   let node = this.startNode();
 
   if (this.match(tt.name)) {
-    if (!liberal && this.state.strict && reservedWords.strict(this.state.value)) {
-      this.raise(this.state.start, "The keyword '" + this.state.value + "' is reserved");
+    if (!liberal) {
+      this.checkReservedWord(this.state.value, this.state.start, false, false);
     }
 
     node.name = this.state.value;
@@ -1019,6 +1014,16 @@ pp.parseIdentifier = function (liberal) {
   return this.finishNode(node, "Identifier");
 };
 
+pp.checkReservedWord = function (word, startLoc, checkKeywords, isBinding) {
+  if (this.isReservedWord(word) || (checkKeywords && this.isKeyword(word))) {
+    this.raise(startLoc, word + " is a reserved word");
+  }
+
+  if (this.state.strict && (reservedWords.strict(word) || (isBinding && reservedWords.strictBind(word)))) {
+    this.raise(startLoc, word + " is a reserved word in strict mode");
+  }
+};
+
 // Parses await expression inside async function.
 
 pp.parseAwait = function (node) {

src/parser/index.js

@@ -11,7 +11,6 @@ export default class Parser extends Tokenizer {
 
     this.options = options;
     this.inModule = this.options.sourceType === "module";
-    this.isReservedWord = reservedWords[6];
     this.input = input;
     this.plugins = this.loadPlugins(this.options.plugins);
     this.filename = options.sourceFilename;
@@ -22,6 +21,14 @@ export default class Parser extends Tokenizer {
     }
   }
 
+  isReservedWord(word: string): boolean {
+    if (word === "await") {
+      return this.inModule;
+    } else {
+      return reservedWords[6](word);
+    }
+  }
+
   hasPlugin(name: string): boolean {
     return !!(this.plugins["*"] || this.plugins[name]);
   }

src/parser/lval.js

@@ -2,7 +2,6 @@
 
 import { types as tt } from "../tokenizer/types";
 import Parser from "./index";
-import { reservedWords } from "../util/identifier";
 
 const pp = Parser.prototype;
 
@@ -204,9 +203,7 @@ pp.parseMaybeDefault = function (startPos, startLoc, left) {
 pp.checkLVal = function (expr, isBinding, checkClashes, contextDescription) {
   switch (expr.type) {
     case "Identifier":
-      if (this.state.strict && (reservedWords.strictBind(expr.name) || reservedWords.strict(expr.name))) {
-        this.raise(expr.start, (isBinding ? "Binding " : "Assigning to ") + expr.name + " in strict mode");
-      }
+      this.checkReservedWord(expr.name, expr.start, false, true);
 
       if (checkClashes) {
         // we need to prefix this with an underscore for the cases where we have a key of

test/fixtures/core/uncategorised/428/options.json

@@ -1,3 +1,3 @@
 {
   "throws": "Unexpected token (1:8)"
-}
+}

test/fixtures/core/uncategorised/468/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:36)"
-}
+  "throws": "eval is a reserved word in strict mode (1:36)"
+}

test/fixtures/core/uncategorised/469/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:36)"
-}
+  "throws": "arguments is a reserved word in strict mode (1:36)"
+}

test/fixtures/core/uncategorised/470/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:47)"
-}
+  "throws": "eval is a reserved word in strict mode (1:47)"
+}

test/fixtures/core/uncategorised/471/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:47)"
-}
+  "throws": "arguments is a reserved word in strict mode (1:47)"
+}

test/fixtures/core/uncategorised/472/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:32)"
-}
+  "throws": "eval is a reserved word in strict mode (1:32)"
+}

test/fixtures/core/uncategorised/473/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:32)"
-}
+  "throws": "arguments is a reserved word in strict mode (1:32)"
+}

test/fixtures/core/uncategorised/474/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:34)"
-}
+  "throws": "eval is a reserved word in strict mode (1:34)"
+}

test/fixtures/core/uncategorised/475/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:34)"
-}
+  "throws": "eval is a reserved word in strict mode (1:34)"
+}

test/fixtures/core/uncategorised/476/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:34)"
-}
+  "throws": "arguments is a reserved word in strict mode (1:34)"
+}

test/fixtures/core/uncategorised/477/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:34)"
-}
+  "throws": "arguments is a reserved word in strict mode (1:34)"
+}

test/fixtures/core/uncategorised/478/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:32)"
-}
+  "throws": "eval is a reserved word in strict mode (1:32)"
+}

test/fixtures/core/uncategorised/479/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:32)"
-}
+  "throws": "eval is a reserved word in strict mode (1:32)"
+}

test/fixtures/core/uncategorised/480/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:32)"
-}
+  "throws": "arguments is a reserved word in strict mode (1:32)"
+}

test/fixtures/core/uncategorised/481/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:32)"
-}
+  "throws": "arguments is a reserved word in strict mode (1:32)"
+}

test/fixtures/core/uncategorised/482/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:41)"
-}
+  "throws": "eval is a reserved word in strict mode (1:41)"
+}

test/fixtures/core/uncategorised/483/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:41)"
-}
+  "throws": "arguments is a reserved word in strict mode (1:41)"
+}

test/fixtures/core/uncategorised/484/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:9)"
-}
+  "throws": "eval is a reserved word in strict mode (1:9)"
+}

test/fixtures/core/uncategorised/485/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:9)"
-}
+  "throws": "arguments is a reserved word in strict mode (1:9)"
+}

test/fixtures/core/uncategorised/486/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:42)"
-}
+  "throws": "eval is a reserved word in strict mode (1:42)"
+}

test/fixtures/core/uncategorised/487/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:42)"
-}
+  "throws": "arguments is a reserved word in strict mode (1:42)"
+}

test/fixtures/core/uncategorised/488/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:10)"
-}
+  "throws": "eval is a reserved word in strict mode (1:10)"
+}

test/fixtures/core/uncategorised/489/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:10)"
-}
+  "throws": "arguments is a reserved word in strict mode (1:10)"
+}

test/fixtures/core/uncategorised/490/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:47)"
-}
+  "throws": "eval is a reserved word in strict mode (1:47)"
+}

test/fixtures/core/uncategorised/491/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding package in strict mode (1:10)"
-}
+  "throws": "package is a reserved word in strict mode (1:10)"
+}

test/fixtures/core/uncategorised/492/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:48)"
-}
+  "throws": "eval is a reserved word in strict mode (1:48)"
+}

test/fixtures/core/uncategorised/493/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:41)"
-}
+  "throws": "eval is a reserved word in strict mode (1:41)"
+}

test/fixtures/core/uncategorised/494/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:49)"
-}
+  "throws": "eval is a reserved word in strict mode (1:49)"
+}

test/fixtures/core/uncategorised/495/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:15)"
-}
+  "throws": "eval is a reserved word in strict mode (1:15)"
+}

test/fixtures/core/uncategorised/496/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:15)"
-}
+  "throws": "arguments is a reserved word in strict mode (1:15)"
+}

test/fixtures/core/uncategorised/497/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:48)"
-}
+  "throws": "eval is a reserved word in strict mode (1:48)"
+}

test/fixtures/core/uncategorised/498/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:48)"
-}
+  "throws": "arguments is a reserved word in strict mode (1:48)"
+}

test/fixtures/core/uncategorised/504/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding implements in strict mode (1:37)"
+  "throws": "implements is a reserved word in strict mode (1:37)"
 }

test/fixtures/core/uncategorised/505/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding interface in strict mode (1:37)"
+  "throws": "interface is a reserved word in strict mode (1:37)"
 }

test/fixtures/core/uncategorised/506/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding package in strict mode (1:37)"
+  "throws": "package is a reserved word in strict mode (1:37)"
 }

test/fixtures/core/uncategorised/507/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding private in strict mode (1:37)"
+  "throws": "private is a reserved word in strict mode (1:37)"
 }

test/fixtures/core/uncategorised/508/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding protected in strict mode (1:37)"
+  "throws": "protected is a reserved word in strict mode (1:37)"
 }

test/fixtures/core/uncategorised/509/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding public in strict mode (1:37)"
+  "throws": "public is a reserved word in strict mode (1:37)"
 }

test/fixtures/core/uncategorised/510/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding static in strict mode (1:37)"
+  "throws": "static is a reserved word in strict mode (1:37)"
 }

test/fixtures/core/uncategorised/511/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding static in strict mode (1:15)"
-}
+  "throws": "static is a reserved word in strict mode (1:15)"
+}

test/fixtures/core/uncategorised/512/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding static in strict mode (1:9)"
-}
+  "throws": "static is a reserved word in strict mode (1:9)"
+}

test/fixtures/core/uncategorised/513/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "The keyword 'static' is reserved (1:23)"
+  "throws": "static is a reserved word in strict mode (1:23)"
 }

test/fixtures/core/uncategorised/515/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:11)"
-}
+  "throws": "eval is a reserved word in strict mode (1:11)"
+}

test/fixtures/core/uncategorised/516/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding package in strict mode (1:11)"
-}
+  "throws": "package is a reserved word in strict mode (1:11)"
+}

test/fixtures/core/uncategorised/520/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:12)"
-}
+  "throws": "eval is a reserved word in strict mode (1:12)"
+}

test/fixtures/core/uncategorised/521/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Binding package in strict mode (1:12)"
-}
+  "throws": "package is a reserved word in strict mode (1:12)"
+}