Less reliance on regexps, more on hacks

acorn.js

@@ -233,7 +233,7 @@
         next();
         expect(_parenL);
         clause.param = parseIdent();
-        if (strict && strictBadWords.test(clause.param.name))
+        if (strict && isStrictBadIdWord(clause.param.name))
           raise(clause.param.start, "Binding " + clause.param.name + " in strict mode");
         expect(_parenR);
         clause.guard = null;
@@ -344,7 +344,7 @@
     for (;;) {
       var decl = startNode();
       decl.id = parseIdent();
-      if (strict && strictBadWords.test(decl.id.name))
+      if (strict && isStrictBadIdWord(decl.id.name))
         raise(decl.id.start, "Binding " + decl.id.name + " in strict mode");
       decl.init = eat(_eq) ? parseExpression(true, noIn) : null;
       node.declarations.push(finishNode(decl, "VariableDeclarator"));
@@ -386,8 +386,7 @@
     if (strict || node.body.body.length && isUseStrict(node.body.body[0])) {
       for (var i = node.id ? -1 : 0; i < node.params.length; ++i) {
         var id = i < 0 ? node.id : node.params[i];
-        if (strictReservedWords.test(id.name) ||
+        if (isStrictReservedWord(id.name) || isStrictBadIdWord(id.name))
-            strictBadWords.test(id.name))
           raise(id.start, "Defining '" + id.name + "' in strict mode");
         if (i >= 0) for (var j = 0; j < i; ++j) if (id.name === node.params[j].name)
           raise(id.start, "Argument name clash in strict mode");
@@ -433,25 +432,27 @@
         if (options.allowTrailingCommas && eat(_braceR)) break;
       } else first = false;
 
-      var prop = {key: parsePropertyName()};
+      var prop = {key: parsePropertyName()}, isGetSet, kind;
       if (eat(_colon)) {
         prop.value = parseExpression(true);
-        prop.kind = "init";
+        kind = prop.kind = "init";
       } else if (options.ecmaVersion >= 5 && prop.key.type === "Identifier" &&
-                 /^[sg]et$/.test(prop.key.name)) {
+                 (prop.key.name === "get" || prop.key.name === "set")) {
-        prop.kind = prop.key.name;
+        isGetSet = true;
+        kind = prop.kind = prop.key.name;
         prop.key = parsePropertyName();
         if (!tokType === _parenL) unexpected();
         prop.value = parseFunction(startNode(), false);
       } else unexpected();
-      if (prop.key.type === "Identifier") for (var i = 0; i < node.properties.length; ++i) {
+      if (prop.key.type === "Identifier" && (strict || isGetSet)) {
-        var other = node.properties[i];
+        for (var i = 0; i < node.properties.length; ++i) {
-        if (other.key.name === prop.key.name) {
+          var other = node.properties[i];
-          var haveGetSet = /.et/.test(prop.kind) || /.et/.test(other.kind);
+          if (other.key.name === prop.key.name) {
-          var haveInit = prop.kind === "init" || other.kind === "init";
+            var conflict = kind == other.kind || isGetSet && other.kind === "init" ||
-          if (haveGetSet && (other.kind === prop.kind || haveInit) ||
+              kind === "init" && (other.kind === "get" || other.kind === "set");
-              strict && prop.kind === "init" && other.kind === "init")
+            if (conflict && !strict && kind === "init" && other.kind === "init") conflict = false;
-            raise(prop.key.start, "Redefinition of property");
+            if (conflict) raise(prop.key.start, "Redefinition of property");
+          }
         }
       }
       node.properties.push(prop);
@@ -618,9 +619,9 @@
   }
 
   function checkLVal(expr) {
-    if (!/^(?:Identifier|Member)/.test(expr.type))
+    if (expr.type !== "Identifier" && expr.type !== "MemberExpression")
       raise(expr.start, "Assigning to rvalue");
-    if (strict && expr.type === "Identifier" && strictBadWords.test(expr.name))
+    if (strict && expr.type === "Identifier" && isStrictBadIdWord(expr.name))
       raise(expr.start, "Assigning to " + expr.name + " in strict mode");
   }
 
@@ -649,31 +650,61 @@
                       "typeof": {keyword: "typeof", prefix: true},
                       "void": {keyword: "void", prefix: true},
                       "delete": {keyword: "delete", prefix: true}};
-  var keywords = /^(?:break|case|catch|continue|debugger|default|do|else|finally|for|function|if|return|switch|throw|try|var|while|with|null|true|false|instanceof|typeof|void|delete|new|in)$/;
+  var isKeyword = makePredicate("break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in");
 
-  var _bracketL = {type: "[", beforeExpr: true}, _bracketR = {type: "]"}, _braceL = {type: "{", beforeExpr: true}, _braceR = {type: "}"}, _parenL = {type: "(", beforeExpr: true}, _parenR = {type: ")"}, _comma = {type: ",", beforeExpr: true}, _semi = {type: ";", beforeExpr: true}, _colon = {type: ":", beforeExpr: true}, _dot = {type: "."}, _question = {type: "?", beforeExpr: true};
+  var _bracketL = {type: "[", beforeExpr: true}, _bracketR = {type: "]"}, _braceL = {type: "{", beforeExpr: true};
-  var puncTypes = {"[": _bracketL, "]": _bracketR, "{": _braceL, "}": _braceR, "(": _parenL,
+  var _braceR = {type: "}"}, _parenL = {type: "(", beforeExpr: true}, _parenR = {type: ")"};
-                   ")": _parenR, ",": _comma, ";": _semi, ":": _colon, ".": _dot, "?": _question};
+  var _comma = {type: ",", beforeExpr: true}, _semi = {type: ";", beforeExpr: true};
-  var puncChars = /[\[\]\{\}\(\),;:\.\?]/;
+  var _colon = {type: ":", beforeExpr: true}, _dot = {type: "."}, _question = {type: "?", beforeExpr: true};
 
   var _slash = {binop: 10, beforeExpr: true}, _eq = {isAssign: true, beforeExpr: true};
-  var opTypes = {"/": _slash, "=": _eq};
+  var _assign = {isAssign: true, beforeExpr: true}, _plusmin = {binop: 9, prefix: true, beforeExpr: true};
-  opTypes["+"] = opTypes["-"] = {binop: 9, prefix: true, beforeExpr: true};
+  var _incdec = {postfix: true, prefix: true, isUpdate: true}, _prefix = {prefix: true, beforeExpr: true};
-  opTypes["++"] = opTypes["--"] = {postfix: true, prefix: true, isUpdate: true};
+  var _bin1 = {binop: 1, beforeExpr: true}, _bin2 = {binop: 2, beforeExpr: true};
-  opTypes["~"] = opTypes["!"] = {prefix: true, beforeExpr: true};
+  var _bin3 = {binop: 3, beforeExpr: true}, _bin4 = {binop: 4, beforeExpr: true};
-  var binopPrecs = [1, "||", 2, "&&", 3, "|", 4, "^", 5, "&", 6, "==", "===", "!=", "!==",
+  var _bin5 = {binop: 5, beforeExpr: true}, _bin6 = {binop: 6, beforeExpr: true};
-                    7, "<", ">", "<=", ">=", 8, ">>", "<<", ">>>", 10, "*", "%"];
+  var _bin7 = {binop: 7, beforeExpr: true}, _bin8 = {binop: 8, beforeExpr: true};
-  for (var i = 0, curPrec; i < binopPrecs.length; ++i)
+  var _bin10 = {binop: 10, beforeExpr: true};
-    if (typeof binopPrecs[i] === "number") curPrec = binopPrecs[i];
-    else opTypes[binopPrecs[i]] = {binop: curPrec, beforeExpr: true};
-  var assignOps = ["+=", "-=", "/=", "*=", "%=", ">>=", ">>>=", "<<=", "|=", "^=", "&="];
-  for (var i = 0, typeObj = {isAssign: true, beforeExpr: true}; i < assignOps.length; ++i)
-    opTypes[assignOps[i]] = typeObj;
 
-  var reservedWords3 = /^(?:abstract|boolean|byte|char|class|double|enum|export|extends|final|float|goto|implements|import|int|interface|long|native|package|private|protected|public|short|static|super|synchronized|throws|transient|volatile)$/;
+  var isReservedWord3 = makePredicate("abstract boolean byte char class double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile");
-  var reservedWords5 = /^(?:class|enum|extends|super|const|export|import)$/;
+  var isReservedWord5 = makePredicate("class enum extends super const export import");
-  var strictReservedWords = /^(?:implements|interface|let|package|private|protected|public|static|yield)$/;
+
-  var strictBadWords = /^(?:eval|arguments)$/;
+  function isStrictBadIdWord(str) {
+    return str === "eval" || str === "arguments";
+  }
+  var isStrictReservedWord = makePredicate("implements interface let package private protected public static yield");
+
+  function makePredicate(words) {
+    words = words.split(" ");
+    var f = "(function(str){", cats = [];
+    out: for (var i = 0; i < words.length; ++i) {
+      for (var j = 0; j < cats.length; ++j)
+        if (cats[j][0].length == words[i].length) {
+          cats[j].push(words[i]);
+          continue out;
+        }
+      cats.push([words[i]]);
+    }
+    function compareTo(arr) {
+      if (arr.length == 1) return f += "return str === " + JSON.stringify(arr[0]) + ";";
+      f += "switch(str){";
+      for (var i = 0; i < arr.length; ++i) f += "case " + JSON.stringify(arr[i]) + ":";
+      f += "return true}return false;";
+    }
+    if (cats.length > 3) {
+      cats.sort(function(a, b) {return b.length - a.length;});
+      f += "switch(str.length){";
+      for (var i = 0; i < cats.length; ++i) {
+        var cat = cats[i];
+        f += "case " + cat[0].length + ":";
+        compareTo(cat);
+      }
+      f += "}";
+    } else {
+      compareTo(words);
+    }
+    return (1, eval)(f + "})");
+  }
 
   // CHARACTER CATEGORIES
 
@@ -685,8 +716,6 @@
   var nonASCIIidentifierChars = "\u0371-\u0374\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u0620-\u0649\u0672-\u06d3\u06e7-\u06e8\u06fb-\u06fc\u0730-\u074a\u0800-\u0814\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0840-\u0857\u08e4-\u08fe\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962-\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09d7\u09df-\u09e0\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2-\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b5f-\u0b60\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c01-\u0c03\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62-\u0c63\u0c66-\u0c6f\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2-\u0ce3\u0ce6-\u0cef\u0d02\u0d03\u0d46-\u0d48\u0d57\u0d62-\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e34-\u0e3a\u0e40-\u0e45\u0e50-\u0e59\u0eb4-\u0eb9\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f41-\u0f47\u0f71-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u1000-\u1029\u1040-\u1049\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u170e-\u1710\u1720-\u1730\u1740-\u1750\u1772\u1773\u1780-\u17b2\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u1920-\u192b\u1930-\u193b\u1951-\u196d\u19b0-\u19c0\u19c8-\u19c9\u19d0-\u19d9\u1a00-\u1a15\u1a20-\u1a53\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1b46-\u1b4b\u1b50-\u1b59\u1b6b-\u1b73\u1bb0-\u1bb9\u1be6-\u1bf3\u1c00-\u1c22\u1c40-\u1c49\u1c5b-\u1c7d\u1cd0-\u1cd2\u1d00-\u1dbe\u1e01-\u1f15\u200c\u200d\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2d81-\u2d96\u2de0-\u2dff\u3021-\u3028\u3099\u309a\ua640-\ua66d\ua674-\ua67d\ua69f\ua6f0-\ua6f1\ua7f8-\ua800\ua806\ua80b\ua823-\ua827\ua880-\ua881\ua8b4-\ua8c4\ua8d0-\ua8d9\ua8f3-\ua8f7\ua900-\ua909\ua926-\ua92d\ua930-\ua945\ua980-\ua983\ua9b3-\ua9c0\uaa00-\uaa27\uaa40-\uaa41\uaa4c-\uaa4d\uaa50-\uaa59\uaa7b\uaae0-\uaae9\uaaf2-\uaaf3\uabc0-\uabe1\uabec\uabed\uabf0-\uabf9\ufb20-\ufb28\ufe00-\ufe0f\ufe20-\ufe26\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f";
   var nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]");
   var nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]");
