Use regexps instead of magic generated functions

Remove need for acorn_csp.js

README.md

@@ -220,20 +220,6 @@ console.log(escodegen.generate(ast, {comment: true}));
 
 [escodegen]: https://github.com/Constellation/escodegen
 
-#### Using Acorn in an environment with a Content Security Policy
-
-Some contexts, such as Chrome Web Apps, disallow run-time code evaluation.
-Acorn uses `new Function` to generate fast functions that test whether
-a word is in a given set, and will trigger a security error when used
-in a context with such a
-[Content Security Policy](http://www.html5rocks.com/en/tutorials/security/content-security-policy/#eval-too)
-(see [#90](https://github.com/marijnh/acorn/issues/90) and
-[#123](https://github.com/marijnh/acorn/issues/123)).
-
-The `dist/acorn_csp.js` file in the distribution (which is built
-by the `bin/without_eval` script) has the generated code inlined, and
-can thus run without evaluating anything.
-
 ### dist/acorn_loose.js ###
 
 This file implements an error-tolerant parser. It exposes a single

dist/acorn_csp.js

@@ -0,0 +1 @@
+acorn.js

package.json

@@ -25,7 +25,7 @@
   },
   "license": "MIT",
   "scripts": {
-    "prepublish": "node bin/build-acorn.js && node bin/without_eval > dist/acorn_csp.js",
+    "prepublish": "node bin/build-acorn.js",
     "test": "node test/run.js"
   },
   "bin": {

src/expression.js

@@ -18,7 +18,6 @@
 
 import {types as tt} from "./tokentype"
 import {Parser} from "./state"
-import {reservedWords} from "./identifier"
 import {has} from "./util"
 
 const pp = Parser.prototype
@@ -510,9 +509,8 @@ pp.parsePropertyValue = function(prop, isPattern, isGenerator, startPos, startLo
     } else if (this.options.ecmaVersion >= 6 && !prop.computed && prop.key.type === "Identifier") {
       prop.kind = "init"
       if (isPattern) {
-        if (this.isKeyword(prop.key.name) ||
-            (this.strict && (reservedWords.strictBind(prop.key.name) || reservedWords.strict(prop.key.name))) ||
-            (!this.options.allowReserved && this.isReservedWord(prop.key.name)))
+        if (this.keywords.test(prop.key.name) ||
+            (this.strict ? this.reservedWordsStrictBind : this.reservedWords).test(prop.key.name))
           this.raise(prop.key.start, "Binding " + prop.key.name)
         prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key)
       } else if (this.type === tt.eq && refShorthandDefaultPos) {
@@ -641,10 +639,9 @@ pp.parseIdent = function(liberal) {
   if (liberal && this.options.allowReserved == "never") liberal = false
   if (this.type === tt.name) {
     if (!liberal &&
-        ((!this.options.allowReserved && this.isReservedWord(this.value)) ||
-         (this.strict && reservedWords.strict(this.value)) &&
-         (this.options.ecmaVersion >= 6 ||
-          this.input.slice(this.start, this.end).indexOf("\\") == -1)))
+        (this.strict ? this.reservedWordsStrict : this.reservedWords).test(this.value) &&
+        (this.options.ecmaVersion >= 6 ||
+         this.input.slice(this.start, this.end).indexOf("\\") == -1))
       this.raise(this.start, "The keyword '" + this.value + "' is reserved")
     node.name = this.value
   } else if (liberal && this.type.keyword) {

src/lval.js

@@ -1,6 +1,5 @@
 import {types as tt} from "./tokentype"
 import {Parser} from "./state"
-import {reservedWords} from "./identifier"
 import {has} from "./util"
 
 const pp = Parser.prototype
@@ -161,7 +160,7 @@ pp.parseMaybeDefault = function(startPos, startLoc, left) {
 pp.checkLVal = function(expr, isBinding, checkClashes) {
   switch (expr.type) {
   case "Identifier":
-    if (this.strict && (reservedWords.strictBind(expr.name) || reservedWords.strict(expr.name)))
+    if (this.strict && this.reservedWordsStrictBind.test(expr.name)) // FIXME match shorter regexp?
       this.raise(expr.start, (isBinding ? "Binding " : "Assigning to ") + expr.name + " in strict mode")
     if (checkClashes) {
       if (has(checkClashes, expr.name))

src/state.js

@@ -6,12 +6,20 @@ import {getOptions} from "./options"
 // Registered plugins
 export const plugins = {}
 
+function keywordRegexp(words) {
+  return new RegExp("^(" + words.replace(/ /g, "|") + ")$")
+}
+
 export class Parser {
   constructor(options, input, startPos) {
     this.options = getOptions(options)
     this.sourceFile = this.options.sourceFile
-    this.isKeyword = keywords[this.options.ecmaVersion >= 6 ? 6 : 5]
-    this.isReservedWord = reservedWords[this.options.ecmaVersion]
+    this.keywords = keywordRegexp(keywords[this.options.ecmaVersion >= 6 ? 6 : 5])
+    let reserved = this.options.allowReserved ? "" : reservedWords[this.options.ecmaVersion]
+    this.reservedWords = keywordRegexp(reserved)
+    let reservedStrict = (reserved ? reserved + " " : "") + reservedWords.strict
+    this.reservedWordsStrict = keywordRegexp(reservedStrict)
+    this.reservedWordsStrictBind = keywordRegexp(reservedStrict + " " + reservedWords.strictBind)
     this.input = String(input)
 
     // Used to signal to callers of `readWord1` whether the word
@@ -71,6 +79,10 @@ export class Parser {
       this.skipLineComment(2)
   }
 
+  // DEPRECATED Kept for backwards compatibility until 3.0 in case a plugin uses them
+  isKeyword(word) { return this.keywords.test(word) }
+  isReservedWord(word) { return this.reservedWords.test(word) }
+
   extend(name, f) {
     this[name] = f(this[name])
   }

src/tokenize.js

@@ -676,7 +676,7 @@ pp.readWord1 = function() {
 pp.readWord = function() {
   let word = this.readWord1()
   let type = tt.name
-  if ((this.options.ecmaVersion >= 6 || !this.containsEsc) && this.isKeyword(word))
+  if ((this.options.ecmaVersion >= 6 || !this.containsEsc) && this.keywords.test(word))
     type = keywordTypes[word]
   return this.finishToken(type, word)
 }