-  var identifierStart = /[a-zA-Z_$]/, identifier = /[a-zA-Z_$0-9]+/, identifierG = /[a-zA-Z_$0-9]+/g
-  var digit = /\d/, sign = /[-+]/;
   var newline = /[\n\r\u2028\u2029]/;
   var lineBreak = /\r\n?|[\n\r\u2028\u2029]/g;
 
@@ -786,22 +815,86 @@
     if (forceRegexp) return readRegexp();
     if (tokPos >= inputLen) return finishToken(_eof);
 
-    var ch = input.charAt(tokPos), next;
+    var code = input.charCodeAt(tokPos), next = input.charCodeAt(tokPos+1);
-    if (identifierStart.test(ch)) return readWord();
+    if (isIdentifierStart(code) || code === 92) return readWord();
-    if (ch === "." && digit.test(input.charAt(tokPos+1))) return readNumber(ch);
+
-    if (puncChars.test(ch)) {++tokPos; return finishToken(puncTypes[ch], null);}
+    switch(code) {
-    if (digit.test(ch)) {
+    case 46: // '.'
-      var nextCh = input.charAt(tokPos+1);
+      if (next >= 48 && next <= 57) return readNumber(String.fromCharCode(code));
-      if (ch === "0" && nextCh === "x" || nextCh === "X") return readHexNumber();
+      ++tokPos;
-      else return readNumber(ch);
+      return finishToken(_dot);
+    case 40: ++tokPos; return finishToken(_parenL);
+    case 41: ++tokPos; return finishToken(_parenR);
+    case 59: ++tokPos; return finishToken(_semi);
+    case 44: ++tokPos; return finishToken(_comma);
+    case 91: ++tokPos; return finishToken(_bracketL);
+    case 93: ++tokPos; return finishToken(_bracketR);
+    case 123: ++tokPos; return finishToken(_braceL);
+    case 125: ++tokPos; return finishToken(_braceR);
+    case 58: ++tokPos; return finishToken(_colon);
+    case 63: ++tokPos; return finishToken(_question);
+    case 48: case 49: case 50: case 51: case 52: case 53: case 54: case 55: case 56: case 57: // 0-9
+      if (code === 48 && (next === 120 || next === 88)) return readHexNumber();
+      return readNumber(String.fromCharCode(code));
+    case 34: case 39: // '"', "'"
+      return readString(String.fromCharCode(code));
+
+    // Operators
+
+    case 47: // '/'
+      if (tokRegexpAllowed) {++tokPos; return readRegexp();}
+      if (next === 61) return finishOp(_assign, 2);
+      return finishOp(_slash, 1);
+
+    case 37: case 42: // '%*'
+      if (next === 61) return finishOp(_assign, 2);
+      return finishOp(_bin10, 1);
+
+    case 124: case 38: // '|&'
+      if (next === code) return finishOp(code === 124 ? _bin1 : _bin2, 2);
+      if (next === 61) return finishOp(_assign, 2);
+      return finishOp(code === 124 ? _bin3 : _bin5, 1);
+
+    case 94: // '^'
+      if (next === 61) return finishOp(_assign, 2);
+      return finishOp(_bin4, 1);
+
+    case 43: case 45: // '+-'
+      if (next === code) return finishOp(_incdec, 2);
+      if (next === 61) return finishOp(_assign, 2);
+      return finishOp(_plusmin, 1);
+
+    case 60: case 62: // '<>'
+      var size = 1;
+      if (next === code) {
+        size = code === 62 && input.charCodeAt(tokPos+2) === 62 ? 3 : 2;
+        if (input.charCodeAt(tokPos + size) === 61) return finishOp(_assign, size + 1);
+        return finishOp(_bin8, size);
+      }
+      if (next === 61)
+        size = input.charCodeAt(tokPos+2) === 61 ? 3 : 2;
+      return finishOp(_bin7, size);
+
+    case 61: case 33: // '=!'
+      if (next === 61) return finishOp(_bin6, input.charCodeAt(tokPos+2) === 61 ? 3 : 2);
+      return finishOp(code === 61 ? _eq : _prefix, 1);
+
+    case 126: // '~'
+      if (next === 61) return finishOp(_assign, 2);
+      return finishOp(_prefix, 1);
     }
-    if (ch === '"' || ch === "'") return readString(ch);
+
-    if (ch === "/" && tokRegexpAllowed) {++tokPos; return readRegexp();}
+    var ch = String.fromCharCode(code);
-    if (operatorChar.test(ch)) return readOperator(ch);
+    if (ch === "\\" || nonASCIIidentifierStart.test(ch)) return readWord();
-    if (ch === "\\" || nonASCIIidentifierStart.test(ch)) return readWord(true);
     raise(tokPos, "Unexpected character '" + ch + "'");
   }
 
+  function finishOp(type, size) {
+    var str = input.slice(tokPos, tokPos + size);
+    tokPos += size;
+    finishToken(type, str);
+  }
+
   function readRegexp() {
     var content = "", escaped, inClass, start = tokPos;
     for (;;) {
@@ -818,7 +911,7 @@
     }
     var content = input.slice(start, tokPos);
     ++tokPos;
-    var mods = readWord1(true);
+    var mods = readWord1();
     if (!reModifiers.test(mods)) raise(start, "Invalid regexp flag");
     return finishToken(_regexp, new RegExp(content, mods));
   }
@@ -844,7 +937,7 @@
     tokPos += 2; // 0x
     var val = readInt(16);
     if (val == null) raise(tokStart + 2, "Expected hexadecimal number");
-    if (identifierStart.test(input.charAt(tokPos))) raise(tokPos, "Identifier directly after number");
+    if (isIdentifierStart(input.charCodeAt(tokPos))) raise(tokPos, "Identifier directly after number");
     return finishToken(_num, val);
   }
 
@@ -852,16 +945,18 @@
     var start = tokPos, isFloat = ch === ".";
     if (!isFloat && readInt(10) == null) raise(start, "Invalid number");
     if (isFloat || input.charAt(tokPos) === ".") {
-      if (sign.test(input.charAt(++tokPos))) ++tokPos;
+      var next = input.charAt(++tokPos);
-      if (readInt(10) == null) raise(start, "Invalid number");
+      if (next === "-" || next === "+") ++tokPos;
+      if (readInt(10) === null) raise(start, "Invalid number");
       isFloat = true;
     }
     if (/e/i.test(input.charAt(tokPos))) {
-      if (sign.test(input.charAt(++tokPos))) ++tokPos;
+      var next = input.charAt(++tokPos);
-      if (readInt(10) == null) raise(start, "Invalid number")
+      if (next === "-" || next === "+") ++tokPos;
+      if (readInt(10) === null) raise(start, "Invalid number")
       isFloat = true;
     }
-    if (identifierStart.test(input.charAt(tokPos))) raise(tokPos, "Identifier directly after number");
+    if (isIdentifierStart(input.charCodeAt(tokPos))) raise(tokPos, "Identifier directly after number");
 
     var str = input.slice(start, tokPos), val;
     if (isFloat) val = parseFloat(str);
@@ -924,65 +1019,61 @@
   }
 
   function readHexChar(len) {
+    var aa = tokPos;
     var n = readInt(16, len);
-    if (n == null) raise(tokStart, "Bad character escape sequence");
+    if (n === null) raise(tokStart, "Bad character escape sequence");
     return String.fromCharCode(n);
   }
 
-  function readOperator(op) {
+  function isIdentifierStart(code) {
-    for (;;) {
+    return (code >= 65 && code <= 90) || (code >= 97 && code <= 122) ||
-      var ch = input.charAt(++tokPos), nextOp;
+      code === 36 || code === 95 ||
-      if (!operatorChar.test(ch) || !opTypes.hasOwnProperty(nextOp = op + ch)) break;
+      (code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code)));
-      op = nextOp;
+  }
-    }
+
-    return finishToken(opTypes[op], op);
+  function isIdentifierChar(ch) {
+    return ((ch >= "a" && ch <= "z") || (ch >= "A" && ch <= "Z") ||
+            (ch >= "0" && ch <= "9") || ch === "$" || ch === "_" ||
+            (ch >= "\xaa" && nonASCIIidentifier.test(ch)));
   }
 
   var containsEsc;
-  function readWord1(startSpecial) {
+  function readWord1() {
     containsEsc = false;
-    var word, first, escaped;
+    var word = "", first = true;
-    if (startSpecial) {
-      word = ""; first = true;
-    } else {
-      identifierG.lastIndex = tokPos;
-      word = identifierG.exec(input)[0];
-      tokPos += word.length;
-      var code = input.charCodeAt(tokPos);
-      if (code < 256 && code !== 92) return word;
-    }
     for (;;) {
       var ch = input.charAt(tokPos);
-      if (!escaped) {
+      if ((ch >= "a" && ch <= "z") || (ch >= "A" && ch <= "Z") ||
-        if (ch === "\\") {}
+          (ch >= "0" && ch <= "9") || ch === "$" || ch === "_" ||
-        else if ((ch <= "\xff" ? identifier : nonASCIIidentifier).test(ch)) word += ch;
+          (ch >= "\xaa" && nonASCIIidentifier.test(ch))) {
-        else break;
+        word += ch;
         ++tokPos;
-      } else {
+      } else if (ch === "\\") {
-        if (ch !== "u") raise(tokPos, "Expecting Unicode escape sequence \\uXXXX");
+        containsEsc = true;
+        if (input.charAt(++tokPos) != "u")
+          raise(tokPos, "Expecting Unicode escape sequence \\uXXXX");
         ++tokPos;
         var esc = readHexChar(4);
         if (!esc) raise(tokPos - 1, "Invalid Unicode escape");
-        var re = esc <= "\xff" ? (first ? identifier : identifierStart)
+        if (!(first ? isIdentifierStart(esc.charCodeAt(0)) : isIdentifierChar(esc)))
-                               : (first ? nonASCIIidentifier : nonASCIIidentifierStart);
+          raise(tokPos - 4, "Invalid Unicode escape");
-        if (!re.test(esc)) raise(tokPos - 4, "Invalid Unicode escape");
         word += esc;
+      } else {
+        break;
       }
-      escaped = ch === "\\";
-      if (escaped) containsEsc = true;
       first = false;
     }
     return word;
   }
 
-  function readWord(startSpecial) {
+  function readWord() {
-    var word = readWord1(startSpecial);
+    var word = readWord1();
     var type = _name;
     if (!containsEsc) {
-      if (keywords.test(word)) type = keywordTypes[word];
+      if (isKeyword(word)) type = keywordTypes[word];
       else if (options.forbidReserved &&
-               (options.ecmaVersion === 3 ? reservedWords3 : reservedWords5).test(word) ||
+               (options.ecmaVersion === 3 ? isReservedWord3 : isReservedWord5)(word) ||
-               strict && strictReservedWords.test(word))
+               strict && isStrictReservedWord(word))
         raise(tokStart, "The keyword '" + word + "' is reserved");
     }
     return finishToken(type, word);

test/jquery-string.js

@@ -1,5 +1,4 @@
-// Silly noise to be able to load in source code without doing an XMLHttpReq
+/* Silly noise to be able to load in source code without doing an XMLHttpReq */var jquery164 = "/*!\n\
-var jquery164 = "/*!\n\
  * jQuery JavaScript Library v1.6.4\n\
  * http://jquery.com/\n\
  *\n\