bin/r.js in requirejs-rails-0.9.3 vs bin/r.js in requirejs-rails-0.9.4
- old
+ new
@@ -1,7 +1,7 @@
/**
- * @license r.js 2.1.11 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license r.js 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
/*
@@ -18,11 +18,11 @@
var requirejs, require, define, xpcUtil;
(function (console, args, readFileFunc) {
var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
nodeDefine, exists, reqMain, loadedOptimizedLib, existsForNode, Cc, Ci,
- version = '2.1.11',
+ version = '2.1.14',
jsSuffixRegExp = /\.js$/,
commandOption = '',
useLibLoaded = {},
//Used by jslib/rhino/args.js
rhinoArgs = args,
@@ -49,40 +49,10 @@
exists = function () {
console.log('x.js exists not applicable in browser env');
return false;
};
- } else if (typeof Packages !== 'undefined') {
- env = 'rhino';
-
- fileName = args[0];
-
- if (fileName && fileName.indexOf('-') === 0) {
- commandOption = fileName.substring(1);
- fileName = args[1];
- }
-
- //Set up execution context.
- rhinoContext = Packages.org.mozilla.javascript.ContextFactory.getGlobal().enterContext();
-
- exec = function (string, name) {
- return rhinoContext.evaluateString(this, string, name, 0, null);
- };
-
- exists = function (fileName) {
- return (new java.io.File(fileName)).exists();
- };
-
- //Define a console.log for easier logging. Don't
- //get fancy though.
- if (typeof console === 'undefined') {
- console = {
- log: function () {
- print.apply(undefined, arguments);
- }
- };
- }
} else if (typeof process !== 'undefined' && process.versions && !!process.versions.node) {
env = 'node';
//Get the fs module via Node's require before it
//gets replaced. Used in require/node.js
@@ -119,10 +89,40 @@
if (fileName && fileName.indexOf('-') === 0) {
commandOption = fileName.substring(1);
fileName = process.argv[3];
}
+ } else if (typeof Packages !== 'undefined') {
+ env = 'rhino';
+
+ fileName = args[0];
+
+ if (fileName && fileName.indexOf('-') === 0) {
+ commandOption = fileName.substring(1);
+ fileName = args[1];
+ }
+
+ //Set up execution context.
+ rhinoContext = Packages.org.mozilla.javascript.ContextFactory.getGlobal().enterContext();
+
+ exec = function (string, name) {
+ return rhinoContext.evaluateString(this, string, name, 0, null);
+ };
+
+ exists = function (fileName) {
+ return (new java.io.File(fileName)).exists();
+ };
+
+ //Define a console.log for easier logging. Don't
+ //get fancy though.
+ if (typeof console === 'undefined') {
+ console = {
+ log: function () {
+ print.apply(undefined, arguments);
+ }
+ };
+ }
} else if (typeof Components !== 'undefined' && Components.classes && Components.interfaces) {
env = 'xpconnect';
Components.utils['import']('resource://gre/modules/FileUtils.jsm');
Cc = Components.classes;
@@ -236,11 +236,11 @@
};
}
}
/** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.11 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
//Not using strict: uneven strict support in browsers, #392, and causes
//problems with requirejs.exec()/transpiler plugins that may not be strict.
@@ -249,11 +249,11 @@
(function (global) {
var req, s, head, baseElement, dataMain, src,
interactiveScript, currentlyAddingScript, mainScript, subPath,
- version = '2.1.11',
+ version = '2.1.14',
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
jsSuffixRegExp = /\.js$/,
currDirRegExp = /^\.\//,
op = Object.prototype,
@@ -417,11 +417,11 @@
return;
}
if (typeof requirejs !== 'undefined') {
if (isFunction(requirejs)) {
- //Do not overwrite and existing requirejs instance.
+ //Do not overwrite an existing requirejs instance.
return;
}
cfg = requirejs;
requirejs = undefined;
}
@@ -469,25 +469,24 @@
* all paths that use this function should look normalized.
* NOTE: this method MODIFIES the input array.
* @param {Array} ary the array of path segments.
*/
function trimDots(ary) {
- var i, part, length = ary.length;
- for (i = 0; i < length; i++) {
+ var i, part;
+ for (i = 0; i < ary.length; i++) {
part = ary[i];
if (part === '.') {
ary.splice(i, 1);
i -= 1;
} else if (part === '..') {
- if (i === 1 && (ary[2] === '..' || ary[0] === '..')) {
- //End of the line. Keep at least one non-dot
- //path segment at the front so it can be mapped
- //correctly to disk. Otherwise, there is likely
- //no path mapping for a path starting with '..'.
- //This can still fail, but catches the most reasonable
- //uses of ..
- break;
+ // If at the start, or previous value is still ..,
+ // keep them so that when converted to a path it may
+ // still work when converted to a path, even though
+ // as an ID it is less than ideal. In larger point
+ // releases, may be better to just kick out an error.
+ if (i === 0 || (i == 1 && ary[2] === '..') || ary[i - 1] === '..') {
+ continue;
} else if (i > 0) {
ary.splice(i - 1, 2);
i -= 2;
}
}
@@ -504,47 +503,41 @@
* only be done if this normalization is for a dependency ID.
* @returns {String} normalized name
*/
function normalize(name, baseName, applyMap) {
var pkgMain, mapValue, nameParts, i, j, nameSegment, lastIndex,
- foundMap, foundI, foundStarMap, starI,
- baseParts = baseName && baseName.split('/'),
- normalizedBaseParts = baseParts,
+ foundMap, foundI, foundStarMap, starI, normalizedBaseParts,
+ baseParts = (baseName && baseName.split('/')),
map = config.map,
starMap = map && map['*'];
//Adjust any relative paths.
- if (name && name.charAt(0) === '.') {
- //If have a base name, try to normalize against it,
- //otherwise, assume it is a top-level require that will
- //be relative to baseUrl in the end.
- if (baseName) {
+ if (name) {
+ name = name.split('/');
+ lastIndex = name.length - 1;
+
+ // If wanting node ID compatibility, strip .js from end
+ // of IDs. Have to do this here, and not in nameToUrl
+ // because node allows either .js or non .js to map
+ // to same file.
+ if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
+ name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
+ }
+
+ // Starts with a '.' so need the baseName
+ if (name[0].charAt(0) === '.' && baseParts) {
//Convert baseName to array, and lop off the last part,
//so that . matches that 'directory' and not name of the baseName's
//module. For instance, baseName of 'one/two/three', maps to
//'one/two/three.js', but we want the directory, 'one/two' for
//this normalization.
normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
- name = name.split('/');
- lastIndex = name.length - 1;
-
- // If wanting node ID compatibility, strip .js from end
- // of IDs. Have to do this here, and not in nameToUrl
- // because node allows either .js or non .js to map
- // to same file.
- if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
- name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
- }
-
name = normalizedBaseParts.concat(name);
- trimDots(name);
- name = name.join('/');
- } else if (name.indexOf('./') === 0) {
- // No baseName, so this is ID is resolved relative
- // to baseUrl, pull off the leading dot.
- name = name.substring(2);
}
+
+ trimDots(name);
+ name = name.join('/');
}
//Apply map config if available.
if (applyMap && map && (baseParts || starMap)) {
nameParts = name.split('/');
@@ -616,11 +609,17 @@
if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) {
//Pop off the first array value, since it failed, and
//retry
pathConfig.shift();
context.require.undef(id);
- context.require([id]);
+
+ //Custom require that does not do map translation, since
+ //ID is "absolute", already mapped/resolved.
+ context.makeRequire(null, {
+ skipMap: true
+ })([id]);
+
return true;
}
}
//Turns a plugin!resource to [plugin, resource]
@@ -682,11 +681,20 @@
//Plugin is loaded, use its normalize method.
normalizedName = pluginModule.normalize(name, function (name) {
return normalize(name, parentName, applyMap);
});
} else {
- normalizedName = normalize(name, parentName, applyMap);
+ // If nested plugin references, then do not try to
+ // normalize, as it will not normalize correctly. This
+ // places a restriction on resourceIds, and the longer
+ // term solution is not to normalize until plugins are
+ // loaded and all normalizations to allow for async
+ // loading of a loader plugin. But for now, fixes the
+ // common uses. Details in #1131
+ normalizedName = name.indexOf('!') === -1 ?
+ normalize(name, parentName, applyMap) :
+ name;
}
} else {
//A regular module.
normalizedName = normalize(name, parentName, applyMap);
@@ -2449,11 +2457,11 @@
context.enable(moduleMap, relModuleMap);
}
//Break any cycles by requiring it normally, but this will
//finish synchronously
- require([moduleName]);
+ context.require([moduleName]);
//The above calls are sync, so can do the next thing safely.
ret = context.defined[moduleName];
} finally {
context.nextTick = oldTick;
@@ -2598,14 +2606,14 @@
*/
(function () {
var pathRegExp = /(\/|^)env\/|\{env\}/,
env = 'unknown';
- if (typeof Packages !== 'undefined') {
- env = 'rhino';
- } else if (typeof process !== 'undefined' && process.versions && !!process.versions.node) {
+ if (typeof process !== 'undefined' && process.versions && !!process.versions.node) {
env = 'node';
+ } else if (typeof Packages !== 'undefined') {
+ env = 'rhino';
} else if ((typeof navigator !== 'undefined' && typeof document !== 'undefined') ||
(typeof importScripts !== 'undefined' && typeof self !== 'undefined')) {
env = 'browser';
} else if (typeof Components !== 'undefined' && Components.classes && Components.interfaces) {
env = 'xpconnect';
@@ -2633,11 +2641,12 @@
req([name], function (mod) {
load(mod);
});
}
});
-}());/**
+}());
+/**
* @license Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
@@ -2723,11 +2732,36 @@
lang._mixin(dest, parameters[i], override);
}
return dest; // Object
},
+ /**
+ * Does a deep mix of source into dest, where source values override
+ * dest values if a winner is needed.
+ * @param {Object} dest destination object that receives the mixed
+ * values.
+ * @param {Object} source source object contributing properties to mix
+ * in.
+ * @return {[Object]} returns dest object with the modification.
+ */
+ deepMix: function(dest, source) {
+ lang.eachProp(source, function (value, prop) {
+ if (typeof value === 'object' && value &&
+ !lang.isArray(value) && !lang.isFunction(value) &&
+ !(value instanceof RegExp)) {
+ if (!dest[prop]) {
+ dest[prop] = {};
+ }
+ lang.deepMix(dest[prop], value);
+ } else {
+ dest[prop] = value;
+ }
+ });
+ return dest;
+ },
+
/**
* Does a type of deep copy. Do not give it anything fancy, best
* for basic object copies of objects that also work well as
* JSON-serialized things, or has properties pointing to functions.
* For non-array/object values, just returns the same object.
@@ -4487,10 +4521,13 @@
//Just a blank file to use when building the optimizer with the optimizer,
//so that the build does not attempt to inline some env modules,
//like Node's fs and path.
/*
+ Copyright (C) 2013 Ariya Hidayat <ariya.hidayat@gmail.com>
+ Copyright (C) 2013 Thaddee Tyl <thaddee.tyl@gmail.com>
+ Copyright (C) 2013 Mathias Bynens <mathias@qiwi.be>
Copyright (C) 2012 Ariya Hidayat <ariya.hidayat@gmail.com>
Copyright (C) 2012 Mathias Bynens <mathias@qiwi.be>
Copyright (C) 2012 Joost-Wim Boekesteijn <joost-wim@boekesteijn.nl>
Copyright (C) 2012 Kris Kowal <kris.kowal@cixar.com>
Copyright (C) 2012 Yusuke Suzuki <utatane.tea@gmail.com>
@@ -4518,22 +4555,26 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*jslint bitwise:true plusplus:true */
/*global esprima:true, define:true, exports:true, window: true,
-throwError: true, createLiteral: true, generateStatement: true,
+throwErrorTolerant: true,
+throwError: true, generateStatement: true, peek: true,
parseAssignmentExpression: true, parseBlock: true, parseExpression: true,
parseFunctionDeclaration: true, parseFunctionExpression: true,
parseFunctionSourceElements: true, parseVariableIdentifier: true,
parseLeftHandSideExpression: true,
+parseUnaryExpression: true,
parseStatement: true, parseSourceElement: true */
(function (root, factory) {
'use strict';
// Universal Module Definition (UMD) to support AMD, CommonJS/Node.js,
// Rhino, and plain browser loading.
+
+ /* istanbul ignore next */
if (typeof define === 'function' && define.amd) {
define('esprima', ['exports'], factory);
} else if (typeof exports !== 'undefined') {
factory(exports);
} else {
@@ -4542,21 +4583,24 @@
}(this, function (exports) {
'use strict';
var Token,
TokenName,
+ FnExprTokens,
Syntax,
PropertyKind,
Messages,
Regex,
+ SyntaxTreeDelegate,
source,
strict,
index,
lineNumber,
lineStart,
length,
- buffer,
+ delegate,
+ lookahead,
state,
extra;
Token = {
BooleanLiteral: 1,
@@ -4564,11 +4608,12 @@
Identifier: 3,
Keyword: 4,
NullLiteral: 5,
NumericLiteral: 6,
Punctuator: 7,
- StringLiteral: 8
+ StringLiteral: 8,
+ RegularExpression: 9
};
TokenName = {};
TokenName[Token.BooleanLiteral] = 'Boolean';
TokenName[Token.EOF] = '<end>';
@@ -4576,11 +4621,23 @@
TokenName[Token.Keyword] = 'Keyword';
TokenName[Token.NullLiteral] = 'Null';
TokenName[Token.NumericLiteral] = 'Numeric';
TokenName[Token.Punctuator] = 'Punctuator';
TokenName[Token.StringLiteral] = 'String';
+ TokenName[Token.RegularExpression] = 'RegularExpression';
+ // A function following one of those tokens is an expression.
+ FnExprTokens = ['(', '{', '[', 'in', 'typeof', 'instanceof', 'new',
+ 'return', 'case', 'delete', 'throw', 'void',
+ // assignment operators
+ '=', '+=', '-=', '*=', '/=', '%=', '<<=', '>>=', '>>>=',
+ '&=', '|=', '^=', ',',
+ // binary/unary operators
+ '+', '-', '*', '/', '%', '++', '--', '<<', '>>', '>>>', '&',
+ '|', '^', '!', '~', '&&', '||', '?', ':', '===', '==', '>=',
+ '<=', '<', '>', '!=', '!=='];
+
Syntax = {
AssignmentExpression: 'AssignmentExpression',
ArrayExpression: 'ArrayExpression',
BlockStatement: 'BlockStatement',
BinaryExpression: 'BinaryExpression',
@@ -4665,37 +4722,28 @@
StrictReservedWord: 'Use of future reserved word in strict mode'
};
// See also tools/generate-unicode-regex.py.
Regex = {
- NonAsciiIdentifierStart: new RegExp('[\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0\u08a2-\u08ac\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa80-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]'),
- NonAsciiIdentifierPart: new RegExp('[\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0300-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u0483-\u0487\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u05d0-\u05ea\u05f0-\u05f2\u0610-\u061a\u0620-\u0669\u066e-\u06d3\u06d5-\u06dc\u06df-\u06e8\u06ea-\u06fc\u06ff\u0710-\u074a\u074d-\u07b1\u07c0-\u07f5\u07fa\u0800-\u082d\u0840-\u085b\u08a0\u08a2-\u08ac\u08e4-\u08fe\u0900-\u0963\u0966-\u096f\u0971-\u0977\u0979-\u097f\u0981-\u0983\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bc-\u09c4\u09c7\u09c8\u09cb-\u09ce\u09d7\u09dc\u09dd\u09df-\u09e3\u09e6-\u09f1\u0a01-\u0a03\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a59-\u0a5c\u0a5e\u0a66-\u0a75\u0a81-\u0a83\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abc-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ad0\u0ae0-\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3c-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b5c\u0b5d\u0b5f-\u0b63\u0b66-\u0b6f\u0b71\u0b82\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd0\u0bd7\u0be6-\u0bef\u0c01-\u0c03\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c58\u0c59\u0c60-\u0c63\u0c66-\u0c6f\u0c82\u0c83\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbc-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0cde\u0ce0-\u0ce3\u0ce6-\u0cef\u0cf1\u0cf2\u0d02\u0d03\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d-\u0d44\u0d46-\u0d48\u0d4a-\u0d4e\u0d57\u0d60-\u0d63\u0d66-\u0d6f\u0d7a-\u0d7f\u0d82\u0d83\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e01-\u0e3a\u0e40-\u0e4e\u0e50-\u0e59\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb9\u0ebb-\u0ebd\u0ec0-\u0ec4\u0ec6\u0ec8-\u0ecd\u0ed0-\u0ed9\u0edc-\u0edf\u0f00\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e-\u0f47\u0f49-\u0f6c\u0f71-\u0f84\u0f86-\u0f97\u0f99-\u0fbc\u0fc6\u1000-\u1049\u1050-\u109d\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u135d-\u135f\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176c\u176e-\u1770\u1772\u1773\u1780-\u17d3\u17d7\u17dc\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u1820-\u1877\u1880-\u18aa\u18b0-\u18f5\u1900-\u191c\u1920-\u192b\u1930-\u193b\u1946-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u19d0-\u19d9\u1a00-\u1a1b\u1a20-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1aa7\u1b00-\u1b4b\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1bf3\u1c00-\u1c37\u1c40-\u1c49\u1c4d-\u1c7d\u1cd0-\u1cd2\u1cd4-\u1cf6\u1d00-\u1de6\u1dfc-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u200c\u200d\u203f\u2040\u2054\u2071\u207f\u2090-\u209c\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d7f-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2de0-\u2dff\u2e2f\u3005-\u3007\u3021-\u302f\u3031-\u3035\u3038-\u303c\u3041-\u3096\u3099\u309a\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua62b\ua640-\ua66f\ua674-\ua67d\ua67f-\ua697\ua69f-\ua6f1\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua827\ua840-\ua873\ua880-\ua8c4\ua8d0-\ua8d9\ua8e0-\ua8f7\ua8fb\ua900-\ua92d\ua930-\ua953\ua960-\ua97c\ua980-\ua9c0\ua9cf-\ua9d9\uaa00-\uaa36\uaa40-\uaa4d\uaa50-\uaa59\uaa60-\uaa76\uaa7a\uaa7b\uaa80-\uaac2\uaadb-\uaadd\uaae0-\uaaef\uaaf2-\uaaf6\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabea\uabec\uabed\uabf0-\uabf9\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe00-\ufe0f\ufe20-\ufe26\ufe33\ufe34\ufe4d-\ufe4f\ufe70-\ufe74\ufe76-\ufefc\uff10-\uff19\uff21-\uff3a\uff3f\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]')
+ NonAsciiIdentifierStart: new RegExp('[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F0\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]'),
+ NonAsciiIdentifierPart: new RegExp('[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0\u08A2-\u08AC\u08E4-\u08FE\u0900-\u0963\u0966-\u096F\u0971-\u0977\u0979-\u097F\u0981-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C01-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C82\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D02\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F0\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191C\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1D00-\u1DE6\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA697\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A\uAA7B\uAA80-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE26\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]')
};
// Ensure the condition is true, otherwise throw an error.
// This is only to have a better contract semantic, i.e. another safety net
// to catch a logic error. The condition shall be fulfilled in normal case.
// Do NOT use this to enforce a certain condition on any user input.
function assert(condition, message) {
+ /* istanbul ignore if */
if (!condition) {
throw new Error('ASSERT: ' + message);
}
}
- function sliceSource(from, to) {
- return source.slice(from, to);
- }
-
- if (typeof 'esprima'[0] === 'undefined') {
- sliceSource = function sliceArraySource(from, to) {
- return source.slice(from, to).join('');
- };
- }
-
function isDecimalDigit(ch) {
- return '0123456789'.indexOf(ch) >= 0;
+ return (ch >= 48 && ch <= 57); // 0..9
}
function isHexDigit(ch) {
return '0123456789abcdefABCDEF'.indexOf(ch) >= 0;
}
@@ -4706,200 +4754,288 @@
// 7.2 White Space
function isWhiteSpace(ch) {
- return (ch === ' ') || (ch === '\u0009') || (ch === '\u000B') ||
- (ch === '\u000C') || (ch === '\u00A0') ||
- (ch.charCodeAt(0) >= 0x1680 &&
- '\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\uFEFF'.indexOf(ch) >= 0);
+ return (ch === 0x20) || (ch === 0x09) || (ch === 0x0B) || (ch === 0x0C) || (ch === 0xA0) ||
+ (ch >= 0x1680 && [0x1680, 0x180E, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202F, 0x205F, 0x3000, 0xFEFF].indexOf(ch) >= 0);
}
// 7.3 Line Terminators
function isLineTerminator(ch) {
- return (ch === '\n' || ch === '\r' || ch === '\u2028' || ch === '\u2029');
+ return (ch === 0x0A) || (ch === 0x0D) || (ch === 0x2028) || (ch === 0x2029);
}
// 7.6 Identifier Names and Identifiers
function isIdentifierStart(ch) {
- return (ch === '$') || (ch === '_') || (ch === '\\') ||
- (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') ||
- ((ch.charCodeAt(0) >= 0x80) && Regex.NonAsciiIdentifierStart.test(ch));
+ return (ch === 0x24) || (ch === 0x5F) || // $ (dollar) and _ (underscore)
+ (ch >= 0x41 && ch <= 0x5A) || // A..Z
+ (ch >= 0x61 && ch <= 0x7A) || // a..z
+ (ch === 0x5C) || // \ (backslash)
+ ((ch >= 0x80) && Regex.NonAsciiIdentifierStart.test(String.fromCharCode(ch)));
}
function isIdentifierPart(ch) {
- return (ch === '$') || (ch === '_') || (ch === '\\') ||
- (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') ||
- ((ch >= '0') && (ch <= '9')) ||
- ((ch.charCodeAt(0) >= 0x80) && Regex.NonAsciiIdentifierPart.test(ch));
+ return (ch === 0x24) || (ch === 0x5F) || // $ (dollar) and _ (underscore)
+ (ch >= 0x41 && ch <= 0x5A) || // A..Z
+ (ch >= 0x61 && ch <= 0x7A) || // a..z
+ (ch >= 0x30 && ch <= 0x39) || // 0..9
+ (ch === 0x5C) || // \ (backslash)
+ ((ch >= 0x80) && Regex.NonAsciiIdentifierPart.test(String.fromCharCode(ch)));
}
// 7.6.1.2 Future Reserved Words
function isFutureReservedWord(id) {
switch (id) {
-
- // Future reserved words.
case 'class':
case 'enum':
case 'export':
case 'extends':
case 'import':
case 'super':
return true;
+ default:
+ return false;
}
-
- return false;
}
function isStrictModeReservedWord(id) {
switch (id) {
-
- // Strict Mode reserved words.
case 'implements':
case 'interface':
case 'package':
case 'private':
case 'protected':
case 'public':
case 'static':
case 'yield':
case 'let':
return true;
+ default:
+ return false;
}
-
- return false;
}
function isRestrictedWord(id) {
return id === 'eval' || id === 'arguments';
}
// 7.6.1.1 Keywords
function isKeyword(id) {
- var keyword = false;
+ if (strict && isStrictModeReservedWord(id)) {
+ return true;
+ }
+
+ // 'const' is specialized as Keyword in V8.
+ // 'yield' and 'let' are for compatiblity with SpiderMonkey and ES.next.
+ // Some others are from future reserved words.
+
switch (id.length) {
case 2:
- keyword = (id === 'if') || (id === 'in') || (id === 'do');
- break;
+ return (id === 'if') || (id === 'in') || (id === 'do');
case 3:
- keyword = (id === 'var') || (id === 'for') || (id === 'new') || (id === 'try');
- break;
+ return (id === 'var') || (id === 'for') || (id === 'new') ||
+ (id === 'try') || (id === 'let');
case 4:
- keyword = (id === 'this') || (id === 'else') || (id === 'case') || (id === 'void') || (id === 'with');
- break;
+ return (id === 'this') || (id === 'else') || (id === 'case') ||
+ (id === 'void') || (id === 'with') || (id === 'enum');
case 5:
- keyword = (id === 'while') || (id === 'break') || (id === 'catch') || (id === 'throw');
- break;
+ return (id === 'while') || (id === 'break') || (id === 'catch') ||
+ (id === 'throw') || (id === 'const') || (id === 'yield') ||
+ (id === 'class') || (id === 'super');
case 6:
- keyword = (id === 'return') || (id === 'typeof') || (id === 'delete') || (id === 'switch');
- break;
+ return (id === 'return') || (id === 'typeof') || (id === 'delete') ||
+ (id === 'switch') || (id === 'export') || (id === 'import');
case 7:
- keyword = (id === 'default') || (id === 'finally');
- break;
+ return (id === 'default') || (id === 'finally') || (id === 'extends');
case 8:
- keyword = (id === 'function') || (id === 'continue') || (id === 'debugger');
- break;
+ return (id === 'function') || (id === 'continue') || (id === 'debugger');
case 10:
- keyword = (id === 'instanceof');
- break;
+ return (id === 'instanceof');
+ default:
+ return false;
}
+ }
- if (keyword) {
- return true;
- }
+ // 7.4 Comments
- switch (id) {
- // Future reserved words.
- // 'const' is specialized as Keyword in V8.
- case 'const':
- return true;
+ function addComment(type, value, start, end, loc) {
+ var comment, attacher;
- // For compatiblity to SpiderMonkey and ES.next
- case 'yield':
- case 'let':
- return true;
- }
+ assert(typeof start === 'number', 'Comment must have valid position');
- if (strict && isStrictModeReservedWord(id)) {
- return true;
+ // Because the way the actual token is scanned, often the comments
+ // (if any) are skipped twice during the lexical analysis.
+ // Thus, we need to skip adding a comment if the comment array already
+ // handled it.
+ if (state.lastCommentStart >= start) {
+ return;
}
+ state.lastCommentStart = start;
- return isFutureReservedWord(id);
+ comment = {
+ type: type,
+ value: value
+ };
+ if (extra.range) {
+ comment.range = [start, end];
+ }
+ if (extra.loc) {
+ comment.loc = loc;
+ }
+ extra.comments.push(comment);
+ if (extra.attachComment) {
+ extra.leadingComments.push(comment);
+ extra.trailingComments.push(comment);
+ }
}
- // 7.4 Comments
+ function skipSingleLineComment(offset) {
+ var start, loc, ch, comment;
- function skipComment() {
- var ch, blockComment, lineComment;
+ start = index - offset;
+ loc = {
+ start: {
+ line: lineNumber,
+ column: index - lineStart - offset
+ }
+ };
- blockComment = false;
- lineComment = false;
-
while (index < length) {
- ch = source[index];
+ ch = source.charCodeAt(index);
+ ++index;
+ if (isLineTerminator(ch)) {
+ if (extra.comments) {
+ comment = source.slice(start + offset, index - 1);
+ loc.end = {
+ line: lineNumber,
+ column: index - lineStart - 1
+ };
+ addComment('Line', comment, start, index - 1, loc);
+ }
+ if (ch === 13 && source.charCodeAt(index) === 10) {
+ ++index;
+ }
+ ++lineNumber;
+ lineStart = index;
+ return;
+ }
+ }
- if (lineComment) {
- ch = source[index++];
- if (isLineTerminator(ch)) {
- lineComment = false;
- if (ch === '\r' && source[index] === '\n') {
- ++index;
- }
- ++lineNumber;
- lineStart = index;
+ if (extra.comments) {
+ comment = source.slice(start + offset, index);
+ loc.end = {
+ line: lineNumber,
+ column: index - lineStart
+ };
+ addComment('Line', comment, start, index, loc);
+ }
+ }
+
+ function skipMultiLineComment() {
+ var start, loc, ch, comment;
+
+ if (extra.comments) {
+ start = index - 2;
+ loc = {
+ start: {
+ line: lineNumber,
+ column: index - lineStart - 2
}
- } else if (blockComment) {
- if (isLineTerminator(ch)) {
- if (ch === '\r' && source[index + 1] === '\n') {
- ++index;
- }
- ++lineNumber;
+ };
+ }
+
+ while (index < length) {
+ ch = source.charCodeAt(index);
+ if (isLineTerminator(ch)) {
+ if (ch === 0x0D && source.charCodeAt(index + 1) === 0x0A) {
++index;
- lineStart = index;
- if (index >= length) {
- throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
- }
- } else {
- ch = source[index++];
- if (index >= length) {
- throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
- }
- if (ch === '*') {
- ch = source[index];
- if (ch === '/') {
- ++index;
- blockComment = false;
- }
- }
}
- } else if (ch === '/') {
- ch = source[index + 1];
- if (ch === '/') {
- index += 2;
- lineComment = true;
- } else if (ch === '*') {
- index += 2;
- blockComment = true;
- if (index >= length) {
- throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+ ++lineNumber;
+ ++index;
+ lineStart = index;
+ if (index >= length) {
+ throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+ }
+ } else if (ch === 0x2A) {
+ // Block comment ends with '*/'.
+ if (source.charCodeAt(index + 1) === 0x2F) {
+ ++index;
+ ++index;
+ if (extra.comments) {
+ comment = source.slice(start + 2, index - 2);
+ loc.end = {
+ line: lineNumber,
+ column: index - lineStart
+ };
+ addComment('Block', comment, start, index, loc);
}
- } else {
- break;
+ return;
}
- } else if (isWhiteSpace(ch)) {
++index;
+ } else {
+ ++index;
+ }
+ }
+
+ throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+ }
+
+ function skipComment() {
+ var ch, start;
+
+ start = (index === 0);
+ while (index < length) {
+ ch = source.charCodeAt(index);
+
+ if (isWhiteSpace(ch)) {
+ ++index;
} else if (isLineTerminator(ch)) {
++index;
- if (ch === '\r' && source[index] === '\n') {
+ if (ch === 0x0D && source.charCodeAt(index) === 0x0A) {
++index;
}
++lineNumber;
lineStart = index;
+ start = true;
+ } else if (ch === 0x2F) { // U+002F is '/'
+ ch = source.charCodeAt(index + 1);
+ if (ch === 0x2F) {
+ ++index;
+ ++index;
+ skipSingleLineComment(2);
+ start = true;
+ } else if (ch === 0x2A) { // U+002A is '*'
+ ++index;
+ ++index;
+ skipMultiLineComment();
+ } else {
+ break;
+ }
+ } else if (start && ch === 0x2D) { // U+002D is '-'
+ // U+003E is '>'
+ if ((source.charCodeAt(index + 1) === 0x2D) && (source.charCodeAt(index + 2) === 0x3E)) {
+ // '-->' is a single-line comment
+ index += 3;
+ skipSingleLineComment(3);
+ } else {
+ break;
+ }
+ } else if (ch === 0x3C) { // U+003C is '<'
+ if (source.slice(index + 1, index + 4) === '!--') {
+ ++index; // `<`
+ ++index; // `!`
+ ++index; // `-`
+ ++index; // `-`
+ skipSingleLineComment(4);
+ } else {
+ break;
+ }
} else {
break;
}
}
}
@@ -4917,295 +5053,320 @@
}
}
return String.fromCharCode(code);
}
- function scanIdentifier() {
- var ch, start, id, restore;
+ function getEscapedIdentifier() {
+ var ch, id;
- ch = source[index];
- if (!isIdentifierStart(ch)) {
- return;
- }
+ ch = source.charCodeAt(index++);
+ id = String.fromCharCode(ch);
- start = index;
- if (ch === '\\') {
- ++index;
- if (source[index] !== 'u') {
- return;
+ // '\u' (U+005C, U+0075) denotes an escaped character.
+ if (ch === 0x5C) {
+ if (source.charCodeAt(index) !== 0x75) {
+ throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
}
++index;
- restore = index;
ch = scanHexEscape('u');
- if (ch) {
- if (ch === '\\' || !isIdentifierStart(ch)) {
- return;
- }
- id = ch;
- } else {
- index = restore;
- id = 'u';
+ if (!ch || ch === '\\' || !isIdentifierStart(ch.charCodeAt(0))) {
+ throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
}
- } else {
- id = source[index++];
+ id = ch;
}
while (index < length) {
- ch = source[index];
+ ch = source.charCodeAt(index);
if (!isIdentifierPart(ch)) {
break;
}
- if (ch === '\\') {
- ++index;
- if (source[index] !== 'u') {
- return;
+ ++index;
+ id += String.fromCharCode(ch);
+
+ // '\u' (U+005C, U+0075) denotes an escaped character.
+ if (ch === 0x5C) {
+ id = id.substr(0, id.length - 1);
+ if (source.charCodeAt(index) !== 0x75) {
+ throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
}
++index;
- restore = index;
ch = scanHexEscape('u');
- if (ch) {
- if (ch === '\\' || !isIdentifierPart(ch)) {
- return;
- }
- id += ch;
- } else {
- index = restore;
- id += 'u';
+ if (!ch || ch === '\\' || !isIdentifierPart(ch.charCodeAt(0))) {
+ throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
}
- } else {
- id += source[index++];
+ id += ch;
}
}
- // There is no keyword or literal with only one character.
- // Thus, it must be an identifier.
- if (id.length === 1) {
- return {
- type: Token.Identifier,
- value: id,
- lineNumber: lineNumber,
- lineStart: lineStart,
- range: [start, index]
- };
- }
+ return id;
+ }
- if (isKeyword(id)) {
- return {
- type: Token.Keyword,
- value: id,
- lineNumber: lineNumber,
- lineStart: lineStart,
- range: [start, index]
- };
+ function getIdentifier() {
+ var start, ch;
+
+ start = index++;
+ while (index < length) {
+ ch = source.charCodeAt(index);
+ if (ch === 0x5C) {
+ // Blackslash (U+005C) marks Unicode escape sequence.
+ index = start;
+ return getEscapedIdentifier();
+ }
+ if (isIdentifierPart(ch)) {
+ ++index;
+ } else {
+ break;
+ }
}
- // 7.8.1 Null Literals
+ return source.slice(start, index);
+ }
- if (id === 'null') {
- return {
- type: Token.NullLiteral,
- value: id,
- lineNumber: lineNumber,
- lineStart: lineStart,
- range: [start, index]
- };
- }
+ function scanIdentifier() {
+ var start, id, type;
- // 7.8.2 Boolean Literals
+ start = index;
- if (id === 'true' || id === 'false') {
- return {
- type: Token.BooleanLiteral,
- value: id,
- lineNumber: lineNumber,
- lineStart: lineStart,
- range: [start, index]
- };
+ // Backslash (U+005C) starts an escaped character.
+ id = (source.charCodeAt(index) === 0x5C) ? getEscapedIdentifier() : getIdentifier();
+
+ // There is no keyword or literal with only one character.
+ // Thus, it must be an identifier.
+ if (id.length === 1) {
+ type = Token.Identifier;
+ } else if (isKeyword(id)) {
+ type = Token.Keyword;
+ } else if (id === 'null') {
+ type = Token.NullLiteral;
+ } else if (id === 'true' || id === 'false') {
+ type = Token.BooleanLiteral;
+ } else {
+ type = Token.Identifier;
}
return {
- type: Token.Identifier,
+ type: type,
value: id,
lineNumber: lineNumber,
lineStart: lineStart,
- range: [start, index]
+ start: start,
+ end: index
};
}
+
// 7.7 Punctuators
function scanPunctuator() {
var start = index,
+ code = source.charCodeAt(index),
+ code2,
ch1 = source[index],
ch2,
ch3,
ch4;
- // Check for most common single-character punctuators.
+ switch (code) {
- if (ch1 === ';' || ch1 === '{' || ch1 === '}') {
+ // Check for most common single-character punctuators.
+ case 0x2E: // . dot
+ case 0x28: // ( open bracket
+ case 0x29: // ) close bracket
+ case 0x3B: // ; semicolon
+ case 0x2C: // , comma
+ case 0x7B: // { open curly brace
+ case 0x7D: // } close curly brace
+ case 0x5B: // [
+ case 0x5D: // ]
+ case 0x3A: // :
+ case 0x3F: // ?
+ case 0x7E: // ~
++index;
+ if (extra.tokenize) {
+ if (code === 0x28) {
+ extra.openParenToken = extra.tokens.length;
+ } else if (code === 0x7B) {
+ extra.openCurlyToken = extra.tokens.length;
+ }
+ }
return {
type: Token.Punctuator,
- value: ch1,
+ value: String.fromCharCode(code),
lineNumber: lineNumber,
lineStart: lineStart,
- range: [start, index]
+ start: start,
+ end: index
};
- }
- if (ch1 === ',' || ch1 === '(' || ch1 === ')') {
- ++index;
- return {
- type: Token.Punctuator,
- value: ch1,
- lineNumber: lineNumber,
- lineStart: lineStart,
- range: [start, index]
- };
- }
+ default:
+ code2 = source.charCodeAt(index + 1);
- // Dot (.) can also start a floating-point number, hence the need
- // to check the next character.
+ // '=' (U+003D) marks an assignment or comparison operator.
+ if (code2 === 0x3D) {
+ switch (code) {
+ case 0x2B: // +
+ case 0x2D: // -
+ case 0x2F: // /
+ case 0x3C: // <
+ case 0x3E: // >
+ case 0x5E: // ^
+ case 0x7C: // |
+ case 0x25: // %
+ case 0x26: // &
+ case 0x2A: // *
+ index += 2;
+ return {
+ type: Token.Punctuator,
+ value: String.fromCharCode(code) + String.fromCharCode(code2),
+ lineNumber: lineNumber,
+ lineStart: lineStart,
+ start: start,
+ end: index
+ };
- ch2 = source[index + 1];
- if (ch1 === '.' && !isDecimalDigit(ch2)) {
- return {
- type: Token.Punctuator,
- value: source[index++],
- lineNumber: lineNumber,
- lineStart: lineStart,
- range: [start, index]
- };
- }
+ case 0x21: // !
+ case 0x3D: // =
+ index += 2;
- // Peek more characters.
-
- ch3 = source[index + 2];
- ch4 = source[index + 3];
-
- // 4-character punctuator: >>>=
-
- if (ch1 === '>' && ch2 === '>' && ch3 === '>') {
- if (ch4 === '=') {
- index += 4;
- return {
- type: Token.Punctuator,
- value: '>>>=',
- lineNumber: lineNumber,
- lineStart: lineStart,
- range: [start, index]
- };
+ // !== and ===
+ if (source.charCodeAt(index) === 0x3D) {
+ ++index;
+ }
+ return {
+ type: Token.Punctuator,
+ value: source.slice(start, index),
+ lineNumber: lineNumber,
+ lineStart: lineStart,
+ start: start,
+ end: index
+ };
+ }
}
}
- // 3-character punctuators: === !== >>> <<= >>=
+ // 4-character punctuator: >>>=
- if (ch1 === '=' && ch2 === '=' && ch3 === '=') {
- index += 3;
- return {
- type: Token.Punctuator,
- value: '===',
- lineNumber: lineNumber,
- lineStart: lineStart,
- range: [start, index]
- };
- }
+ ch4 = source.substr(index, 4);
- if (ch1 === '!' && ch2 === '=' && ch3 === '=') {
- index += 3;
+ if (ch4 === '>>>=') {
+ index += 4;
return {
type: Token.Punctuator,
- value: '!==',
+ value: ch4,
lineNumber: lineNumber,
lineStart: lineStart,
- range: [start, index]
+ start: start,
+ end: index
};
}
- if (ch1 === '>' && ch2 === '>' && ch3 === '>') {
+ // 3-character punctuators: === !== >>> <<= >>=
+
+ ch3 = ch4.substr(0, 3);
+
+ if (ch3 === '>>>' || ch3 === '<<=' || ch3 === '>>=') {
index += 3;
return {
type: Token.Punctuator,
- value: '>>>',
+ value: ch3,
lineNumber: lineNumber,
lineStart: lineStart,
- range: [start, index]
+ start: start,
+ end: index
};
}
- if (ch1 === '<' && ch2 === '<' && ch3 === '=') {
- index += 3;
+ // Other 2-character punctuators: ++ -- << >> && ||
+ ch2 = ch3.substr(0, 2);
+
+ if ((ch1 === ch2[1] && ('+-<>&|'.indexOf(ch1) >= 0)) || ch2 === '=>') {
+ index += 2;
return {
type: Token.Punctuator,
- value: '<<=',
+ value: ch2,
lineNumber: lineNumber,
lineStart: lineStart,
- range: [start, index]
+ start: start,
+ end: index
};
}
- if (ch1 === '>' && ch2 === '>' && ch3 === '=') {
- index += 3;
+ // 1-character punctuators: < > = ! + - * % & | ^ /
+ if ('<>=!+-*%&|^/'.indexOf(ch1) >= 0) {
+ ++index;
return {
type: Token.Punctuator,
- value: '>>=',
+ value: ch1,
lineNumber: lineNumber,
lineStart: lineStart,
- range: [start, index]
+ start: start,
+ end: index
};
}
- // 2-character punctuators: <= >= == != ++ -- << >> && ||
- // += -= *= %= &= |= ^= /=
+ throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+ }
- if (ch2 === '=') {
- if ('<>=!+-*%&|^/'.indexOf(ch1) >= 0) {
- index += 2;
- return {
- type: Token.Punctuator,
- value: ch1 + ch2,
- lineNumber: lineNumber,
- lineStart: lineStart,
- range: [start, index]
- };
+ // 7.8.3 Numeric Literals
+
+ function scanHexLiteral(start) {
+ var number = '';
+
+ while (index < length) {
+ if (!isHexDigit(source[index])) {
+ break;
}
+ number += source[index++];
}
- if (ch1 === ch2 && ('+-<>&|'.indexOf(ch1) >= 0)) {
- if ('+-<>&|'.indexOf(ch2) >= 0) {
- index += 2;
- return {
- type: Token.Punctuator,
- value: ch1 + ch2,
- lineNumber: lineNumber,
- lineStart: lineStart,
- range: [start, index]
- };
- }
+ if (number.length === 0) {
+ throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
}
- // The remaining 1-character punctuators.
-
- if ('[]<>+-*%&|^!~?:=/'.indexOf(ch1) >= 0) {
- return {
- type: Token.Punctuator,
- value: source[index++],
- lineNumber: lineNumber,
- lineStart: lineStart,
- range: [start, index]
- };
+ if (isIdentifierStart(source.charCodeAt(index))) {
+ throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
}
+
+ return {
+ type: Token.NumericLiteral,
+ value: parseInt('0x' + number, 16),
+ lineNumber: lineNumber,
+ lineStart: lineStart,
+ start: start,
+ end: index
+ };
}
- // 7.8.3 Numeric Literals
+ function scanOctalLiteral(start) {
+ var number = '0' + source[index++];
+ while (index < length) {
+ if (!isOctalDigit(source[index])) {
+ break;
+ }
+ number += source[index++];
+ }
+ if (isIdentifierStart(source.charCodeAt(index)) || isDecimalDigit(source.charCodeAt(index))) {
+ throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+ }
+
+ return {
+ type: Token.NumericLiteral,
+ value: parseInt(number, 8),
+ octal: true,
+ lineNumber: lineNumber,
+ lineStart: lineStart,
+ start: start,
+ end: index
+ };
+ }
+
function scanNumericLiteral() {
var number, start, ch;
ch = source[index];
- assert(isDecimalDigit(ch) || (ch === '.'),
+ assert(isDecimalDigit(ch.charCodeAt(0)) || (ch === '.'),
'Numeric literal must start with a decimal digit or a decimal point');
start = index;
number = '';
if (ch !== '.') {
@@ -5214,136 +5375,73 @@
// Hex number starts with '0x'.
// Octal number starts with '0'.
if (number === '0') {
if (ch === 'x' || ch === 'X') {
- number += source[index++];
- while (index < length) {
- ch = source[index];
- if (!isHexDigit(ch)) {
- break;
- }
- number += source[index++];
- }
-
- if (number.length <= 2) {
- // only 0x
- throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
- }
-
- if (index < length) {
- ch = source[index];
- if (isIdentifierStart(ch)) {
- throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
- }
- }
- return {
- type: Token.NumericLiteral,
- value: parseInt(number, 16),
- lineNumber: lineNumber,
- lineStart: lineStart,
- range: [start, index]
- };
- } else if (isOctalDigit(ch)) {
- number += source[index++];
- while (index < length) {
- ch = source[index];
- if (!isOctalDigit(ch)) {
- break;
- }
- number += source[index++];
- }
-
- if (index < length) {
- ch = source[index];
- if (isIdentifierStart(ch) || isDecimalDigit(ch)) {
- throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
- }
- }
- return {
- type: Token.NumericLiteral,
- value: parseInt(number, 8),
- octal: true,
- lineNumber: lineNumber,
- lineStart: lineStart,
- range: [start, index]
- };
+ ++index;
+ return scanHexLiteral(start);
}
+ if (isOctalDigit(ch)) {
+ return scanOctalLiteral(start);
+ }
// decimal number starts with '0' such as '09' is illegal.
- if (isDecimalDigit(ch)) {
+ if (ch && isDecimalDigit(ch.charCodeAt(0))) {
throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
}
}
- while (index < length) {
- ch = source[index];
- if (!isDecimalDigit(ch)) {
- break;
- }
+ while (isDecimalDigit(source.charCodeAt(index))) {
number += source[index++];
}
+ ch = source[index];
}
if (ch === '.') {
number += source[index++];
- while (index < length) {
- ch = source[index];
- if (!isDecimalDigit(ch)) {
- break;
- }
+ while (isDecimalDigit(source.charCodeAt(index))) {
number += source[index++];
}
+ ch = source[index];
}
if (ch === 'e' || ch === 'E') {
number += source[index++];
ch = source[index];
if (ch === '+' || ch === '-') {
number += source[index++];
}
-
- ch = source[index];
- if (isDecimalDigit(ch)) {
- number += source[index++];
- while (index < length) {
- ch = source[index];
- if (!isDecimalDigit(ch)) {
- break;
- }
+ if (isDecimalDigit(source.charCodeAt(index))) {
+ while (isDecimalDigit(source.charCodeAt(index))) {
number += source[index++];
}
} else {
- ch = 'character ' + ch;
- if (index >= length) {
- ch = '<end>';
- }
throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
}
}
- if (index < length) {
- ch = source[index];
- if (isIdentifierStart(ch)) {
- throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
- }
+ if (isIdentifierStart(source.charCodeAt(index))) {
+ throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
}
return {
type: Token.NumericLiteral,
value: parseFloat(number),
lineNumber: lineNumber,
lineStart: lineStart,
- range: [start, index]
+ start: start,
+ end: index
};
}
// 7.8.4 String Literals
function scanStringLiteral() {
- var str = '', quote, start, ch, code, unescaped, restore, octal = false;
+ var str = '', quote, start, ch, code, unescaped, restore, octal = false, startLineNumber, startLineStart;
+ startLineNumber = lineNumber;
+ startLineStart = lineStart;
quote = source[index];
assert((quote === '\'' || quote === '"'),
'String literal must starts with a quote');
@@ -5356,21 +5454,12 @@
if (ch === quote) {
quote = '';
break;
} else if (ch === '\\') {
ch = source[index++];
- if (!isLineTerminator(ch)) {
+ if (!ch || !isLineTerminator(ch.charCodeAt(0))) {
switch (ch) {
- case 'n':
- str += '\n';
- break;
- case 'r':
- str += '\r';
- break;
- case 't':
- str += '\t';
- break;
case 'u':
case 'x':
restore = index;
unescaped = scanHexEscape(ch);
if (unescaped) {
@@ -5378,10 +5467,19 @@
} else {
index = restore;
str += ch;
}
break;
+ case 'n':
+ str += '\n';
+ break;
+ case 'r':
+ str += '\r';
+ break;
+ case 't':
+ str += '\t';
+ break;
case 'b':
str += '\b';
break;
case 'f':
str += '\f';
@@ -5420,12 +5518,13 @@
} else {
++lineNumber;
if (ch === '\r' && source[index] === '\n') {
++index;
}
+ lineStart = index;
}
- } else if (isLineTerminator(ch)) {
+ } else if (isLineTerminator(ch.charCodeAt(0))) {
break;
} else {
str += ch;
}
}
@@ -5436,64 +5535,84 @@
return {
type: Token.StringLiteral,
value: str,
octal: octal,
+ startLineNumber: startLineNumber,
+ startLineStart: startLineStart,
lineNumber: lineNumber,
lineStart: lineStart,
- range: [start, index]
+ start: start,
+ end: index
};
}
- function scanRegExp() {
- var str, ch, start, pattern, flags, value, classMarker = false, restore, terminated = false;
+ function testRegExp(pattern, flags) {
+ var value;
+ try {
+ value = new RegExp(pattern, flags);
+ } catch (e) {
+ throwError({}, Messages.InvalidRegExp);
+ }
+ return value;
+ }
- buffer = null;
- skipComment();
+ function scanRegExpBody() {
+ var ch, str, classMarker, terminated, body;
- start = index;
ch = source[index];
assert(ch === '/', 'Regular expression literal must start with a slash');
str = source[index++];
+ classMarker = false;
+ terminated = false;
while (index < length) {
ch = source[index++];
str += ch;
if (ch === '\\') {
ch = source[index++];
// ECMA-262 7.8.5
- if (isLineTerminator(ch)) {
+ if (isLineTerminator(ch.charCodeAt(0))) {
throwError({}, Messages.UnterminatedRegExp);
}
str += ch;
+ } else if (isLineTerminator(ch.charCodeAt(0))) {
+ throwError({}, Messages.UnterminatedRegExp);
} else if (classMarker) {
if (ch === ']') {
classMarker = false;
}
} else {
if (ch === '/') {
terminated = true;
break;
} else if (ch === '[') {
classMarker = true;
- } else if (isLineTerminator(ch)) {
- throwError({}, Messages.UnterminatedRegExp);
}
}
}
if (!terminated) {
throwError({}, Messages.UnterminatedRegExp);
}
// Exclude leading and trailing slash.
- pattern = str.substr(1, str.length - 2);
+ body = str.substr(1, str.length - 2);
+ return {
+ value: body,
+ literal: str
+ };
+ }
+ function scanRegExpFlags() {
+ var ch, str, flags, restore;
+
+ str = '';
flags = '';
while (index < length) {
ch = source[index];
- if (!isIdentifierPart(ch)) {
+ if (!isIdentifierPart(ch.charCodeAt(0))) {
break;
}
++index;
if (ch === '\\' && index < length) {
@@ -5502,119 +5621,708 @@
++index;
restore = index;
ch = scanHexEscape('u');
if (ch) {
flags += ch;
- str += '\\u';
- for (; restore < index; ++restore) {
+ for (str += '\\u'; restore < index; ++restore) {
str += source[restore];
}
} else {
index = restore;
flags += 'u';
str += '\\u';
}
+ throwErrorTolerant({}, Messages.UnexpectedToken, 'ILLEGAL');
} else {
str += '\\';
+ throwErrorTolerant({}, Messages.UnexpectedToken, 'ILLEGAL');
}
} else {
flags += ch;
str += ch;
}
}
- try {
- value = new RegExp(pattern, flags);
- } catch (e) {
- throwError({}, Messages.InvalidRegExp);
+ return {
+ value: flags,
+ literal: str
+ };
+ }
+
+ function scanRegExp() {
+ var start, body, flags, pattern, value;
+
+ lookahead = null;
+ skipComment();
+ start = index;
+
+ body = scanRegExpBody();
+ flags = scanRegExpFlags();
+ value = testRegExp(body.value, flags.value);
+
+ if (extra.tokenize) {
+ return {
+ type: Token.RegularExpression,
+ value: value,
+ lineNumber: lineNumber,
+ lineStart: lineStart,
+ start: start,
+ end: index
+ };
}
return {
- literal: str,
+ literal: body.literal + flags.literal,
value: value,
- range: [start, index]
+ start: start,
+ end: index
};
}
+ function collectRegex() {
+ var pos, loc, regex, token;
+
+ skipComment();
+
+ pos = index;
+ loc = {
+ start: {
+ line: lineNumber,
+ column: index - lineStart
+ }
+ };
+
+ regex = scanRegExp();
+ loc.end = {
+ line: lineNumber,
+ column: index - lineStart
+ };
+
+ /* istanbul ignore next */
+ if (!extra.tokenize) {
+ // Pop the previous token, which is likely '/' or '/='
+ if (extra.tokens.length > 0) {
+ token = extra.tokens[extra.tokens.length - 1];
+ if (token.range[0] === pos && token.type === 'Punctuator') {
+ if (token.value === '/' || token.value === '/=') {
+ extra.tokens.pop();
+ }
+ }
+ }
+
+ extra.tokens.push({
+ type: 'RegularExpression',
+ value: regex.literal,
+ range: [pos, index],
+ loc: loc
+ });
+ }
+
+ return regex;
+ }
+
function isIdentifierName(token) {
return token.type === Token.Identifier ||
token.type === Token.Keyword ||
token.type === Token.BooleanLiteral ||
token.type === Token.NullLiteral;
}
+ function advanceSlash() {
+ var prevToken,
+ checkToken;
+ // Using the following algorithm:
+ // https://github.com/mozilla/sweet.js/wiki/design
+ prevToken = extra.tokens[extra.tokens.length - 1];
+ if (!prevToken) {
+ // Nothing before that: it cannot be a division.
+ return collectRegex();
+ }
+ if (prevToken.type === 'Punctuator') {
+ if (prevToken.value === ']') {
+ return scanPunctuator();
+ }
+ if (prevToken.value === ')') {
+ checkToken = extra.tokens[extra.openParenToken - 1];
+ if (checkToken &&
+ checkToken.type === 'Keyword' &&
+ (checkToken.value === 'if' ||
+ checkToken.value === 'while' ||
+ checkToken.value === 'for' ||
+ checkToken.value === 'with')) {
+ return collectRegex();
+ }
+ return scanPunctuator();
+ }
+ if (prevToken.value === '}') {
+ // Dividing a function by anything makes little sense,
+ // but we have to check for that.
+ if (extra.tokens[extra.openCurlyToken - 3] &&
+ extra.tokens[extra.openCurlyToken - 3].type === 'Keyword') {
+ // Anonymous function.
+ checkToken = extra.tokens[extra.openCurlyToken - 4];
+ if (!checkToken) {
+ return scanPunctuator();
+ }
+ } else if (extra.tokens[extra.openCurlyToken - 4] &&
+ extra.tokens[extra.openCurlyToken - 4].type === 'Keyword') {
+ // Named function.
+ checkToken = extra.tokens[extra.openCurlyToken - 5];
+ if (!checkToken) {
+ return collectRegex();
+ }
+ } else {
+ return scanPunctuator();
+ }
+ // checkToken determines whether the function is
+ // a declaration or an expression.
+ if (FnExprTokens.indexOf(checkToken.value) >= 0) {
+ // It is an expression.
+ return scanPunctuator();
+ }
+ // It is a declaration.
+ return collectRegex();
+ }
+ return collectRegex();
+ }
+ if (prevToken.type === 'Keyword') {
+ return collectRegex();
+ }
+ return scanPunctuator();
+ }
+
function advance() {
- var ch, token;
+ var ch;
skipComment();
if (index >= length) {
return {
type: Token.EOF,
lineNumber: lineNumber,
lineStart: lineStart,
- range: [index, index]
+ start: index,
+ end: index
};
}
- token = scanPunctuator();
- if (typeof token !== 'undefined') {
- return token;
+ ch = source.charCodeAt(index);
+
+ if (isIdentifierStart(ch)) {
+ return scanIdentifier();
}
- ch = source[index];
+ // Very common: ( and ) and ;
+ if (ch === 0x28 || ch === 0x29 || ch === 0x3B) {
+ return scanPunctuator();
+ }
- if (ch === '\'' || ch === '"') {
+ // String literal starts with single quote (U+0027) or double quote (U+0022).
+ if (ch === 0x27 || ch === 0x22) {
return scanStringLiteral();
}
- if (ch === '.' || isDecimalDigit(ch)) {
+
+ // Dot (.) U+002E can also start a floating-point number, hence the need
+ // to check the next character.
+ if (ch === 0x2E) {
+ if (isDecimalDigit(source.charCodeAt(index + 1))) {
+ return scanNumericLiteral();
+ }
+ return scanPunctuator();
+ }
+
+ if (isDecimalDigit(ch)) {
return scanNumericLiteral();
}
- token = scanIdentifier();
- if (typeof token !== 'undefined') {
- return token;
+ // Slash (/) U+002F can also start a regex.
+ if (extra.tokenize && ch === 0x2F) {
+ return advanceSlash();
}
- throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
+ return scanPunctuator();
}
+ function collectToken() {
+ var loc, token, range, value;
+
+ skipComment();
+ loc = {
+ start: {
+ line: lineNumber,
+ column: index - lineStart
+ }
+ };
+
+ token = advance();
+ loc.end = {
+ line: lineNumber,
+ column: index - lineStart
+ };
+
+ if (token.type !== Token.EOF) {
+ value = source.slice(token.start, token.end);
+ extra.tokens.push({
+ type: TokenName[token.type],
+ value: value,
+ range: [token.start, token.end],
+ loc: loc
+ });
+ }
+
+ return token;
+ }
+
function lex() {
var token;
- if (buffer) {
- index = buffer.range[1];
- lineNumber = buffer.lineNumber;
- lineStart = buffer.lineStart;
- token = buffer;
- buffer = null;
- return token;
- }
+ token = lookahead;
+ index = token.end;
+ lineNumber = token.lineNumber;
+ lineStart = token.lineStart;
- buffer = null;
- return advance();
+ lookahead = (typeof extra.tokens !== 'undefined') ? collectToken() : advance();
+
+ index = token.end;
+ lineNumber = token.lineNumber;
+ lineStart = token.lineStart;
+
+ return token;
}
- function lookahead() {
+ function peek() {
var pos, line, start;
- if (buffer !== null) {
- return buffer;
- }
-
pos = index;
line = lineNumber;
start = lineStart;
- buffer = advance();
+ lookahead = (typeof extra.tokens !== 'undefined') ? collectToken() : advance();
index = pos;
lineNumber = line;
lineStart = start;
+ }
- return buffer;
+ function Position(line, column) {
+ this.line = line;
+ this.column = column;
}
+ function SourceLocation(startLine, startColumn, line, column) {
+ this.start = new Position(startLine, startColumn);
+ this.end = new Position(line, column);
+ }
+
+ SyntaxTreeDelegate = {
+
+ name: 'SyntaxTree',
+
+ processComment: function (node) {
+ var lastChild, trailingComments;
+
+ if (node.type === Syntax.Program) {
+ if (node.body.length > 0) {
+ return;
+ }
+ }
+
+ if (extra.trailingComments.length > 0) {
+ if (extra.trailingComments[0].range[0] >= node.range[1]) {
+ trailingComments = extra.trailingComments;
+ extra.trailingComments = [];
+ } else {
+ extra.trailingComments.length = 0;
+ }
+ } else {
+ if (extra.bottomRightStack.length > 0 &&
+ extra.bottomRightStack[extra.bottomRightStack.length - 1].trailingComments &&
+ extra.bottomRightStack[extra.bottomRightStack.length - 1].trailingComments[0].range[0] >= node.range[1]) {
+ trailingComments = extra.bottomRightStack[extra.bottomRightStack.length - 1].trailingComments;
+ delete extra.bottomRightStack[extra.bottomRightStack.length - 1].trailingComments;
+ }
+ }
+
+ // Eating the stack.
+ while (extra.bottomRightStack.length > 0 && extra.bottomRightStack[extra.bottomRightStack.length - 1].range[0] >= node.range[0]) {
+ lastChild = extra.bottomRightStack.pop();
+ }
+
+ if (lastChild) {
+ if (lastChild.leadingComments && lastChild.leadingComments[lastChild.leadingComments.length - 1].range[1] <= node.range[0]) {
+ node.leadingComments = lastChild.leadingComments;
+ delete lastChild.leadingComments;
+ }
+ } else if (extra.leadingComments.length > 0 && extra.leadingComments[extra.leadingComments.length - 1].range[1] <= node.range[0]) {
+ node.leadingComments = extra.leadingComments;
+ extra.leadingComments = [];
+ }
+
+
+ if (trailingComments) {
+ node.trailingComments = trailingComments;
+ }
+
+ extra.bottomRightStack.push(node);
+ },
+
+ markEnd: function (node, startToken) {
+ if (extra.range) {
+ node.range = [startToken.start, index];
+ }
+ if (extra.loc) {
+ node.loc = new SourceLocation(
+ startToken.startLineNumber === undefined ? startToken.lineNumber : startToken.startLineNumber,
+ startToken.start - (startToken.startLineStart === undefined ? startToken.lineStart : startToken.startLineStart),
+ lineNumber,
+ index - lineStart
+ );
+ this.postProcess(node);
+ }
+
+ if (extra.attachComment) {
+ this.processComment(node);
+ }
+ return node;
+ },
+
+ postProcess: function (node) {
+ if (extra.source) {
+ node.loc.source = extra.source;
+ }
+ return node;
+ },
+
+ createArrayExpression: function (elements) {
+ return {
+ type: Syntax.ArrayExpression,
+ elements: elements
+ };
+ },
+
+ createAssignmentExpression: function (operator, left, right) {
+ return {
+ type: Syntax.AssignmentExpression,
+ operator: operator,
+ left: left,
+ right: right
+ };
+ },
+
+ createBinaryExpression: function (operator, left, right) {
+ var type = (operator === '||' || operator === '&&') ? Syntax.LogicalExpression :
+ Syntax.BinaryExpression;
+ return {
+ type: type,
+ operator: operator,
+ left: left,
+ right: right
+ };
+ },
+
+ createBlockStatement: function (body) {
+ return {
+ type: Syntax.BlockStatement,
+ body: body
+ };
+ },
+
+ createBreakStatement: function (label) {
+ return {
+ type: Syntax.BreakStatement,
+ label: label
+ };
+ },
+
+ createCallExpression: function (callee, args) {
+ return {
+ type: Syntax.CallExpression,
+ callee: callee,
+ 'arguments': args
+ };
+ },
+
+ createCatchClause: function (param, body) {
+ return {
+ type: Syntax.CatchClause,
+ param: param,
+ body: body
+ };
+ },
+
+ createConditionalExpression: function (test, consequent, alternate) {
+ return {
+ type: Syntax.ConditionalExpression,
+ test: test,
+ consequent: consequent,
+ alternate: alternate
+ };
+ },
+
+ createContinueStatement: function (label) {
+ return {
+ type: Syntax.ContinueStatement,
+ label: label
+ };
+ },
+
+ createDebuggerStatement: function () {
+ return {
+ type: Syntax.DebuggerStatement
+ };
+ },
+
+ createDoWhileStatement: function (body, test) {
+ return {
+ type: Syntax.DoWhileStatement,
+ body: body,
+ test: test
+ };
+ },
+
+ createEmptyStatement: function () {
+ return {
+ type: Syntax.EmptyStatement
+ };
+ },
+
+ createExpressionStatement: function (expression) {
+ return {
+ type: Syntax.ExpressionStatement,
+ expression: expression
+ };
+ },
+
+ createForStatement: function (init, test, update, body) {
+ return {
+ type: Syntax.ForStatement,
+ init: init,
+ test: test,
+ update: update,
+ body: body
+ };
+ },
+
+ createForInStatement: function (left, right, body) {
+ return {
+ type: Syntax.ForInStatement,
+ left: left,
+ right: right,
+ body: body,
+ each: false
+ };
+ },
+
+ createFunctionDeclaration: function (id, params, defaults, body) {
+ return {
+ type: Syntax.FunctionDeclaration,
+ id: id,
+ params: params,
+ defaults: defaults,
+ body: body,
+ rest: null,
+ generator: false,
+ expression: false
+ };
+ },
+
+ createFunctionExpression: function (id, params, defaults, body) {
+ return {
+ type: Syntax.FunctionExpression,
+ id: id,
+ params: params,
+ defaults: defaults,
+ body: body,
+ rest: null,
+ generator: false,
+ expression: false
+ };
+ },
+
+ createIdentifier: function (name) {
+ return {
+ type: Syntax.Identifier,
+ name: name
+ };
+ },
+
+ createIfStatement: function (test, consequent, alternate) {
+ return {
+ type: Syntax.IfStatement,
+ test: test,
+ consequent: consequent,
+ alternate: alternate
+ };
+ },
+
+ createLabeledStatement: function (label, body) {
+ return {
+ type: Syntax.LabeledStatement,
+ label: label,
+ body: body
+ };
+ },
+
+ createLiteral: function (token) {
+ return {
+ type: Syntax.Literal,
+ value: token.value,
+ raw: source.slice(token.start, token.end)
+ };
+ },
+
+ createMemberExpression: function (accessor, object, property) {
+ return {
+ type: Syntax.MemberExpression,
+ computed: accessor === '[',
+ object: object,
+ property: property
+ };
+ },
+
+ createNewExpression: function (callee, args) {
+ return {
+ type: Syntax.NewExpression,
+ callee: callee,
+ 'arguments': args
+ };
+ },
+
+ createObjectExpression: function (properties) {
+ return {
+ type: Syntax.ObjectExpression,
+ properties: properties
+ };
+ },
+
+ createPostfixExpression: function (operator, argument) {
+ return {
+ type: Syntax.UpdateExpression,
+ operator: operator,
+ argument: argument,
+ prefix: false
+ };
+ },
+
+ createProgram: function (body) {
+ return {
+ type: Syntax.Program,
+ body: body
+ };
+ },
+
+ createProperty: function (kind, key, value) {
+ return {
+ type: Syntax.Property,
+ key: key,
+ value: value,
+ kind: kind
+ };
+ },
+
+ createReturnStatement: function (argument) {
+ return {
+ type: Syntax.ReturnStatement,
+ argument: argument
+ };
+ },
+
+ createSequenceExpression: function (expressions) {
+ return {
+ type: Syntax.SequenceExpression,
+ expressions: expressions
+ };
+ },
+
+ createSwitchCase: function (test, consequent) {
+ return {
+ type: Syntax.SwitchCase,
+ test: test,
+ consequent: consequent
+ };
+ },
+
+ createSwitchStatement: function (discriminant, cases) {
+ return {
+ type: Syntax.SwitchStatement,
+ discriminant: discriminant,
+ cases: cases
+ };
+ },
+
+ createThisExpression: function () {
+ return {
+ type: Syntax.ThisExpression
+ };
+ },
+
+ createThrowStatement: function (argument) {
+ return {
+ type: Syntax.ThrowStatement,
+ argument: argument
+ };
+ },
+
+ createTryStatement: function (block, guardedHandlers, handlers, finalizer) {
+ return {
+ type: Syntax.TryStatement,
+ block: block,
+ guardedHandlers: guardedHandlers,
+ handlers: handlers,
+ finalizer: finalizer
+ };
+ },
+
+ createUnaryExpression: function (operator, argument) {
+ if (operator === '++' || operator === '--') {
+ return {
+ type: Syntax.UpdateExpression,
+ operator: operator,
+ argument: argument,
+ prefix: true
+ };
+ }
+ return {
+ type: Syntax.UnaryExpression,
+ operator: operator,
+ argument: argument,
+ prefix: true
+ };
+ },
+
+ createVariableDeclaration: function (declarations, kind) {
+ return {
+ type: Syntax.VariableDeclaration,
+ declarations: declarations,
+ kind: kind
+ };
+ },
+
+ createVariableDeclarator: function (id, init) {
+ return {
+ type: Syntax.VariableDeclarator,
+ id: id,
+ init: init
+ };
+ },
+
+ createWhileStatement: function (test, body) {
+ return {
+ type: Syntax.WhileStatement,
+ test: test,
+ body: body
+ };
+ },
+
+ createWithStatement: function (object, body) {
+ return {
+ type: Syntax.WithStatement,
+ object: object,
+ body: body
+ };
+ }
+ };
+
// Return true if there is a line terminator before the next token.
function peekLineTerminator() {
var pos, line, start, found;
@@ -5636,26 +6344,28 @@
var error,
args = Array.prototype.slice.call(arguments, 2),
msg = messageFormat.replace(
/%(\d)/g,
function (whole, index) {
- return args[index] || '';
+ assert(index < args.length, 'Message reference must be in range');
+ return args[index];
}
);
if (typeof token.lineNumber === 'number') {
error = new Error('Line ' + token.lineNumber + ': ' + msg);
- error.index = token.range[0];
+ error.index = token.start;
error.lineNumber = token.lineNumber;
- error.column = token.range[0] - lineStart + 1;
+ error.column = token.start - lineStart + 1;
} else {
error = new Error('Line ' + lineNumber + ': ' + msg);
error.index = index;
error.lineNumber = lineNumber;
error.column = index - lineStart + 1;
}
+ error.description = msg;
throw error;
}
function throwErrorTolerant() {
try {
@@ -5724,30 +6434,28 @@
}
// Return true if the next token matches the specified punctuator.
function match(value) {
- var token = lookahead();
- return token.type === Token.Punctuator && token.value === value;
+ return lookahead.type === Token.Punctuator && lookahead.value === value;
}
// Return true if the next token matches the specified keyword
function matchKeyword(keyword) {
- var token = lookahead();
- return token.type === Token.Keyword && token.value === keyword;
+ return lookahead.type === Token.Keyword && lookahead.value === keyword;
}
// Return true if the next token is an assignment operator
function matchAssign() {
- var token = lookahead(),
- op = token.value;
+ var op;
- if (token.type !== Token.Punctuator) {
+ if (lookahead.type !== Token.Punctuator) {
return false;
}
+ op = lookahead.value;
return op === '=' ||
op === '*=' ||
op === '/=' ||
op === '%=' ||
op === '+=' ||
@@ -5759,33 +6467,27 @@
op === '^=' ||
op === '|=';
}
function consumeSemicolon() {
- var token, line;
+ var line;
- // Catch the very common case first.
- if (source[index] === ';') {
+ // Catch the very common case first: immediately a semicolon (U+003B).
+ if (source.charCodeAt(index) === 0x3B || match(';')) {
lex();
return;
}
line = lineNumber;
skipComment();
if (lineNumber !== line) {
return;
}
- if (match(';')) {
- lex();
- return;
+ if (lookahead.type !== Token.EOF && !match('}')) {
+ throwUnexpected(lookahead);
}
-
- token = lookahead();
- if (token.type !== Token.EOF && !match('}')) {
- throwUnexpected(token);
- }
}
// Return true if provided expression is LeftHandSideExpression
function isLeftHandSide(expr) {
@@ -5793,12 +6495,13 @@
}
// 11.1.4 Array Initialiser
function parseArrayInitialiser() {
- var elements = [];
+ var elements = [], startToken;
+ startToken = lookahead;
expect('[');
while (!match(']')) {
if (match(',')) {
lex();
@@ -5810,65 +6513,54 @@
expect(',');
}
}
}
- expect(']');
+ lex();
- return {
- type: Syntax.ArrayExpression,
- elements: elements
- };
+ return delegate.markEnd(delegate.createArrayExpression(elements), startToken);
}
// 11.1.5 Object Initialiser
function parsePropertyFunction(param, first) {
- var previousStrict, body;
+ var previousStrict, body, startToken;
previousStrict = strict;
+ startToken = lookahead;
body = parseFunctionSourceElements();
if (first && strict && isRestrictedWord(param[0].name)) {
throwErrorTolerant(first, Messages.StrictParamName);
}
strict = previousStrict;
-
- return {
- type: Syntax.FunctionExpression,
- id: null,
- params: param,
- defaults: [],
- body: body,
- rest: null,
- generator: false,
- expression: false
- };
+ return delegate.markEnd(delegate.createFunctionExpression(null, param, [], body), startToken);
}
function parseObjectPropertyKey() {
- var token = lex();
+ var token, startToken;
+ startToken = lookahead;
+ token = lex();
+
// Note: This function is called only from parseObjectProperty(), where
// EOF and Punctuator tokens are already filtered out.
if (token.type === Token.StringLiteral || token.type === Token.NumericLiteral) {
if (strict && token.octal) {
throwErrorTolerant(token, Messages.StrictOctalLiteral);
}
- return createLiteral(token);
+ return delegate.markEnd(delegate.createLiteral(token), startToken);
}
- return {
- type: Syntax.Identifier,
- name: token.value
- };
+ return delegate.markEnd(delegate.createIdentifier(token.value), startToken);
}
function parseObjectProperty() {
- var token, key, id, param;
+ var token, key, id, value, param, startToken;
- token = lookahead();
+ token = lookahead;
+ startToken = lookahead;
if (token.type === Token.Identifier) {
id = parseObjectPropertyKey();
@@ -5876,65 +6568,47 @@
if (token.value === 'get' && !match(':')) {
key = parseObjectPropertyKey();
expect('(');
expect(')');
- return {
- type: Syntax.Property,
- key: key,
- value: parsePropertyFunction([]),
- kind: 'get'
- };
- } else if (token.value === 'set' && !match(':')) {
+ value = parsePropertyFunction([]);
+ return delegate.markEnd(delegate.createProperty('get', key, value), startToken);
+ }
+ if (token.value === 'set' && !match(':')) {
key = parseObjectPropertyKey();
expect('(');
- token = lookahead();
+ token = lookahead;
if (token.type !== Token.Identifier) {
expect(')');
throwErrorTolerant(token, Messages.UnexpectedToken, token.value);
- return {
- type: Syntax.Property,
- key: key,
- value: parsePropertyFunction([]),
- kind: 'set'
- };
+ value = parsePropertyFunction([]);
} else {
param = [ parseVariableIdentifier() ];
expect(')');
- return {
- type: Syntax.Property,
- key: key,
- value: parsePropertyFunction(param, token),
- kind: 'set'
- };
+ value = parsePropertyFunction(param, token);
}
- } else {
- expect(':');
- return {
- type: Syntax.Property,
- key: id,
- value: parseAssignmentExpression(),
- kind: 'init'
- };
+ return delegate.markEnd(delegate.createProperty('set', key, value), startToken);
}
- } else if (token.type === Token.EOF || token.type === Token.Punctuator) {
+ expect(':');
+ value = parseAssignmentExpression();
+ return delegate.markEnd(delegate.createProperty('init', id, value), startToken);
+ }
+ if (token.type === Token.EOF || token.type === Token.Punctuator) {
throwUnexpected(token);
} else {
key = parseObjectPropertyKey();
expect(':');
- return {
- type: Syntax.Property,
- key: key,
- value: parseAssignmentExpression(),
- kind: 'init'
- };
+ value = parseAssignmentExpression();
+ return delegate.markEnd(delegate.createProperty('init', key, value), startToken);
}
}
function parseObjectInitialiser() {
- var properties = [], property, name, kind, map = {}, toString = String;
+ var properties = [], property, name, key, kind, map = {}, toString = String, startToken;
+ startToken = lookahead;
+
expect('{');
while (!match('}')) {
property = parseObjectProperty();
@@ -5942,27 +6616,29 @@
name = property.key.name;
} else {
name = toString(property.key.value);
}
kind = (property.kind === 'init') ? PropertyKind.Data : (property.kind === 'get') ? PropertyKind.Get : PropertyKind.Set;
- if (Object.prototype.hasOwnProperty.call(map, name)) {
- if (map[name] === PropertyKind.Data) {
+
+ key = '$' + name;
+ if (Object.prototype.hasOwnProperty.call(map, key)) {
+ if (map[key] === PropertyKind.Data) {
if (strict && kind === PropertyKind.Data) {
throwErrorTolerant({}, Messages.StrictDuplicateProperty);
} else if (kind !== PropertyKind.Data) {
throwErrorTolerant({}, Messages.AccessorDataProperty);
}
} else {
if (kind === PropertyKind.Data) {
throwErrorTolerant({}, Messages.AccessorDataProperty);
- } else if (map[name] & kind) {
+ } else if (map[key] & kind) {
throwErrorTolerant({}, Messages.AccessorGetSet);
}
}
- map[name] |= kind;
+ map[key] |= kind;
} else {
- map[name] = kind;
+ map[key] = kind;
}
properties.push(property);
if (!match('}')) {
@@ -5970,14 +6646,11 @@
}
}
expect('}');
- return {
- type: Syntax.ObjectExpression,
- properties: properties
- };
+ return delegate.markEnd(delegate.createObjectExpression(properties), startToken);
}
// 11.1.6 The Grouping Operator
function parseGroupExpression() {
@@ -5994,69 +6667,64 @@
// 11.1 Primary Expressions
function parsePrimaryExpression() {
- var token = lookahead(),
- type = token.type;
+ var type, token, expr, startToken;
- if (type === Token.Identifier) {
- return {
- type: Syntax.Identifier,
- name: lex().value
- };
+ if (match('(')) {
+ return parseGroupExpression();
}
- if (type === Token.StringLiteral || type === Token.NumericLiteral) {
- if (strict && token.octal) {
- throwErrorTolerant(token, Messages.StrictOctalLiteral);
- }
- return createLiteral(lex());
- }
-
- if (type === Token.Keyword) {
- if (matchKeyword('this')) {
- lex();
- return {
- type: Syntax.ThisExpression
- };
- }
-
- if (matchKeyword('function')) {
- return parseFunctionExpression();
- }
- }
-
- if (type === Token.BooleanLiteral) {
- lex();
- token.value = (token.value === 'true');
- return createLiteral(token);
- }
-
- if (type === Token.NullLiteral) {
- lex();
- token.value = null;
- return createLiteral(token);
- }
-
if (match('[')) {
return parseArrayInitialiser();
}
if (match('{')) {
return parseObjectInitialiser();
}
- if (match('(')) {
- return parseGroupExpression();
- }
+ type = lookahead.type;
+ startToken = lookahead;
- if (match('/') || match('/=')) {
- return createLiteral(scanRegExp());
+ if (type === Token.Identifier) {
+ expr = delegate.createIdentifier(lex().value);
+ } else if (type === Token.StringLiteral || type === Token.NumericLiteral) {
+ if (strict && lookahead.octal) {
+ throwErrorTolerant(lookahead, Messages.StrictOctalLiteral);
+ }
+ expr = delegate.createLiteral(lex());
+ } else if (type === Token.Keyword) {
+ if (matchKeyword('function')) {
+ return parseFunctionExpression();
+ }
+ if (matchKeyword('this')) {
+ lex();
+ expr = delegate.createThisExpression();
+ } else {
+ throwUnexpected(lex());
+ }
+ } else if (type === Token.BooleanLiteral) {
+ token = lex();
+ token.value = (token.value === 'true');
+ expr = delegate.createLiteral(token);
+ } else if (type === Token.NullLiteral) {
+ token = lex();
+ token.value = null;
+ expr = delegate.createLiteral(token);
+ } else if (match('/') || match('/=')) {
+ if (typeof extra.tokens !== 'undefined') {
+ expr = delegate.createLiteral(collectRegex());
+ } else {
+ expr = delegate.createLiteral(scanRegExp());
+ }
+ peek();
+ } else {
+ throwUnexpected(lex());
}
- return throwUnexpected(lex());
+ return delegate.markEnd(expr, startToken);
}
// 11.2 Left-Hand-Side Expressions
function parseArguments() {
@@ -6078,20 +6746,20 @@
return args;
}
function parseNonComputedProperty() {
- var token = lex();
+ var token, startToken;
+ startToken = lookahead;
+ token = lex();
+
if (!isIdentifierName(token)) {
throwUnexpected(token);
}
- return {
- type: Syntax.Identifier,
- name: token.value
- };
+ return delegate.markEnd(delegate.createIdentifier(token.value), startToken);
}
function parseNonComputedMember() {
expect('.');
@@ -6109,127 +6777,107 @@
return expr;
}
function parseNewExpression() {
- var expr;
+ var callee, args, startToken;
+ startToken = lookahead;
expectKeyword('new');
+ callee = parseLeftHandSideExpression();
+ args = match('(') ? parseArguments() : [];
- expr = {
- type: Syntax.NewExpression,
- callee: parseLeftHandSideExpression(),
- 'arguments': []
- };
-
- if (match('(')) {
- expr['arguments'] = parseArguments();
- }
-
- return expr;
+ return delegate.markEnd(delegate.createNewExpression(callee, args), startToken);
}
function parseLeftHandSideExpressionAllowCall() {
- var expr;
+ var previousAllowIn, expr, args, property, startToken;
+ startToken = lookahead;
+
+ previousAllowIn = state.allowIn;
+ state.allowIn = true;
expr = matchKeyword('new') ? parseNewExpression() : parsePrimaryExpression();
+ state.allowIn = previousAllowIn;
- while (match('.') || match('[') || match('(')) {
- if (match('(')) {
- expr = {
- type: Syntax.CallExpression,
- callee: expr,
- 'arguments': parseArguments()
- };
+ for (;;) {
+ if (match('.')) {
+ property = parseNonComputedMember();
+ expr = delegate.createMemberExpression('.', expr, property);
+ } else if (match('(')) {
+ args = parseArguments();
+ expr = delegate.createCallExpression(expr, args);
} else if (match('[')) {
- expr = {
- type: Syntax.MemberExpression,
- computed: true,
- object: expr,
- property: parseComputedMember()
- };
+ property = parseComputedMember();
+ expr = delegate.createMemberExpression('[', expr, property);
} else {
- expr = {
- type: Syntax.MemberExpression,
- computed: false,
- object: expr,
- property: parseNonComputedMember()
- };
+ break;
}
+ delegate.markEnd(expr, startToken);
}
return expr;
}
-
function parseLeftHandSideExpression() {
- var expr;
+ var previousAllowIn, expr, property, startToken;
+ startToken = lookahead;
+
+ previousAllowIn = state.allowIn;
expr = matchKeyword('new') ? parseNewExpression() : parsePrimaryExpression();
+ state.allowIn = previousAllowIn;
while (match('.') || match('[')) {
if (match('[')) {
- expr = {
- type: Syntax.MemberExpression,
- computed: true,
- object: expr,
- property: parseComputedMember()
- };
+ property = parseComputedMember();
+ expr = delegate.createMemberExpression('[', expr, property);
} else {
- expr = {
- type: Syntax.MemberExpression,
- computed: false,
- object: expr,
- property: parseNonComputedMember()
- };
+ property = parseNonComputedMember();
+ expr = delegate.createMemberExpression('.', expr, property);
}
+ delegate.markEnd(expr, startToken);
}
return expr;
}
// 11.3 Postfix Expressions
function parsePostfixExpression() {
- var expr = parseLeftHandSideExpressionAllowCall(), token;
+ var expr, token, startToken = lookahead;
- token = lookahead();
- if (token.type !== Token.Punctuator) {
- return expr;
- }
+ expr = parseLeftHandSideExpressionAllowCall();
- if ((match('++') || match('--')) && !peekLineTerminator()) {
- // 11.3.1, 11.3.2
- if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {
- throwErrorTolerant({}, Messages.StrictLHSPostfix);
- }
- if (!isLeftHandSide(expr)) {
- throwErrorTolerant({}, Messages.InvalidLHSInAssignment);
- }
+ if (lookahead.type === Token.Punctuator) {
+ if ((match('++') || match('--')) && !peekLineTerminator()) {
+ // 11.3.1, 11.3.2
+ if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {
+ throwErrorTolerant({}, Messages.StrictLHSPostfix);
+ }
- expr = {
- type: Syntax.UpdateExpression,
- operator: lex().value,
- argument: expr,
- prefix: false
- };
+ if (!isLeftHandSide(expr)) {
+ throwErrorTolerant({}, Messages.InvalidLHSInAssignment);
+ }
+
+ token = lex();
+ expr = delegate.markEnd(delegate.createPostfixExpression(token.value, expr), startToken);
+ }
}
return expr;
}
// 11.4 Unary Operators
function parseUnaryExpression() {
- var token, expr;
+ var token, expr, startToken;
- token = lookahead();
- if (token.type !== Token.Punctuator && token.type !== Token.Keyword) {
- return parsePostfixExpression();
- }
-
- if (match('++') || match('--')) {
+ if (lookahead.type !== Token.Punctuator && lookahead.type !== Token.Keyword) {
+ expr = parsePostfixExpression();
+ } else if (match('++') || match('--')) {
+ startToken = lookahead;
token = lex();
expr = parseUnaryExpression();
// 11.4.4, 11.4.5
if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {
throwErrorTolerant({}, Messages.StrictLHSPrefix);
@@ -6237,295 +6885,245 @@
if (!isLeftHandSide(expr)) {
throwErrorTolerant({}, Messages.InvalidLHSInAssignment);
}
- expr = {
- type: Syntax.UpdateExpression,
- operator: token.value,
- argument: expr,
- prefix: true
- };
- return expr;
- }
-
- if (match('+') || match('-') || match('~') || match('!')) {
- expr = {
- type: Syntax.UnaryExpression,
- operator: lex().value,
- argument: parseUnaryExpression(),
- prefix: true
- };
- return expr;
- }
-
- if (matchKeyword('delete') || matchKeyword('void') || matchKeyword('typeof')) {
- expr = {
- type: Syntax.UnaryExpression,
- operator: lex().value,
- argument: parseUnaryExpression(),
- prefix: true
- };
+ expr = delegate.createUnaryExpression(token.value, expr);
+ expr = delegate.markEnd(expr, startToken);
+ } else if (match('+') || match('-') || match('~') || match('!')) {
+ startToken = lookahead;
+ token = lex();
+ expr = parseUnaryExpression();
+ expr = delegate.createUnaryExpression(token.value, expr);
+ expr = delegate.markEnd(expr, startToken);
+ } else if (matchKeyword('delete') || matchKeyword('void') || matchKeyword('typeof')) {
+ startToken = lookahead;
+ token = lex();
+ expr = parseUnaryExpression();
+ expr = delegate.createUnaryExpression(token.value, expr);
+ expr = delegate.markEnd(expr, startToken);
if (strict && expr.operator === 'delete' && expr.argument.type === Syntax.Identifier) {
throwErrorTolerant({}, Messages.StrictDelete);
}
- return expr;
+ } else {
+ expr = parsePostfixExpression();
}
- return parsePostfixExpression();
- }
-
- // 11.5 Multiplicative Operators
-
- function parseMultiplicativeExpression() {
- var expr = parseUnaryExpression();
-
- while (match('*') || match('/') || match('%')) {
- expr = {
- type: Syntax.BinaryExpression,
- operator: lex().value,
- left: expr,
- right: parseUnaryExpression()
- };
- }
-
return expr;
}
- // 11.6 Additive Operators
+ function binaryPrecedence(token, allowIn) {
+ var prec = 0;
- function parseAdditiveExpression() {
- var expr = parseMultiplicativeExpression();
-
- while (match('+') || match('-')) {
- expr = {
- type: Syntax.BinaryExpression,
- operator: lex().value,
- left: expr,
- right: parseMultiplicativeExpression()
- };
+ if (token.type !== Token.Punctuator && token.type !== Token.Keyword) {
+ return 0;
}
- return expr;
- }
+ switch (token.value) {
+ case '||':
+ prec = 1;
+ break;
- // 11.7 Bitwise Shift Operators
+ case '&&':
+ prec = 2;
+ break;
- function parseShiftExpression() {
- var expr = parseAdditiveExpression();
+ case '|':
+ prec = 3;
+ break;
- while (match('<<') || match('>>') || match('>>>')) {
- expr = {
- type: Syntax.BinaryExpression,
- operator: lex().value,
- left: expr,
- right: parseAdditiveExpression()
- };
- }
+ case '^':
+ prec = 4;
+ break;
- return expr;
- }
- // 11.8 Relational Operators
+ case '&':
+ prec = 5;
+ break;
- function parseRelationalExpression() {
- var expr, previousAllowIn;
+ case '==':
+ case '!=':
+ case '===':
+ case '!==':
+ prec = 6;
+ break;
- previousAllowIn = state.allowIn;
- state.allowIn = true;
+ case '<':
+ case '>':
+ case '<=':
+ case '>=':
+ case 'instanceof':
+ prec = 7;
+ break;
- expr = parseShiftExpression();
+ case 'in':
+ prec = allowIn ? 7 : 0;
+ break;
- while (match('<') || match('>') || match('<=') || match('>=') || (previousAllowIn && matchKeyword('in')) || matchKeyword('instanceof')) {
- expr = {
- type: Syntax.BinaryExpression,
- operator: lex().value,
- left: expr,
- right: parseShiftExpression()
- };
- }
+ case '<<':
+ case '>>':
+ case '>>>':
+ prec = 8;
+ break;
- state.allowIn = previousAllowIn;
- return expr;
- }
+ case '+':
+ case '-':
+ prec = 9;
+ break;
- // 11.9 Equality Operators
+ case '*':
+ case '/':
+ case '%':
+ prec = 11;
+ break;
- function parseEqualityExpression() {
- var expr = parseRelationalExpression();
-
- while (match('==') || match('!=') || match('===') || match('!==')) {
- expr = {
- type: Syntax.BinaryExpression,
- operator: lex().value,
- left: expr,
- right: parseRelationalExpression()
- };
+ default:
+ break;
}
- return expr;
+ return prec;
}
+ // 11.5 Multiplicative Operators
+ // 11.6 Additive Operators
+ // 11.7 Bitwise Shift Operators
+ // 11.8 Relational Operators
+ // 11.9 Equality Operators
// 11.10 Binary Bitwise Operators
+ // 11.11 Binary Logical Operators
- function parseBitwiseANDExpression() {
- var expr = parseEqualityExpression();
+ function parseBinaryExpression() {
+ var marker, markers, expr, token, prec, stack, right, operator, left, i;
- while (match('&')) {
- lex();
- expr = {
- type: Syntax.BinaryExpression,
- operator: '&',
- left: expr,
- right: parseEqualityExpression()
- };
- }
+ marker = lookahead;
+ left = parseUnaryExpression();
- return expr;
- }
-
- function parseBitwiseXORExpression() {
- var expr = parseBitwiseANDExpression();
-
- while (match('^')) {
- lex();
- expr = {
- type: Syntax.BinaryExpression,
- operator: '^',
- left: expr,
- right: parseBitwiseANDExpression()
- };
+ token = lookahead;
+ prec = binaryPrecedence(token, state.allowIn);
+ if (prec === 0) {
+ return left;
}
+ token.prec = prec;
+ lex();
- return expr;
- }
+ markers = [marker, lookahead];
+ right = parseUnaryExpression();
- function parseBitwiseORExpression() {
- var expr = parseBitwiseXORExpression();
+ stack = [left, token, right];
- while (match('|')) {
- lex();
- expr = {
- type: Syntax.BinaryExpression,
- operator: '|',
- left: expr,
- right: parseBitwiseXORExpression()
- };
- }
+ while ((prec = binaryPrecedence(lookahead, state.allowIn)) > 0) {
- return expr;
- }
+ // Reduce: make a binary expression from the three topmost entries.
+ while ((stack.length > 2) && (prec <= stack[stack.length - 2].prec)) {
+ right = stack.pop();
+ operator = stack.pop().value;
+ left = stack.pop();
+ expr = delegate.createBinaryExpression(operator, left, right);
+ markers.pop();
+ marker = markers[markers.length - 1];
+ delegate.markEnd(expr, marker);
+ stack.push(expr);
+ }
- // 11.11 Binary Logical Operators
-
- function parseLogicalANDExpression() {
- var expr = parseBitwiseORExpression();
-
- while (match('&&')) {
- lex();
- expr = {
- type: Syntax.LogicalExpression,
- operator: '&&',
- left: expr,
- right: parseBitwiseORExpression()
- };
+ // Shift.
+ token = lex();
+ token.prec = prec;
+ stack.push(token);
+ markers.push(lookahead);
+ expr = parseUnaryExpression();
+ stack.push(expr);
}
- return expr;
- }
-
- function parseLogicalORExpression() {
- var expr = parseLogicalANDExpression();
-
- while (match('||')) {
- lex();
- expr = {
- type: Syntax.LogicalExpression,
- operator: '||',
- left: expr,
- right: parseLogicalANDExpression()
- };
+ // Final reduce to clean-up the stack.
+ i = stack.length - 1;
+ expr = stack[i];
+ markers.pop();
+ while (i > 1) {
+ expr = delegate.createBinaryExpression(stack[i - 1].value, stack[i - 2], expr);
+ i -= 2;
+ marker = markers.pop();
+ delegate.markEnd(expr, marker);
}
return expr;
}
+
// 11.12 Conditional Operator
function parseConditionalExpression() {
- var expr, previousAllowIn, consequent;
+ var expr, previousAllowIn, consequent, alternate, startToken;
- expr = parseLogicalORExpression();
+ startToken = lookahead;
+ expr = parseBinaryExpression();
+
if (match('?')) {
lex();
previousAllowIn = state.allowIn;
state.allowIn = true;
consequent = parseAssignmentExpression();
state.allowIn = previousAllowIn;
expect(':');
+ alternate = parseAssignmentExpression();
- expr = {
- type: Syntax.ConditionalExpression,
- test: expr,
- consequent: consequent,
- alternate: parseAssignmentExpression()
- };
+ expr = delegate.createConditionalExpression(expr, consequent, alternate);
+ delegate.markEnd(expr, startToken);
}
return expr;
}
// 11.13 Assignment Operators
function parseAssignmentExpression() {
- var token, expr;
+ var token, left, right, node, startToken;
- token = lookahead();
- expr = parseConditionalExpression();
+ token = lookahead;
+ startToken = lookahead;
+ node = left = parseConditionalExpression();
+
if (matchAssign()) {
// LeftHandSideExpression
- if (!isLeftHandSide(expr)) {
+ if (!isLeftHandSide(left)) {
throwErrorTolerant({}, Messages.InvalidLHSInAssignment);
}
// 11.13.1
- if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {
+ if (strict && left.type === Syntax.Identifier && isRestrictedWord(left.name)) {
throwErrorTolerant(token, Messages.StrictLHSAssignment);
}
- expr = {
- type: Syntax.AssignmentExpression,
- operator: lex().value,
- left: expr,
- right: parseAssignmentExpression()
- };
+ token = lex();
+ right = parseAssignmentExpression();
+ node = delegate.markEnd(delegate.createAssignmentExpression(token.value, left, right), startToken);
}
- return expr;
+ return node;
}
// 11.14 Comma Operator
function parseExpression() {
- var expr = parseAssignmentExpression();
+ var expr, startToken = lookahead;
+ expr = parseAssignmentExpression();
+
if (match(',')) {
- expr = {
- type: Syntax.SequenceExpression,
- expressions: [ expr ]
- };
+ expr = delegate.createSequenceExpression([ expr ]);
while (index < length) {
if (!match(',')) {
break;
}
lex();
expr.expressions.push(parseAssignmentExpression());
}
+ delegate.markEnd(expr, startToken);
}
+
return expr;
}
// 12.1 Block
@@ -6546,43 +7144,43 @@
return list;
}
function parseBlock() {
- var block;
+ var block, startToken;
+ startToken = lookahead;
expect('{');
block = parseStatementList();
expect('}');
- return {
- type: Syntax.BlockStatement,
- body: block
- };
+ return delegate.markEnd(delegate.createBlockStatement(block), startToken);
}
// 12.2 Variable Statement
function parseVariableIdentifier() {
- var token = lex();
+ var token, startToken;
+ startToken = lookahead;
+ token = lex();
+
if (token.type !== Token.Identifier) {
throwUnexpected(token);
}
- return {
- type: Syntax.Identifier,
- name: token.value
- };
+ return delegate.markEnd(delegate.createIdentifier(token.value), startToken);
}
function parseVariableDeclaration(kind) {
- var id = parseVariableIdentifier(),
- init = null;
+ var init = null, id, startToken;
+ startToken = lookahead;
+ id = parseVariableIdentifier();
+
// 12.2.1
if (strict && isRestrictedWord(id.name)) {
throwErrorTolerant({}, Messages.StrictVarName);
}
@@ -6592,15 +7190,11 @@
} else if (match('=')) {
lex();
init = parseAssignmentExpression();
}
- return {
- type: Syntax.VariableDeclarator,
- id: id,
- init: init
- };
+ return delegate.markEnd(delegate.createVariableDeclarator(id, init), startToken);
}
function parseVariableDeclarationList(kind) {
var list = [];
@@ -6622,58 +7216,44 @@
declarations = parseVariableDeclarationList();
consumeSemicolon();
- return {
- type: Syntax.VariableDeclaration,
- declarations: declarations,
- kind: 'var'
- };
+ return delegate.createVariableDeclaration(declarations, 'var');
}
// kind may be `const` or `let`
// Both are experimental and not in the specification yet.
// see http://wiki.ecmascript.org/doku.php?id=harmony:const
// and http://wiki.ecmascript.org/doku.php?id=harmony:let
function parseConstLetDeclaration(kind) {
- var declarations;
+ var declarations, startToken;
+ startToken = lookahead;
+
expectKeyword(kind);
declarations = parseVariableDeclarationList(kind);
consumeSemicolon();
- return {
- type: Syntax.VariableDeclaration,
- declarations: declarations,
- kind: kind
- };
+ return delegate.markEnd(delegate.createVariableDeclaration(declarations, kind), startToken);
}
// 12.3 Empty Statement
function parseEmptyStatement() {
expect(';');
-
- return {
- type: Syntax.EmptyStatement
- };
+ return delegate.createEmptyStatement();
}
// 12.4 Expression Statement
function parseExpressionStatement() {
var expr = parseExpression();
-
consumeSemicolon();
-
- return {
- type: Syntax.ExpressionStatement,
- expression: expr
- };
+ return delegate.createExpressionStatement(expr);
}
// 12.5 If statement
function parseIfStatement() {
@@ -6694,16 +7274,11 @@
alternate = parseStatement();
} else {
alternate = null;
}
- return {
- type: Syntax.IfStatement,
- test: test,
- consequent: consequent,
- alternate: alternate
- };
+ return delegate.createIfStatement(test, consequent, alternate);
}
// 12.6 Iteration Statements
function parseDoWhileStatement() {
@@ -6728,15 +7303,11 @@
if (match(';')) {
lex();
}
- return {
- type: Syntax.DoWhileStatement,
- body: body,
- test: test
- };
+ return delegate.createDoWhileStatement(body, test);
}
function parseWhileStatement() {
var test, body, oldInIteration;
@@ -6753,25 +7324,21 @@
body = parseStatement();
state.inIteration = oldInIteration;
- return {
- type: Syntax.WhileStatement,
- test: test,
- body: body
- };
+ return delegate.createWhileStatement(test, body);
}
function parseForVariableDeclaration() {
- var token = lex();
+ var token, declarations, startToken;
- return {
- type: Syntax.VariableDeclaration,
- declarations: parseVariableDeclarationList(),
- kind: token.value
- };
+ startToken = lookahead;
+ token = lex();
+ declarations = parseVariableDeclarationList();
+
+ return delegate.markEnd(delegate.createVariableDeclaration(declarations, token.value), startToken);
}
function parseForStatement() {
var init, test, update, left, right, body, oldInIteration;
@@ -6837,186 +7404,146 @@
body = parseStatement();
state.inIteration = oldInIteration;
- if (typeof left === 'undefined') {
- return {
- type: Syntax.ForStatement,
- init: init,
- test: test,
- update: update,
- body: body
- };
- }
-
- return {
- type: Syntax.ForInStatement,
- left: left,
- right: right,
- body: body,
- each: false
- };
+ return (typeof left === 'undefined') ?
+ delegate.createForStatement(init, test, update, body) :
+ delegate.createForInStatement(left, right, body);
}
// 12.7 The continue statement
function parseContinueStatement() {
- var token, label = null;
+ var label = null, key;
expectKeyword('continue');
// Optimize the most common form: 'continue;'.
- if (source[index] === ';') {
+ if (source.charCodeAt(index) === 0x3B) {
lex();
if (!state.inIteration) {
throwError({}, Messages.IllegalContinue);
}
- return {
- type: Syntax.ContinueStatement,
- label: null
- };
+ return delegate.createContinueStatement(null);
}
if (peekLineTerminator()) {
if (!state.inIteration) {
throwError({}, Messages.IllegalContinue);
}
- return {
- type: Syntax.ContinueStatement,
- label: null
- };
+ return delegate.createContinueStatement(null);
}
- token = lookahead();
- if (token.type === Token.Identifier) {
+ if (lookahead.type === Token.Identifier) {
label = parseVariableIdentifier();
- if (!Object.prototype.hasOwnProperty.call(state.labelSet, label.name)) {
+ key = '$' + label.name;
+ if (!Object.prototype.hasOwnProperty.call(state.labelSet, key)) {
throwError({}, Messages.UnknownLabel, label.name);
}
}
consumeSemicolon();
if (label === null && !state.inIteration) {
throwError({}, Messages.IllegalContinue);
}
- return {
- type: Syntax.ContinueStatement,
- label: label
- };
+ return delegate.createContinueStatement(label);
}
// 12.8 The break statement
function parseBreakStatement() {
- var token, label = null;
+ var label = null, key;
expectKeyword('break');
- // Optimize the most common form: 'break;'.
- if (source[index] === ';') {
+ // Catch the very common case first: immediately a semicolon (U+003B).
+ if (source.charCodeAt(index) === 0x3B) {
lex();
if (!(state.inIteration || state.inSwitch)) {
throwError({}, Messages.IllegalBreak);
}
- return {
- type: Syntax.BreakStatement,
- label: null
- };
+ return delegate.createBreakStatement(null);
}
if (peekLineTerminator()) {
if (!(state.inIteration || state.inSwitch)) {
throwError({}, Messages.IllegalBreak);
}
- return {
- type: Syntax.BreakStatement,
- label: null
- };
+ return delegate.createBreakStatement(null);
}
- token = lookahead();
- if (token.type === Token.Identifier) {
+ if (lookahead.type === Token.Identifier) {
label = parseVariableIdentifier();
- if (!Object.prototype.hasOwnProperty.call(state.labelSet, label.name)) {
+ key = '$' + label.name;
+ if (!Object.prototype.hasOwnProperty.call(state.labelSet, key)) {
throwError({}, Messages.UnknownLabel, label.name);
}
}
consumeSemicolon();
if (label === null && !(state.inIteration || state.inSwitch)) {
throwError({}, Messages.IllegalBreak);
}
- return {
- type: Syntax.BreakStatement,
- label: label
- };
+ return delegate.createBreakStatement(label);
}
// 12.9 The return statement
function parseReturnStatement() {
- var token, argument = null;
+ var argument = null;
expectKeyword('return');
if (!state.inFunctionBody) {
throwErrorTolerant({}, Messages.IllegalReturn);
}
// 'return' followed by a space and an identifier is very common.
- if (source[index] === ' ') {
- if (isIdentifierStart(source[index + 1])) {
+ if (source.charCodeAt(index) === 0x20) {
+ if (isIdentifierStart(source.charCodeAt(index + 1))) {
argument = parseExpression();
consumeSemicolon();
- return {
- type: Syntax.ReturnStatement,
- argument: argument
- };
+ return delegate.createReturnStatement(argument);
}
}
if (peekLineTerminator()) {
- return {
- type: Syntax.ReturnStatement,
- argument: null
- };
+ return delegate.createReturnStatement(null);
}
if (!match(';')) {
- token = lookahead();
- if (!match('}') && token.type !== Token.EOF) {
+ if (!match('}') && lookahead.type !== Token.EOF) {
argument = parseExpression();
}
}
consumeSemicolon();
- return {
- type: Syntax.ReturnStatement,
- argument: argument
- };
+ return delegate.createReturnStatement(argument);
}
// 12.10 The with statement
function parseWithStatement() {
var object, body;
if (strict) {
+ // TODO(ikarienator): Should we update the test cases instead?
+ skipComment();
throwErrorTolerant({}, Messages.StrictModeWith);
}
expectKeyword('with');
@@ -7026,24 +7553,19 @@
expect(')');
body = parseStatement();
- return {
- type: Syntax.WithStatement,
- object: object,
- body: body
- };
+ return delegate.createWithStatement(object, body);
}
// 12.10 The swith statement
function parseSwitchCase() {
- var test,
- consequent = [],
- statement;
+ var test, consequent = [], statement, startToken;
+ startToken = lookahead;
if (matchKeyword('default')) {
lex();
test = null;
} else {
expectKeyword('case');
@@ -7054,21 +7576,14 @@
while (index < length) {
if (match('}') || matchKeyword('default') || matchKeyword('case')) {
break;
}
statement = parseStatement();
- if (typeof statement === 'undefined') {
- break;
- }
consequent.push(statement);
}
- return {
- type: Syntax.SwitchCase,
- test: test,
- consequent: consequent
- };
+ return delegate.markEnd(delegate.createSwitchCase(test, consequent), startToken);
}
function parseSwitchStatement() {
var discriminant, cases, clause, oldInSwitch, defaultFound;
@@ -7084,15 +7599,11 @@
cases = [];
if (match('}')) {
lex();
- return {
- type: Syntax.SwitchStatement,
- discriminant: discriminant,
- cases: cases
- };
+ return delegate.createSwitchStatement(discriminant, cases);
}
oldInSwitch = state.inSwitch;
state.inSwitch = true;
defaultFound = false;
@@ -7113,15 +7624,11 @@
state.inSwitch = oldInSwitch;
expect('}');
- return {
- type: Syntax.SwitchStatement,
- discriminant: discriminant,
- cases: cases
- };
+ return delegate.createSwitchStatement(discriminant, cases);
}
// 12.13 The throw statement
function parseThrowStatement() {
@@ -7135,41 +7642,35 @@
argument = parseExpression();
consumeSemicolon();
- return {
- type: Syntax.ThrowStatement,
- argument: argument
- };
+ return delegate.createThrowStatement(argument);
}
// 12.14 The try statement
function parseCatchClause() {
- var param;
+ var param, body, startToken;
+ startToken = lookahead;
expectKeyword('catch');
expect('(');
if (match(')')) {
- throwUnexpected(lookahead());
+ throwUnexpected(lookahead);
}
param = parseVariableIdentifier();
// 12.14.1
if (strict && isRestrictedWord(param.name)) {
throwErrorTolerant({}, Messages.StrictCatchVariable);
}
expect(')');
-
- return {
- type: Syntax.CatchClause,
- param: param,
- body: parseBlock()
- };
+ body = parseBlock();
+ return delegate.markEnd(delegate.createCatchClause(param, body), startToken);
}
function parseTryStatement() {
var block, handlers = [], finalizer = null;
@@ -7188,85 +7689,83 @@
if (handlers.length === 0 && !finalizer) {
throwError({}, Messages.NoCatchOrFinally);
}
- return {
- type: Syntax.TryStatement,
- block: block,
- guardedHandlers: [],
- handlers: handlers,
- finalizer: finalizer
- };
+ return delegate.createTryStatement(block, [], handlers, finalizer);
}
// 12.15 The debugger statement
function parseDebuggerStatement() {
expectKeyword('debugger');
consumeSemicolon();
- return {
- type: Syntax.DebuggerStatement
- };
+ return delegate.createDebuggerStatement();
}
// 12 Statements
function parseStatement() {
- var token = lookahead(),
+ var type = lookahead.type,
expr,
- labeledBody;
+ labeledBody,
+ key,
+ startToken;
- if (token.type === Token.EOF) {
- throwUnexpected(token);
+ if (type === Token.EOF) {
+ throwUnexpected(lookahead);
}
- if (token.type === Token.Punctuator) {
- switch (token.value) {
+ if (type === Token.Punctuator && lookahead.value === '{') {
+ return parseBlock();
+ }
+
+ startToken = lookahead;
+
+ if (type === Token.Punctuator) {
+ switch (lookahead.value) {
case ';':
- return parseEmptyStatement();
- case '{':
- return parseBlock();
+ return delegate.markEnd(parseEmptyStatement(), startToken);
case '(':
- return parseExpressionStatement();
+ return delegate.markEnd(parseExpressionStatement(), startToken);
default:
break;
}
}
- if (token.type === Token.Keyword) {
- switch (token.value) {
+ if (type === Token.Keyword) {
+ switch (lookahead.value) {
case 'break':
- return parseBreakStatement();
+ return delegate.markEnd(parseBreakStatement(), startToken);
case 'continue':
- return parseContinueStatement();
+ return delegate.markEnd(parseContinueStatement(), startToken);
case 'debugger':
- return parseDebuggerStatement();
+ return delegate.markEnd(parseDebuggerStatement(), startToken);
case 'do':
- return parseDoWhileStatement();
+ return delegate.markEnd(parseDoWhileStatement(), startToken);
case 'for':
- return parseForStatement();
+ return delegate.markEnd(parseForStatement(), startToken);
case 'function':
- return parseFunctionDeclaration();
+ return delegate.markEnd(parseFunctionDeclaration(), startToken);
case 'if':
- return parseIfStatement();
+ return delegate.markEnd(parseIfStatement(), startToken);
case 'return':
- return parseReturnStatement();
+ return delegate.markEnd(parseReturnStatement(), startToken);
case 'switch':
- return parseSwitchStatement();
+ return delegate.markEnd(parseSwitchStatement(), startToken);
case 'throw':
- return parseThrowStatement();
+ return delegate.markEnd(parseThrowStatement(), startToken);
case 'try':
- return parseTryStatement();
+ return delegate.markEnd(parseTryStatement(), startToken);
case 'var':
- return parseVariableStatement();
+ return delegate.markEnd(parseVariableStatement(), startToken);
case 'while':
- return parseWhileStatement();
+ return delegate.markEnd(parseWhileStatement(), startToken);
case 'with':
- return parseWithStatement();
+ return delegate.markEnd(parseWithStatement(), startToken);
default:
break;
}
}
@@ -7274,54 +7773,48 @@
// 12.12 Labelled Statements
if ((expr.type === Syntax.Identifier) && match(':')) {
lex();
- if (Object.prototype.hasOwnProperty.call(state.labelSet, expr.name)) {
+ key = '$' + expr.name;
+ if (Object.prototype.hasOwnProperty.call(state.labelSet, key)) {
throwError({}, Messages.Redeclaration, 'Label', expr.name);
}
- state.labelSet[expr.name] = true;
+ state.labelSet[key] = true;
labeledBody = parseStatement();
- delete state.labelSet[expr.name];
-
- return {
- type: Syntax.LabeledStatement,
- label: expr,
- body: labeledBody
- };
+ delete state.labelSet[key];
+ return delegate.markEnd(delegate.createLabeledStatement(expr, labeledBody), startToken);
}
consumeSemicolon();
- return {
- type: Syntax.ExpressionStatement,
- expression: expr
- };
+ return delegate.markEnd(delegate.createExpressionStatement(expr), startToken);
}
// 13 Function Definition
function parseFunctionSourceElements() {
var sourceElement, sourceElements = [], token, directive, firstRestricted,
- oldLabelSet, oldInIteration, oldInSwitch, oldInFunctionBody;
+ oldLabelSet, oldInIteration, oldInSwitch, oldInFunctionBody, startToken;
+ startToken = lookahead;
expect('{');
while (index < length) {
- token = lookahead();
- if (token.type !== Token.StringLiteral) {
+ if (lookahead.type !== Token.StringLiteral) {
break;
}
+ token = lookahead;
sourceElement = parseSourceElement();
sourceElements.push(sourceElement);
if (sourceElement.expression.type !== Syntax.Literal) {
// this is not directive
break;
}
- directive = sliceSource(token.range[0] + 1, token.range[1] - 1);
+ directive = source.slice(token.start + 1, token.end - 1);
if (directive === 'use strict') {
strict = true;
if (firstRestricted) {
throwErrorTolerant(firstRestricted, Messages.StrictOctalLiteral);
}
@@ -7358,104 +7851,114 @@
state.labelSet = oldLabelSet;
state.inIteration = oldInIteration;
state.inSwitch = oldInSwitch;
state.inFunctionBody = oldInFunctionBody;
- return {
- type: Syntax.BlockStatement,
- body: sourceElements
- };
+ return delegate.markEnd(delegate.createBlockStatement(sourceElements), startToken);
}
- function parseFunctionDeclaration() {
- var id, param, params = [], body, token, stricted, firstRestricted, message, previousStrict, paramSet;
-
- expectKeyword('function');
- token = lookahead();
- id = parseVariableIdentifier();
- if (strict) {
- if (isRestrictedWord(token.value)) {
- throwErrorTolerant(token, Messages.StrictFunctionName);
- }
- } else {
- if (isRestrictedWord(token.value)) {
- firstRestricted = token;
- message = Messages.StrictFunctionName;
- } else if (isStrictModeReservedWord(token.value)) {
- firstRestricted = token;
- message = Messages.StrictReservedWord;
- }
- }
-
+ function parseParams(firstRestricted) {
+ var param, params = [], token, stricted, paramSet, key, message;
expect('(');
if (!match(')')) {
paramSet = {};
while (index < length) {
- token = lookahead();
+ token = lookahead;
param = parseVariableIdentifier();
+ key = '$' + token.value;
if (strict) {
if (isRestrictedWord(token.value)) {
stricted = token;
message = Messages.StrictParamName;
}
- if (Object.prototype.hasOwnProperty.call(paramSet, token.value)) {
+ if (Object.prototype.hasOwnProperty.call(paramSet, key)) {
stricted = token;
message = Messages.StrictParamDupe;
}
} else if (!firstRestricted) {
if (isRestrictedWord(token.value)) {
firstRestricted = token;
message = Messages.StrictParamName;
} else if (isStrictModeReservedWord(token.value)) {
firstRestricted = token;
message = Messages.StrictReservedWord;
- } else if (Object.prototype.hasOwnProperty.call(paramSet, token.value)) {
+ } else if (Object.prototype.hasOwnProperty.call(paramSet, key)) {
firstRestricted = token;
message = Messages.StrictParamDupe;
}
}
params.push(param);
- paramSet[param.name] = true;
+ paramSet[key] = true;
if (match(')')) {
break;
}
expect(',');
}
}
expect(')');
+ return {
+ params: params,
+ stricted: stricted,
+ firstRestricted: firstRestricted,
+ message: message
+ };
+ }
+
+ function parseFunctionDeclaration() {
+ var id, params = [], body, token, stricted, tmp, firstRestricted, message, previousStrict, startToken;
+
+ startToken = lookahead;
+
+ expectKeyword('function');
+ token = lookahead;
+ id = parseVariableIdentifier();
+ if (strict) {
+ if (isRestrictedWord(token.value)) {
+ throwErrorTolerant(token, Messages.StrictFunctionName);
+ }
+ } else {
+ if (isRestrictedWord(token.value)) {
+ firstRestricted = token;
+ message = Messages.StrictFunctionName;
+ } else if (isStrictModeReservedWord(token.value)) {
+ firstRestricted = token;
+ message = Messages.StrictReservedWord;
+ }
+ }
+
+ tmp = parseParams(firstRestricted);
+ params = tmp.params;
+ stricted = tmp.stricted;
+ firstRestricted = tmp.firstRestricted;
+ if (tmp.message) {
+ message = tmp.message;
+ }
+
previousStrict = strict;
body = parseFunctionSourceElements();
if (strict && firstRestricted) {
throwError(firstRestricted, message);
}
if (strict && stricted) {
throwErrorTolerant(stricted, message);
}
strict = previousStrict;
- return {
- type: Syntax.FunctionDeclaration,
- id: id,
- params: params,
- defaults: [],
- body: body,
- rest: null,
- generator: false,
- expression: false
- };
+ return delegate.markEnd(delegate.createFunctionDeclaration(id, params, [], body), startToken);
}
function parseFunctionExpression() {
- var token, id = null, stricted, firstRestricted, message, param, params = [], body, previousStrict, paramSet;
+ var token, id = null, stricted, firstRestricted, message, tmp, params = [], body, previousStrict, startToken;
+ startToken = lookahead;
expectKeyword('function');
if (!match('(')) {
- token = lookahead();
+ token = lookahead;
id = parseVariableIdentifier();
if (strict) {
if (isRestrictedWord(token.value)) {
throwErrorTolerant(token, Messages.StrictFunctionName);
}
@@ -7468,109 +7971,67 @@
message = Messages.StrictReservedWord;
}
}
}
- expect('(');
-
- if (!match(')')) {
- paramSet = {};
- while (index < length) {
- token = lookahead();
- param = parseVariableIdentifier();
- if (strict) {
- if (isRestrictedWord(token.value)) {
- stricted = token;
- message = Messages.StrictParamName;
- }
- if (Object.prototype.hasOwnProperty.call(paramSet, token.value)) {
- stricted = token;
- message = Messages.StrictParamDupe;
- }
- } else if (!firstRestricted) {
- if (isRestrictedWord(token.value)) {
- firstRestricted = token;
- message = Messages.StrictParamName;
- } else if (isStrictModeReservedWord(token.value)) {
- firstRestricted = token;
- message = Messages.StrictReservedWord;
- } else if (Object.prototype.hasOwnProperty.call(paramSet, token.value)) {
- firstRestricted = token;
- message = Messages.StrictParamDupe;
- }
- }
- params.push(param);
- paramSet[param.name] = true;
- if (match(')')) {
- break;
- }
- expect(',');
- }
+ tmp = parseParams(firstRestricted);
+ params = tmp.params;
+ stricted = tmp.stricted;
+ firstRestricted = tmp.firstRestricted;
+ if (tmp.message) {
+ message = tmp.message;
}
- expect(')');
-
previousStrict = strict;
body = parseFunctionSourceElements();
if (strict && firstRestricted) {
throwError(firstRestricted, message);
}
if (strict && stricted) {
throwErrorTolerant(stricted, message);
}
strict = previousStrict;
- return {
- type: Syntax.FunctionExpression,
- id: id,
- params: params,
- defaults: [],
- body: body,
- rest: null,
- generator: false,
- expression: false
- };
+ return delegate.markEnd(delegate.createFunctionExpression(id, params, [], body), startToken);
}
// 14 Program
function parseSourceElement() {
- var token = lookahead();
-
- if (token.type === Token.Keyword) {
- switch (token.value) {
+ if (lookahead.type === Token.Keyword) {
+ switch (lookahead.value) {
case 'const':
case 'let':
- return parseConstLetDeclaration(token.value);
+ return parseConstLetDeclaration(lookahead.value);
case 'function':
return parseFunctionDeclaration();
default:
return parseStatement();
}
}
- if (token.type !== Token.EOF) {
+ if (lookahead.type !== Token.EOF) {
return parseStatement();
}
}
function parseSourceElements() {
var sourceElement, sourceElements = [], token, directive, firstRestricted;
while (index < length) {
- token = lookahead();
+ token = lookahead;
if (token.type !== Token.StringLiteral) {
break;
}
sourceElement = parseSourceElement();
sourceElements.push(sourceElement);
if (sourceElement.expression.type !== Syntax.Literal) {
// this is not directive
break;
}
- directive = sliceSource(token.range[0] + 1, token.range[1] - 1);
+ directive = source.slice(token.start + 1, token.end - 1);
if (directive === 'use strict') {
strict = true;
if (firstRestricted) {
throwErrorTolerant(firstRestricted, Messages.StrictOctalLiteral);
}
@@ -7581,266 +8042,31 @@
}
}
while (index < length) {
sourceElement = parseSourceElement();
+ /* istanbul ignore if */
if (typeof sourceElement === 'undefined') {
break;
}
sourceElements.push(sourceElement);
}
return sourceElements;
}
function parseProgram() {
- var program;
- strict = false;
- program = {
- type: Syntax.Program,
- body: parseSourceElements()
- };
- return program;
- }
+ var body, startToken;
- // The following functions are needed only when the option to preserve
- // the comments is active.
-
- function addComment(type, value, start, end, loc) {
- assert(typeof start === 'number', 'Comment must have valid position');
-
- // Because the way the actual token is scanned, often the comments
- // (if any) are skipped twice during the lexical analysis.
- // Thus, we need to skip adding a comment if the comment array already
- // handled it.
- if (extra.comments.length > 0) {
- if (extra.comments[extra.comments.length - 1].range[1] > start) {
- return;
- }
- }
-
- extra.comments.push({
- type: type,
- value: value,
- range: [start, end],
- loc: loc
- });
- }
-
- function scanComment() {
- var comment, ch, loc, start, blockComment, lineComment;
-
- comment = '';
- blockComment = false;
- lineComment = false;
-
- while (index < length) {
- ch = source[index];
-
- if (lineComment) {
- ch = source[index++];
- if (isLineTerminator(ch)) {
- loc.end = {
- line: lineNumber,
- column: index - lineStart - 1
- };
- lineComment = false;
- addComment('Line', comment, start, index - 1, loc);
- if (ch === '\r' && source[index] === '\n') {
- ++index;
- }
- ++lineNumber;
- lineStart = index;
- comment = '';
- } else if (index >= length) {
- lineComment = false;
- comment += ch;
- loc.end = {
- line: lineNumber,
- column: length - lineStart
- };
- addComment('Line', comment, start, length, loc);
- } else {
- comment += ch;
- }
- } else if (blockComment) {
- if (isLineTerminator(ch)) {
- if (ch === '\r' && source[index + 1] === '\n') {
- ++index;
- comment += '\r\n';
- } else {
- comment += ch;
- }
- ++lineNumber;
- ++index;
- lineStart = index;
- if (index >= length) {
- throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
- }
- } else {
- ch = source[index++];
- if (index >= length) {
- throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
- }
- comment += ch;
- if (ch === '*') {
- ch = source[index];
- if (ch === '/') {
- comment = comment.substr(0, comment.length - 1);
- blockComment = false;
- ++index;
- loc.end = {
- line: lineNumber,
- column: index - lineStart
- };
- addComment('Block', comment, start, index, loc);
- comment = '';
- }
- }
- }
- } else if (ch === '/') {
- ch = source[index + 1];
- if (ch === '/') {
- loc = {
- start: {
- line: lineNumber,
- column: index - lineStart
- }
- };
- start = index;
- index += 2;
- lineComment = true;
- if (index >= length) {
- loc.end = {
- line: lineNumber,
- column: index - lineStart
- };
- lineComment = false;
- addComment('Line', comment, start, index, loc);
- }
- } else if (ch === '*') {
- start = index;
- index += 2;
- blockComment = true;
- loc = {
- start: {
- line: lineNumber,
- column: index - lineStart - 2
- }
- };
- if (index >= length) {
- throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
- }
- } else {
- break;
- }
- } else if (isWhiteSpace(ch)) {
- ++index;
- } else if (isLineTerminator(ch)) {
- ++index;
- if (ch === '\r' && source[index] === '\n') {
- ++index;
- }
- ++lineNumber;
- lineStart = index;
- } else {
- break;
- }
- }
- }
-
- function filterCommentLocation() {
- var i, entry, comment, comments = [];
-
- for (i = 0; i < extra.comments.length; ++i) {
- entry = extra.comments[i];
- comment = {
- type: entry.type,
- value: entry.value
- };
- if (extra.range) {
- comment.range = entry.range;
- }
- if (extra.loc) {
- comment.loc = entry.loc;
- }
- comments.push(comment);
- }
-
- extra.comments = comments;
- }
-
- function collectToken() {
- var start, loc, token, range, value;
-
skipComment();
- start = index;
- loc = {
- start: {
- line: lineNumber,
- column: index - lineStart
- }
- };
+ peek();
+ startToken = lookahead;
+ strict = false;
- token = extra.advance();
- loc.end = {
- line: lineNumber,
- column: index - lineStart
- };
-
- if (token.type !== Token.EOF) {
- range = [token.range[0], token.range[1]];
- value = sliceSource(token.range[0], token.range[1]);
- extra.tokens.push({
- type: TokenName[token.type],
- value: value,
- range: range,
- loc: loc
- });
- }
-
- return token;
+ body = parseSourceElements();
+ return delegate.markEnd(delegate.createProgram(body), startToken);
}
- function collectRegex() {
- var pos, loc, regex, token;
-
- skipComment();
-
- pos = index;
- loc = {
- start: {
- line: lineNumber,
- column: index - lineStart
- }
- };
-
- regex = extra.scanRegExp();
- loc.end = {
- line: lineNumber,
- column: index - lineStart
- };
-
- // Pop the previous token, which is likely '/' or '/='
- if (extra.tokens.length > 0) {
- token = extra.tokens[extra.tokens.length - 1];
- if (token.range[0] === pos && token.type === 'Punctuator') {
- if (token.value === '/' || token.value === '/=') {
- extra.tokens.pop();
- }
- }
- }
-
- extra.tokens.push({
- type: 'RegularExpression',
- value: regex.literal,
- range: [pos, index],
- loc: loc
- });
-
- return regex;
- }
-
function filterTokenLocation() {
var i, entry, token, tokens = [];
for (i = 0; i < extra.tokens.length; ++i) {
entry = extra.tokens[i];
@@ -7858,524 +8084,180 @@
}
extra.tokens = tokens;
}
- function createLiteral(token) {
- return {
- type: Syntax.Literal,
- value: token.value
- };
- }
+ function tokenize(code, options) {
+ var toString,
+ token,
+ tokens;
- function createRawLiteral(token) {
- return {
- type: Syntax.Literal,
- value: token.value,
- raw: sliceSource(token.range[0], token.range[1])
- };
- }
+ toString = String;
+ if (typeof code !== 'string' && !(code instanceof String)) {
+ code = toString(code);
+ }
- function createLocationMarker() {
- var marker = {};
-
- marker.range = [index, index];
- marker.loc = {
- start: {
- line: lineNumber,
- column: index - lineStart
- },
- end: {
- line: lineNumber,
- column: index - lineStart
- }
+ delegate = SyntaxTreeDelegate;
+ source = code;
+ index = 0;
+ lineNumber = (source.length > 0) ? 1 : 0;
+ lineStart = 0;
+ length = source.length;
+ lookahead = null;
+ state = {
+ allowIn: true,
+ labelSet: {},
+ inFunctionBody: false,
+ inIteration: false,
+ inSwitch: false,
+ lastCommentStart: -1
};
- marker.end = function () {
- this.range[1] = index;
- this.loc.end.line = lineNumber;
- this.loc.end.column = index - lineStart;
- };
+ extra = {};
- marker.applyGroup = function (node) {
- if (extra.range) {
- node.groupRange = [this.range[0], this.range[1]];
- }
- if (extra.loc) {
- node.groupLoc = {
- start: {
- line: this.loc.start.line,
- column: this.loc.start.column
- },
- end: {
- line: this.loc.end.line,
- column: this.loc.end.column
- }
- };
- }
- };
+ // Options matching.
+ options = options || {};
- marker.apply = function (node) {
- if (extra.range) {
- node.range = [this.range[0], this.range[1]];
- }
- if (extra.loc) {
- node.loc = {
- start: {
- line: this.loc.start.line,
- column: this.loc.start.column
- },
- end: {
- line: this.loc.end.line,
- column: this.loc.end.column
- }
- };
- }
- };
+ // Of course we collect tokens here.
+ options.tokens = true;
+ extra.tokens = [];
+ extra.tokenize = true;
+ // The following two fields are necessary to compute the Regex tokens.
+ extra.openParenToken = -1;
+ extra.openCurlyToken = -1;
- return marker;
- }
+ extra.range = (typeof options.range === 'boolean') && options.range;
+ extra.loc = (typeof options.loc === 'boolean') && options.loc;
- function trackGroupExpression() {
- var marker, expr;
-
- skipComment();
- marker = createLocationMarker();
- expect('(');
-
- expr = parseExpression();
-
- expect(')');
-
- marker.end();
- marker.applyGroup(expr);
-
- return expr;
- }
-
- function trackLeftHandSideExpression() {
- var marker, expr;
-
- skipComment();
- marker = createLocationMarker();
-
- expr = matchKeyword('new') ? parseNewExpression() : parsePrimaryExpression();
-
- while (match('.') || match('[')) {
- if (match('[')) {
- expr = {
- type: Syntax.MemberExpression,
- computed: true,
- object: expr,
- property: parseComputedMember()
- };
- marker.end();
- marker.apply(expr);
- } else {
- expr = {
- type: Syntax.MemberExpression,
- computed: false,
- object: expr,
- property: parseNonComputedMember()
- };
- marker.end();
- marker.apply(expr);
- }
+ if (typeof options.comment === 'boolean' && options.comment) {
+ extra.comments = [];
}
-
- return expr;
- }
-
- function trackLeftHandSideExpressionAllowCall() {
- var marker, expr;
-
- skipComment();
- marker = createLocationMarker();
-
- expr = matchKeyword('new') ? parseNewExpression() : parsePrimaryExpression();
-
- while (match('.') || match('[') || match('(')) {
- if (match('(')) {
- expr = {
- type: Syntax.CallExpression,
- callee: expr,
- 'arguments': parseArguments()
- };
- marker.end();
- marker.apply(expr);
- } else if (match('[')) {
- expr = {
- type: Syntax.MemberExpression,
- computed: true,
- object: expr,
- property: parseComputedMember()
- };
- marker.end();
- marker.apply(expr);
- } else {
- expr = {
- type: Syntax.MemberExpression,
- computed: false,
- object: expr,
- property: parseNonComputedMember()
- };
- marker.end();
- marker.apply(expr);
- }
+ if (typeof options.tolerant === 'boolean' && options.tolerant) {
+ extra.errors = [];
}
- return expr;
- }
-
- function filterGroup(node) {
- var n, i, entry;
-
- n = (Object.prototype.toString.apply(node) === '[object Array]') ? [] : {};
- for (i in node) {
- if (node.hasOwnProperty(i) && i !== 'groupRange' && i !== 'groupLoc') {
- entry = node[i];
- if (entry === null || typeof entry !== 'object' || entry instanceof RegExp) {
- n[i] = entry;
- } else {
- n[i] = filterGroup(entry);
- }
+ try {
+ peek();
+ if (lookahead.type === Token.EOF) {
+ return extra.tokens;
}
- }
- return n;
- }
- function wrapTrackingFunction(range, loc) {
-
- return function (parseFunction) {
-
- function isBinary(node) {
- return node.type === Syntax.LogicalExpression ||
- node.type === Syntax.BinaryExpression;
- }
-
- function visit(node) {
- var start, end;
-
- if (isBinary(node.left)) {
- visit(node.left);
- }
- if (isBinary(node.right)) {
- visit(node.right);
- }
-
- if (range) {
- if (node.left.groupRange || node.right.groupRange) {
- start = node.left.groupRange ? node.left.groupRange[0] : node.left.range[0];
- end = node.right.groupRange ? node.right.groupRange[1] : node.right.range[1];
- node.range = [start, end];
- } else if (typeof node.range === 'undefined') {
- start = node.left.range[0];
- end = node.right.range[1];
- node.range = [start, end];
+ token = lex();
+ while (lookahead.type !== Token.EOF) {
+ try {
+ token = lex();
+ } catch (lexError) {
+ token = lookahead;
+ if (extra.errors) {
+ extra.errors.push(lexError);
+ // We have to break on the first error
+ // to avoid infinite loops.
+ break;
+ } else {
+ throw lexError;
}
}
- if (loc) {
- if (node.left.groupLoc || node.right.groupLoc) {
- start = node.left.groupLoc ? node.left.groupLoc.start : node.left.loc.start;
- end = node.right.groupLoc ? node.right.groupLoc.end : node.right.loc.end;
- node.loc = {
- start: start,
- end: end
- };
- } else if (typeof node.loc === 'undefined') {
- node.loc = {
- start: node.left.loc.start,
- end: node.right.loc.end
- };
- }
- }
}
- return function () {
- var marker, node;
-
- skipComment();
-
- marker = createLocationMarker();
- node = parseFunction.apply(null, arguments);
- marker.end();
-
- if (range && typeof node.range === 'undefined') {
- marker.apply(node);
- }
-
- if (loc && typeof node.loc === 'undefined') {
- marker.apply(node);
- }
-
- if (isBinary(node)) {
- visit(node);
- }
-
- return node;
- };
- };
- }
-
- function patch() {
-
- var wrapTracking;
-
- if (extra.comments) {
- extra.skipComment = skipComment;
- skipComment = scanComment;
+ filterTokenLocation();
+ tokens = extra.tokens;
+ if (typeof extra.comments !== 'undefined') {
+ tokens.comments = extra.comments;
+ }
+ if (typeof extra.errors !== 'undefined') {
+ tokens.errors = extra.errors;
+ }
+ } catch (e) {
+ throw e;
+ } finally {
+ extra = {};
}
-
- if (extra.raw) {
- extra.createLiteral = createLiteral;
- createLiteral = createRawLiteral;
- }
-
- if (extra.range || extra.loc) {
-
- extra.parseGroupExpression = parseGroupExpression;
- extra.parseLeftHandSideExpression = parseLeftHandSideExpression;
- extra.parseLeftHandSideExpressionAllowCall = parseLeftHandSideExpressionAllowCall;
- parseGroupExpression = trackGroupExpression;
- parseLeftHandSideExpression = trackLeftHandSideExpression;
- parseLeftHandSideExpressionAllowCall = trackLeftHandSideExpressionAllowCall;
-
- wrapTracking = wrapTrackingFunction(extra.range, extra.loc);
-
- extra.parseAdditiveExpression = parseAdditiveExpression;
- extra.parseAssignmentExpression = parseAssignmentExpression;
- extra.parseBitwiseANDExpression = parseBitwiseANDExpression;
- extra.parseBitwiseORExpression = parseBitwiseORExpression;
- extra.parseBitwiseXORExpression = parseBitwiseXORExpression;
- extra.parseBlock = parseBlock;
- extra.parseFunctionSourceElements = parseFunctionSourceElements;
- extra.parseCatchClause = parseCatchClause;
- extra.parseComputedMember = parseComputedMember;
- extra.parseConditionalExpression = parseConditionalExpression;
- extra.parseConstLetDeclaration = parseConstLetDeclaration;
- extra.parseEqualityExpression = parseEqualityExpression;
- extra.parseExpression = parseExpression;
- extra.parseForVariableDeclaration = parseForVariableDeclaration;
- extra.parseFunctionDeclaration = parseFunctionDeclaration;
- extra.parseFunctionExpression = parseFunctionExpression;
- extra.parseLogicalANDExpression = parseLogicalANDExpression;
- extra.parseLogicalORExpression = parseLogicalORExpression;
- extra.parseMultiplicativeExpression = parseMultiplicativeExpression;
- extra.parseNewExpression = parseNewExpression;
- extra.parseNonComputedProperty = parseNonComputedProperty;
- extra.parseObjectProperty = parseObjectProperty;
- extra.parseObjectPropertyKey = parseObjectPropertyKey;
- extra.parsePostfixExpression = parsePostfixExpression;
- extra.parsePrimaryExpression = parsePrimaryExpression;
- extra.parseProgram = parseProgram;
- extra.parsePropertyFunction = parsePropertyFunction;
- extra.parseRelationalExpression = parseRelationalExpression;
- extra.parseStatement = parseStatement;
- extra.parseShiftExpression = parseShiftExpression;
- extra.parseSwitchCase = parseSwitchCase;
- extra.parseUnaryExpression = parseUnaryExpression;
- extra.parseVariableDeclaration = parseVariableDeclaration;
- extra.parseVariableIdentifier = parseVariableIdentifier;
-
- parseAdditiveExpression = wrapTracking(extra.parseAdditiveExpression);
- parseAssignmentExpression = wrapTracking(extra.parseAssignmentExpression);
- parseBitwiseANDExpression = wrapTracking(extra.parseBitwiseANDExpression);
- parseBitwiseORExpression = wrapTracking(extra.parseBitwiseORExpression);
- parseBitwiseXORExpression = wrapTracking(extra.parseBitwiseXORExpression);
- parseBlock = wrapTracking(extra.parseBlock);
- parseFunctionSourceElements = wrapTracking(extra.parseFunctionSourceElements);
- parseCatchClause = wrapTracking(extra.parseCatchClause);
- parseComputedMember = wrapTracking(extra.parseComputedMember);
- parseConditionalExpression = wrapTracking(extra.parseConditionalExpression);
- parseConstLetDeclaration = wrapTracking(extra.parseConstLetDeclaration);
- parseEqualityExpression = wrapTracking(extra.parseEqualityExpression);
- parseExpression = wrapTracking(extra.parseExpression);
- parseForVariableDeclaration = wrapTracking(extra.parseForVariableDeclaration);
- parseFunctionDeclaration = wrapTracking(extra.parseFunctionDeclaration);
- parseFunctionExpression = wrapTracking(extra.parseFunctionExpression);
- parseLeftHandSideExpression = wrapTracking(parseLeftHandSideExpression);
- parseLogicalANDExpression = wrapTracking(extra.parseLogicalANDExpression);
- parseLogicalORExpression = wrapTracking(extra.parseLogicalORExpression);
- parseMultiplicativeExpression = wrapTracking(extra.parseMultiplicativeExpression);
- parseNewExpression = wrapTracking(extra.parseNewExpression);
- parseNonComputedProperty = wrapTracking(extra.parseNonComputedProperty);
- parseObjectProperty = wrapTracking(extra.parseObjectProperty);
- parseObjectPropertyKey = wrapTracking(extra.parseObjectPropertyKey);
- parsePostfixExpression = wrapTracking(extra.parsePostfixExpression);
- parsePrimaryExpression = wrapTracking(extra.parsePrimaryExpression);
- parseProgram = wrapTracking(extra.parseProgram);
- parsePropertyFunction = wrapTracking(extra.parsePropertyFunction);
- parseRelationalExpression = wrapTracking(extra.parseRelationalExpression);
- parseStatement = wrapTracking(extra.parseStatement);
- parseShiftExpression = wrapTracking(extra.parseShiftExpression);
- parseSwitchCase = wrapTracking(extra.parseSwitchCase);
- parseUnaryExpression = wrapTracking(extra.parseUnaryExpression);
- parseVariableDeclaration = wrapTracking(extra.parseVariableDeclaration);
- parseVariableIdentifier = wrapTracking(extra.parseVariableIdentifier);
- }
-
- if (typeof extra.tokens !== 'undefined') {
- extra.advance = advance;
- extra.scanRegExp = scanRegExp;
-
- advance = collectToken;
- scanRegExp = collectRegex;
- }
+ return tokens;
}
- function unpatch() {
- if (typeof extra.skipComment === 'function') {
- skipComment = extra.skipComment;
- }
-
- if (extra.raw) {
- createLiteral = extra.createLiteral;
- }
-
- if (extra.range || extra.loc) {
- parseAdditiveExpression = extra.parseAdditiveExpression;
- parseAssignmentExpression = extra.parseAssignmentExpression;
- parseBitwiseANDExpression = extra.parseBitwiseANDExpression;
- parseBitwiseORExpression = extra.parseBitwiseORExpression;
- parseBitwiseXORExpression = extra.parseBitwiseXORExpression;
- parseBlock = extra.parseBlock;
- parseFunctionSourceElements = extra.parseFunctionSourceElements;
- parseCatchClause = extra.parseCatchClause;
- parseComputedMember = extra.parseComputedMember;
- parseConditionalExpression = extra.parseConditionalExpression;
- parseConstLetDeclaration = extra.parseConstLetDeclaration;
- parseEqualityExpression = extra.parseEqualityExpression;
- parseExpression = extra.parseExpression;
- parseForVariableDeclaration = extra.parseForVariableDeclaration;
- parseFunctionDeclaration = extra.parseFunctionDeclaration;
- parseFunctionExpression = extra.parseFunctionExpression;
- parseGroupExpression = extra.parseGroupExpression;
- parseLeftHandSideExpression = extra.parseLeftHandSideExpression;
- parseLeftHandSideExpressionAllowCall = extra.parseLeftHandSideExpressionAllowCall;
- parseLogicalANDExpression = extra.parseLogicalANDExpression;
- parseLogicalORExpression = extra.parseLogicalORExpression;
- parseMultiplicativeExpression = extra.parseMultiplicativeExpression;
- parseNewExpression = extra.parseNewExpression;
- parseNonComputedProperty = extra.parseNonComputedProperty;
- parseObjectProperty = extra.parseObjectProperty;
- parseObjectPropertyKey = extra.parseObjectPropertyKey;
- parsePrimaryExpression = extra.parsePrimaryExpression;
- parsePostfixExpression = extra.parsePostfixExpression;
- parseProgram = extra.parseProgram;
- parsePropertyFunction = extra.parsePropertyFunction;
- parseRelationalExpression = extra.parseRelationalExpression;
- parseStatement = extra.parseStatement;
- parseShiftExpression = extra.parseShiftExpression;
- parseSwitchCase = extra.parseSwitchCase;
- parseUnaryExpression = extra.parseUnaryExpression;
- parseVariableDeclaration = extra.parseVariableDeclaration;
- parseVariableIdentifier = extra.parseVariableIdentifier;
- }
-
- if (typeof extra.scanRegExp === 'function') {
- advance = extra.advance;
- scanRegExp = extra.scanRegExp;
- }
- }
-
- function stringToArray(str) {
- var length = str.length,
- result = [],
- i;
- for (i = 0; i < length; ++i) {
- result[i] = str.charAt(i);
- }
- return result;
- }
-
function parse(code, options) {
var program, toString;
toString = String;
if (typeof code !== 'string' && !(code instanceof String)) {
code = toString(code);
}
+ delegate = SyntaxTreeDelegate;
source = code;
index = 0;
lineNumber = (source.length > 0) ? 1 : 0;
lineStart = 0;
length = source.length;
- buffer = null;
+ lookahead = null;
state = {
allowIn: true,
labelSet: {},
inFunctionBody: false,
inIteration: false,
- inSwitch: false
+ inSwitch: false,
+ lastCommentStart: -1
};
extra = {};
if (typeof options !== 'undefined') {
extra.range = (typeof options.range === 'boolean') && options.range;
extra.loc = (typeof options.loc === 'boolean') && options.loc;
- extra.raw = (typeof options.raw === 'boolean') && options.raw;
+ extra.attachComment = (typeof options.attachComment === 'boolean') && options.attachComment;
+
+ if (extra.loc && options.source !== null && options.source !== undefined) {
+ extra.source = toString(options.source);
+ }
+
if (typeof options.tokens === 'boolean' && options.tokens) {
extra.tokens = [];
}
if (typeof options.comment === 'boolean' && options.comment) {
extra.comments = [];
}
if (typeof options.tolerant === 'boolean' && options.tolerant) {
extra.errors = [];
}
- }
-
- if (length > 0) {
- if (typeof source[0] === 'undefined') {
- // Try first to convert to a string. This is good as fast path
- // for old IE which understands string indexing for string
- // literals only and not for string object.
- if (code instanceof String) {
- source = code.valueOf();
- }
-
- // Force accessing the characters via an array.
- if (typeof source[0] === 'undefined') {
- source = stringToArray(code);
- }
+ if (extra.attachComment) {
+ extra.range = true;
+ extra.comments = [];
+ extra.bottomRightStack = [];
+ extra.trailingComments = [];
+ extra.leadingComments = [];
}
}
- patch();
try {
program = parseProgram();
if (typeof extra.comments !== 'undefined') {
- filterCommentLocation();
program.comments = extra.comments;
}
if (typeof extra.tokens !== 'undefined') {
filterTokenLocation();
program.tokens = extra.tokens;
}
if (typeof extra.errors !== 'undefined') {
program.errors = extra.errors;
}
- if (extra.range || extra.loc) {
- program.body = filterGroup(program.body);
- }
} catch (e) {
throw e;
} finally {
- unpatch();
extra = {};
}
return program;
}
- // Sync with package.json.
- exports.version = '1.0.4';
+ // Sync with *.json manifests.
+ exports.version = '1.2.2';
+ exports.tokenize = tokenize;
+
exports.parse = parse;
// Deep copy.
+ /* istanbul ignore next */
exports.Syntax = (function () {
var name, types = {};
if (typeof Object.create === 'function') {
types = Object.create(null);
@@ -13609,11 +13491,11 @@
* - sources: An array of URLs to the original source files.
* - names: An array of identifiers which can be referrenced by individual mappings.
* - sourceRoot: Optional. The URL root from which all sources are relative.
* - sourcesContent: Optional. An array of contents of the original source files.
* - mappings: A string of base64 VLQs which contain the actual mappings.
- * - file: The generated file this source map is associated with.
+ * - file: Optional. The generated file this source map is associated with.
*
* Here is an example source map, taken from the source map spec[0]:
*
* {
* version : 3,
@@ -13893,11 +13775,11 @@
this._generatedMappings,
"generatedLine",
"generatedColumn",
util.compareByGeneratedPositions);
- if (mapping) {
+ if (mapping && mapping.generatedLine === needle.generatedLine) {
var source = util.getArg(mapping, 'source', null);
if (source && this.sourceRoot) {
source = util.join(this.sourceRoot, source);
}
return {
@@ -14071,18 +13953,21 @@
var util = require('./util');
var ArraySet = require('./array-set').ArraySet;
/**
* An instance of the SourceMapGenerator represents a source map which is
- * being built incrementally. To create a new one, you must pass an object
- * with the following properties:
+ * being built incrementally. You may pass an object with the following
+ * properties:
*
* - file: The filename of the generated source.
- * - sourceRoot: An optional root for all URLs in this source map.
+ * - sourceRoot: A root for all relative URLs in this source map.
*/
function SourceMapGenerator(aArgs) {
- this._file = util.getArg(aArgs, 'file');
+ if (!aArgs) {
+ aArgs = {};
+ }
+ this._file = util.getArg(aArgs, 'file', null);
this._sourceRoot = util.getArg(aArgs, 'sourceRoot', null);
this._sources = new ArraySet();
this._names = new ArraySet();
this._mappings = [];
this._sourcesContents = null;
@@ -14208,15 +14093,27 @@
* resulting mappings is the minimium of this map and the supplied map.
*
* @param aSourceMapConsumer The source map to be applied.
* @param aSourceFile Optional. The filename of the source file.
* If omitted, SourceMapConsumer's file property will be used.
+ * @param aSourceMapPath Optional. The dirname of the path to the source map
+ * to be applied. If relative, it is relative to the SourceMapConsumer.
+ * This parameter is needed when the two source maps aren't in the same
+ * directory, and the source map to be applied contains relative source
+ * paths. If so, those relative source paths need to be rewritten
+ * relative to the SourceMapGenerator.
*/
SourceMapGenerator.prototype.applySourceMap =
- function SourceMapGenerator_applySourceMap(aSourceMapConsumer, aSourceFile) {
+ function SourceMapGenerator_applySourceMap(aSourceMapConsumer, aSourceFile, aSourceMapPath) {
// If aSourceFile is omitted, we will use the file property of the SourceMap
if (!aSourceFile) {
+ if (!aSourceMapConsumer.file) {
+ throw new Error(
+ 'SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, ' +
+ 'or the source map\'s "file" property. Both were omitted.'
+ );
+ }
aSourceFile = aSourceMapConsumer.file;
}
var sourceRoot = this._sourceRoot;
// Make "aSourceFile" relative if an absolute Url is passed.
if (sourceRoot) {
@@ -14235,14 +14132,16 @@
line: mapping.originalLine,
column: mapping.originalColumn
});
if (original.source !== null) {
// Copy mapping
+ mapping.source = original.source;
+ if (aSourceMapPath) {
+ mapping.source = util.join(aSourceMapPath, mapping.source)
+ }
if (sourceRoot) {
- mapping.source = util.relative(sourceRoot, original.source);
- } else {
- mapping.source = original.source;
+ mapping.source = util.relative(sourceRoot, mapping.source);
}
mapping.originalLine = original.line;
mapping.originalColumn = original.column;
if (original.name !== null && mapping.name !== null) {
// Only use the identifier name if it's an identifier
@@ -14493,45 +14392,20 @@
// To extract it current and last mapping is used.
// Here we store the last mapping.
var lastMapping = null;
aSourceMapConsumer.eachMapping(function (mapping) {
- if (lastMapping === null) {
- // We add the generated code until the first mapping
- // to the SourceNode without any mapping.
- // Each line is added as separate string.
- while (lastGeneratedLine < mapping.generatedLine) {
- node.add(remainingLines.shift() + "\n");
- lastGeneratedLine++;
- }
- if (lastGeneratedColumn < mapping.generatedColumn) {
- var nextLine = remainingLines[0];
- node.add(nextLine.substr(0, mapping.generatedColumn));
- remainingLines[0] = nextLine.substr(mapping.generatedColumn);
- lastGeneratedColumn = mapping.generatedColumn;
- }
- } else {
+ if (lastMapping !== null) {
// We add the code from "lastMapping" to "mapping":
// First check if there is a new line in between.
if (lastGeneratedLine < mapping.generatedLine) {
var code = "";
- // Associate full lines with "lastMapping"
- do {
- code += remainingLines.shift() + "\n";
- lastGeneratedLine++;
- lastGeneratedColumn = 0;
- } while (lastGeneratedLine < mapping.generatedLine);
- // When we reached the correct line, we add code until we
- // reach the correct column too.
- if (lastGeneratedColumn < mapping.generatedColumn) {
- var nextLine = remainingLines[0];
- code += nextLine.substr(0, mapping.generatedColumn);
- remainingLines[0] = nextLine.substr(mapping.generatedColumn);
- lastGeneratedColumn = mapping.generatedColumn;
- }
- // Create the SourceNode.
- addMappingWithCode(lastMapping, code);
+ // Associate first line with "lastMapping"
+ addMappingWithCode(lastMapping, remainingLines.shift() + "\n");
+ lastGeneratedLine++;
+ lastGeneratedColumn = 0;
+ // The remaining code is added without mapping
} else {
// There is no new line in between.
// Associate the code between "lastGeneratedColumn" and
// "mapping.generatedColumn" with "lastMapping"
var nextLine = remainingLines[0];
@@ -14539,18 +14413,41 @@
lastGeneratedColumn);
remainingLines[0] = nextLine.substr(mapping.generatedColumn -
lastGeneratedColumn);
lastGeneratedColumn = mapping.generatedColumn;
addMappingWithCode(lastMapping, code);
+ // No more remaining code, continue
+ lastMapping = mapping;
+ return;
}
}
+ // We add the generated code until the first mapping
+ // to the SourceNode without any mapping.
+ // Each line is added as separate string.
+ while (lastGeneratedLine < mapping.generatedLine) {
+ node.add(remainingLines.shift() + "\n");
+ lastGeneratedLine++;
+ }
+ if (lastGeneratedColumn < mapping.generatedColumn) {
+ var nextLine = remainingLines[0];
+ node.add(nextLine.substr(0, mapping.generatedColumn));
+ remainingLines[0] = nextLine.substr(mapping.generatedColumn);
+ lastGeneratedColumn = mapping.generatedColumn;
+ }
lastMapping = mapping;
}, this);
// We have processed all mappings.
- // Associate the remaining code in the current line with "lastMapping"
- // and add the remaining lines without any mapping
- addMappingWithCode(lastMapping, remainingLines.join("\n"));
+ if (remainingLines.length > 0) {
+ if (lastMapping) {
+ // Associate the remaining code in the current line with "lastMapping"
+ var lastLine = remainingLines.shift();
+ if (remainingLines.length > 0) lastLine += "\n";
+ addMappingWithCode(lastMapping, lastLine);
+ }
+ // and add the remaining lines without any mapping
+ node.add(remainingLines.join("\n"));
+ }
// Copy sourcesContent into SourceNode
aSourceMapConsumer.sources.forEach(function (sourceFile) {
var content = aSourceMapConsumer.sourceContentFor(sourceFile);
if (content) {
@@ -14784,14 +14681,32 @@
}
});
lastOriginalSource = null;
sourceMappingActive = false;
}
- chunk.split('').forEach(function (ch) {
+ chunk.split('').forEach(function (ch, idx, array) {
if (ch === '\n') {
generated.line++;
generated.column = 0;
+ // Mappings end at eol
+ if (idx + 1 === array.length) {
+ lastOriginalSource = null;
+ sourceMappingActive = false;
+ } else if (sourceMappingActive) {
+ map.addMapping({
+ source: original.source,
+ original: {
+ line: original.line,
+ column: original.column
+ },
+ generated: {
+ line: generated.line,
+ column: generated.column
+ },
+ name: original.name
+ });
+ }
} else {
generated.column++;
}
});
});
@@ -14833,32 +14748,36 @@
throw new Error('"' + aName + '" is a required argument.');
}
}
exports.getArg = getArg;
- var urlRegexp = /([\w+\-.]+):\/\/((\w+:\w+)@)?([\w.]+)?(:(\d+))?(\S+)?/;
- var dataUrlRegexp = /^data:.+\,.+/;
+ var urlRegexp = /^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.]*)(?::(\d+))?(\S*)$/;
+ var dataUrlRegexp = /^data:.+\,.+$/;
function urlParse(aUrl) {
var match = aUrl.match(urlRegexp);
if (!match) {
return null;
}
return {
scheme: match[1],
- auth: match[3],
- host: match[4],
- port: match[6],
- path: match[7]
+ auth: match[2],
+ host: match[3],
+ port: match[4],
+ path: match[5]
};
}
exports.urlParse = urlParse;
function urlGenerate(aParsedUrl) {
- var url = aParsedUrl.scheme + "://";
+ var url = '';
+ if (aParsedUrl.scheme) {
+ url += aParsedUrl.scheme + ':';
+ }
+ url += '//';
if (aParsedUrl.auth) {
- url += aParsedUrl.auth + "@"
+ url += aParsedUrl.auth + '@';
}
if (aParsedUrl.host) {
url += aParsedUrl.host;
}
if (aParsedUrl.port) {
@@ -14869,23 +14788,116 @@
}
return url;
}
exports.urlGenerate = urlGenerate;
+ /**
+ * Normalizes a path, or the path portion of a URL:
+ *
+ * - Replaces consequtive slashes with one slash.
+ * - Removes unnecessary '.' parts.
+ * - Removes unnecessary '<dir>/..' parts.
+ *
+ * Based on code in the Node.js 'path' core module.
+ *
+ * @param aPath The path or url to normalize.
+ */
+ function normalize(aPath) {
+ var path = aPath;
+ var url = urlParse(aPath);
+ if (url) {
+ if (!url.path) {
+ return aPath;
+ }
+ path = url.path;
+ }
+ var isAbsolute = (path.charAt(0) === '/');
+
+ var parts = path.split(/\/+/);
+ for (var part, up = 0, i = parts.length - 1; i >= 0; i--) {
+ part = parts[i];
+ if (part === '.') {
+ parts.splice(i, 1);
+ } else if (part === '..') {
+ up++;
+ } else if (up > 0) {
+ if (part === '') {
+ // The first part is blank if the path is absolute. Trying to go
+ // above the root is a no-op. Therefore we can remove all '..' parts
+ // directly after the root.
+ parts.splice(i + 1, up);
+ up = 0;
+ } else {
+ parts.splice(i, 2);
+ up--;
+ }
+ }
+ }
+ path = parts.join('/');
+
+ if (path === '') {
+ path = isAbsolute ? '/' : '.';
+ }
+
+ if (url) {
+ url.path = path;
+ return urlGenerate(url);
+ }
+ return path;
+ }
+ exports.normalize = normalize;
+
+ /**
+ * Joins two paths/URLs.
+ *
+ * @param aRoot The root path or URL.
+ * @param aPath The path or URL to be joined with the root.
+ *
+ * - If aPath is a URL or a data URI, aPath is returned, unless aPath is a
+ * scheme-relative URL: Then the scheme of aRoot, if any, is prepended
+ * first.
+ * - Otherwise aPath is a path. If aRoot is a URL, then its path portion
+ * is updated with the result and aRoot is returned. Otherwise the result
+ * is returned.
+ * - If aPath is absolute, the result is aPath.
+ * - Otherwise the two paths are joined with a slash.
+ * - Joining for example 'http://' and 'www.example.com' is also supported.
+ */
function join(aRoot, aPath) {
- var url;
+ var aPathUrl = urlParse(aPath);
+ var aRootUrl = urlParse(aRoot);
+ if (aRootUrl) {
+ aRoot = aRootUrl.path || '/';
+ }
- if (aPath.match(urlRegexp) || aPath.match(dataUrlRegexp)) {
+ // `join(foo, '//www.example.org')`
+ if (aPathUrl && !aPathUrl.scheme) {
+ if (aRootUrl) {
+ aPathUrl.scheme = aRootUrl.scheme;
+ }
+ return urlGenerate(aPathUrl);
+ }
+
+ if (aPathUrl || aPath.match(dataUrlRegexp)) {
return aPath;
}
- if (aPath.charAt(0) === '/' && (url = urlParse(aRoot))) {
- url.path = aPath;
- return urlGenerate(url);
+ // `join('http://', 'www.example.com')`
+ if (aRootUrl && !aRootUrl.host && !aRootUrl.path) {
+ aRootUrl.host = aPath;
+ return urlGenerate(aRootUrl);
}
- return aRoot.replace(/\/$/, '') + '/' + aPath;
+ var joined = aPath.charAt(0) === '/'
+ ? aPath
+ : normalize(aRoot.replace(/\/+$/, '') + '/' + aPath);
+
+ if (aRootUrl) {
+ aRootUrl.path = joined;
+ return urlGenerate(aRootUrl);
+ }
+ return joined;
}
exports.join = join;
/**
* Because behavior goes wacky when you set `__proto__` on objects, we
@@ -18355,10 +18367,14 @@
var name;
do name = base54(++lname); while (!is_identifier(name));
node.mangled_name = name;
return true;
}
+ if (options.screw_ie8 && node instanceof AST_SymbolCatch) {
+ to_mangle.push(node.definition());
+ return;
+ }
});
this.walk(tw);
to_mangle.forEach(function(def){ def.mangle(options) });
});
@@ -19916,10 +19932,11 @@
evaluate : !false_by_default,
booleans : !false_by_default,
loops : !false_by_default,
unused : !false_by_default,
hoist_funs : !false_by_default,
+ keep_fargs : false,
hoist_vars : false,
if_return : !false_by_default,
join_vars : !false_by_default,
cascade : !false_by_default,
side_effects : !false_by_default,
@@ -20231,11 +20248,11 @@
CHANGED = true;
var body = as_statement_array(stat.body).slice(0, -1);
stat = stat.clone();
stat.condition = stat.condition.negate(compressor);
stat.body = make_node(AST_BlockStatement, stat, {
- body: ret
+ body: as_statement_array(stat.alternative).concat(ret)
});
stat.alternative = make_node(AST_BlockStatement, stat, {
body: body
});
ret = [ stat.transform(compressor) ];
@@ -20899,22 +20916,24 @@
}
// pass 3: we should drop declarations not in_use
var tt = new TreeTransformer(
function before(node, descend, in_list) {
if (node instanceof AST_Lambda && !(node instanceof AST_Accessor)) {
- for (var a = node.argnames, i = a.length; --i >= 0;) {
- var sym = a[i];
- if (sym.unreferenced()) {
- a.pop();
- compressor.warn("Dropping unused function argument {name} [{file}:{line},{col}]", {
- name : sym.name,
- file : sym.start.file,
- line : sym.start.line,
- col : sym.start.col
- });
+ if (!compressor.option("keep_fargs")) {
+ for (var a = node.argnames, i = a.length; --i >= 0;) {
+ var sym = a[i];
+ if (sym.unreferenced()) {
+ a.pop();
+ compressor.warn("Dropping unused function argument {name} [{file}:{line},{col}]", {
+ name : sym.name,
+ file : sym.start.file,
+ line : sym.start.line,
+ col : sym.start.col
+ });
+ }
+ else break;
}
- else break;
}
}
if (node instanceof AST_Defun && node !== self) {
if (!member(node.name.definition(), in_use)) {
compressor.warn("Dropping unused function {name} [{file}:{line},{col}]", {
@@ -22151,10 +22170,23 @@
alternative: alternative.args[0]
});
return consequent;
}
}
+ // x?y?z:a:a --> x&&y?z:a
+ if (consequent instanceof AST_Conditional
+ && consequent.alternative.equivalent_to(alternative)) {
+ return make_node(AST_Conditional, self, {
+ condition: make_node(AST_Binary, self, {
+ left: self.condition,
+ operator: "&&",
+ right: consequent.condition
+ }),
+ consequent: consequent.consequent,
+ alternative: alternative
+ });
+ }
return self;
});
OPT(AST_Boolean, function(self, compressor){
if (compressor.option("booleans")) {
@@ -22278,10 +22310,13 @@
if (orig_map) {
var info = orig_map.originalPositionFor({
line: orig_line,
column: orig_col
});
+ if (info.source === null) {
+ return;
+ }
source = info.source;
orig_line = info.line;
orig_col = info.column;
name = info.name;
}
@@ -22581,21 +22616,23 @@
compress : {}
});
base54.reset();
// 1. parse
- var toplevel = null;
+ var toplevel = null,
+ sourcesContent = {};
if (options.spidermonkey) {
toplevel = AST_Node.from_mozilla_ast(files);
} else {
if (typeof files == "string")
files = [ files ];
files.forEach(function(file){
var code = options.fromString
? file
: rjsFile.readFile(file, "utf8");
+ sourcesContent[file] = code;
toplevel = parse(code, {
filename: options.fromString ? name : file,
toplevel: toplevel
});
});
@@ -22627,10 +22664,18 @@
output.source_map = SourceMap({
file: options.outSourceMap,
orig: inMap,
root: options.sourceRoot
});
+ if (options.sourceMapIncludeSources) {
+ for (var file in sourcesContent) {
+ if (sourcesContent.hasOwnProperty(file)) {
+ options.source_map.get().setSourceContent(file, sourcesContent[file]);
+ }
+ }
+ }
+
}
if (options.output) {
merge(output, options.output);
}
var stream = OutputStream(output);
@@ -22716,11 +22761,15 @@
return output;
}
//This string is saved off because JSLint complains
//about obj.arguments use, as 'reserved word'
- var argPropName = 'arguments';
+ var argPropName = 'arguments',
+ //Default object to use for "scope" checking for UMD identifiers.
+ emptyScope = {},
+ mixin = lang.mixin,
+ hasProp = lang.hasProp;
//From an esprima example for traversing its ast.
function traverse(object, visitor) {
var key, child;
@@ -22818,11 +22867,11 @@
result = '',
moduleList = [],
needsDefine = true,
astRoot = esprima.parse(fileContents);
- parse.recurse(astRoot, function (callName, config, name, deps) {
+ parse.recurse(astRoot, function (callName, config, name, deps, node, factoryIdentifier, fnExpScope) {
if (!deps) {
deps = [];
}
if (callName === 'define' && (!name || name === moduleName)) {
@@ -22838,10 +22887,14 @@
name: name,
deps: deps
});
}
+ if (callName === 'define' && factoryIdentifier && hasProp(fnExpScope, factoryIdentifier)) {
+ return factoryIdentifier;
+ }
+
//If define was found, no need to dive deeper, unless
//the config explicitly wants to dig deeper.
return !!options.findNestedDependencies;
}, options);
@@ -22887,45 +22940,89 @@
* Handles parsing a file recursively for require calls.
* @param {Array} parentNode the AST node to start with.
* @param {Function} onMatch function to call on a parse match.
* @param {Object} [options] This is normally the build config options if
* it is passed.
+ * @param {Object} [fnExpScope] holds list of function expresssion
+ * argument identifiers, set up internally, not passed in
*/
- parse.recurse = function (object, onMatch, options) {
+ parse.recurse = function (object, onMatch, options, fnExpScope) {
//Like traverse, but skips if branches that would not be processed
//after has application that results in tests of true or false boolean
//literal values.
- var key, child,
+ var key, child, result, i, params, param,
hasHas = options && options.has;
+ fnExpScope = fnExpScope || emptyScope;
+
if (!object) {
return;
}
//If has replacement has resulted in if(true){} or if(false){}, take
//the appropriate branch and skip the other one.
if (hasHas && object.type === 'IfStatement' && object.test.type &&
object.test.type === 'Literal') {
if (object.test.value) {
//Take the if branch
- this.recurse(object.consequent, onMatch, options);
+ this.recurse(object.consequent, onMatch, options, fnExpScope);
} else {
//Take the else branch
- this.recurse(object.alternate, onMatch, options);
+ this.recurse(object.alternate, onMatch, options, fnExpScope);
}
} else {
- if (this.parseNode(object, onMatch) === false) {
+ result = this.parseNode(object, onMatch, fnExpScope);
+ if (result === false) {
return;
+ } else if (typeof result === 'string') {
+ return result;
}
+
+ //Build up a "scope" object that informs nested recurse calls if
+ //the define call references an identifier that is likely a UMD
+ //wrapped function expresion argument.
+ if (object.type === 'ExpressionStatement' && object.expression &&
+ object.expression.type === 'CallExpression' && object.expression.callee &&
+ object.expression.callee.type === 'FunctionExpression') {
+ object = object.expression.callee;
+
+ if (object.params && object.params.length) {
+ params = object.params;
+ fnExpScope = mixin({}, fnExpScope, true);
+ for (i = 0; i < params.length; i++) {
+ param = params[i];
+ if (param.type === 'Identifier') {
+ fnExpScope[param.name] = true;
+ }
+ }
+ }
+ }
+
for (key in object) {
if (object.hasOwnProperty(key)) {
child = object[key];
if (typeof child === 'object' && child !== null) {
- this.recurse(child, onMatch, options);
+ result = this.recurse(child, onMatch, options, fnExpScope);
+ if (typeof result === 'string') {
+ break;
+ }
}
}
}
+
+ //Check for an identifier for a factory function identifier being
+ //passed in as a function expression, indicating a UMD-type of
+ //wrapping.
+ if (typeof result === 'string') {
+ if (hasProp(fnExpScope, result)) {
+ //Just a plain return, parsing can continue past this
+ //point.
+ return;
+ }
+
+ return result;
+ }
}
};
/**
* Determines if the file defines the require/define module API.
@@ -23395,15 +23492,18 @@
* call.
* @param {Array} node
* @param {Function} onMatch a function to call when a match is found.
* It is passed the match name, and the config, name, deps possible args.
* The config, name and deps args are not normalized.
+ * @param {Object} fnExpScope an object whose keys are all function
+ * expression identifiers that should be in scope. Useful for UMD wrapper
+ * detection to avoid parsing more into the wrapped UMD code.
*
* @returns {String} a JS source string with the valid require/define call.
* Otherwise null.
*/
- parse.parseNode = function (node, onMatch) {
+ parse.parseNode = function (node, onMatch, fnExpScope) {
var name, deps, cjsDeps, arg, factory, exp, refsDefine, bodyNode,
args = node && node[argPropName],
callName = parse.hasRequire(node);
if (callName === 'require' || callName === 'requirejs') {
@@ -23472,11 +23572,13 @@
//Just save off the name as a string instead of an AST object.
if (name && name.type === 'Literal') {
name = name.value;
}
- return onMatch("define", null, name, deps, node);
+ return onMatch("define", null, name, deps, node,
+ (factory && factory.type === 'Identifier' ? factory.name : undefined),
+ fnExpScope);
} else if (node.type === 'CallExpression' && node.callee &&
node.callee.type === 'FunctionExpression' &&
node.callee.body && node.callee.body.body &&
node.callee.body.body.length === 1 &&
node.callee.body.body[0].type === 'IfStatement') {
@@ -23499,11 +23601,12 @@
return false;
}
});
if (refsDefine) {
- return onMatch("define", null, null, null, exp.expression);
+ return onMatch("define", null, null, null, exp.expression,
+ exp.expression.arguments[0].name, fnExpScope);
}
}
}
}
};
@@ -24098,16 +24201,16 @@
useStrictRegExp: /['"]use strict['"];/g,
hasRegExp: /has\s*\(\s*['"]([^'"]+)['"]\s*\)/g,
configRegExp: /(^|[^\.])(requirejs|require)(\.config)\s*\(/g,
nsWrapRegExp: /\/\*requirejs namespace: true \*\//,
apiDefRegExp: /var requirejs,\s*require,\s*define;/,
- defineCheckRegExp: /typeof\s+define\s*===\s*["']function["']\s*&&\s*define\s*\.\s*amd/g,
- defineStringCheckRegExp: /typeof\s+define\s*===\s*["']function["']\s*&&\s*define\s*\[\s*["']amd["']\s*\]/g,
+ defineCheckRegExp: /typeof\s+define\s*===?\s*["']function["']\s*&&\s*define\s*\.\s*amd/g,
+ defineStringCheckRegExp: /typeof\s+define\s*===?\s*["']function["']\s*&&\s*define\s*\[\s*["']amd["']\s*\]/g,
defineTypeFirstCheckRegExp: /\s*["']function["']\s*==(=?)\s*typeof\s+define\s*&&\s*define\s*\.\s*amd/g,
- defineJQueryRegExp: /typeof\s+define\s*===\s*["']function["']\s*&&\s*define\s*\.\s*amd\s*&&\s*define\s*\.\s*amd\s*\.\s*jQuery/g,
+ defineJQueryRegExp: /typeof\s+define\s*===?\s*["']function["']\s*&&\s*define\s*\.\s*amd\s*&&\s*define\s*\.\s*amd\s*\.\s*jQuery/g,
defineHasRegExp: /typeof\s+define\s*==(=)?\s*['"]function['"]\s*&&\s*typeof\s+define\.amd\s*==(=)?\s*['"]object['"]\s*&&\s*define\.amd/g,
- defineTernaryRegExp: /typeof\s+define\s*===\s*['"]function["']\s*&&\s*define\s*\.\s*amd\s*\?\s*define/,
+ defineTernaryRegExp: /typeof\s+define\s*===?\s*['"]function["']\s*&&\s*define\s*\.\s*amd\s*\?\s*define/,
amdefineRegExp: /if\s*\(\s*typeof define\s*\!==\s*'function'\s*\)\s*\{\s*[^\{\}]+amdefine[^\{\}]+\}/g,
removeStrict: function (contents, config) {
return config.useStrict ? contents : contents.replace(pragma.useStrictRegExp, '');
},
@@ -24401,12 +24504,18 @@
var JSSourceFilefromCode, optimize,
mapRegExp = /"file":"[^"]+"/;
//Bind to Closure compiler, but if it is not available, do not sweat it.
try {
+ // Try older closure compiler that worked on Java 6
JSSourceFilefromCode = java.lang.Class.forName('com.google.javascript.jscomp.JSSourceFile').getMethod('fromCode', [java.lang.String, java.lang.String]);
- } catch (e) {}
+ } catch (e) {
+ try {
+ // Try for newer closure compiler that needs Java 7+
+ JSSourceFilefromCode = java.lang.Class.forName('com.google.javascript.jscomp.SourceFile').getMethod('fromCode', [java.lang.String, java.lang.String]);
+ } catch (e) {}
+ }
//Helper for closure compiler, because of weird Java-JavaScript interactions.
function closurefromCode(filename, content) {
return JSSourceFilefromCode.invoke(null, [filename, content]);
}
@@ -24552,10 +24661,11 @@
var optimize,
cssImportRegExp = /\@import\s+(url\()?\s*([^);]+)\s*(\))?([\w, ]*)(;)?/ig,
cssCommentImportRegExp = /\/\*[^\*]*@import[^\*]*\*\//g,
cssUrlRegExp = /\url\(\s*([^\)]+)\s*\)?/g,
+ protocolRegExp = /^\w+:/,
SourceMapGenerator = sourceMap.SourceMapGenerator,
SourceMapConsumer =sourceMap.SourceMapConsumer;
/**
* If an URL from a CSS url value contains start/end quotes, remove them.
@@ -24576,24 +24686,23 @@
return url;
}
function fixCssUrlPaths(fileName, path, contents, cssPrefix) {
return contents.replace(cssUrlRegExp, function (fullMatch, urlMatch) {
- var colonIndex, firstChar, parts, i,
+ var firstChar, hasProtocol, parts, i,
fixedUrlMatch = cleanCssUrlQuotes(urlMatch);
fixedUrlMatch = fixedUrlMatch.replace(lang.backSlashRegExp, "/");
//Only do the work for relative URLs. Skip things that start with / or #, or have
//a protocol.
firstChar = fixedUrlMatch.charAt(0);
- colonIndex = fixedUrlMatch.indexOf(":");
- if (firstChar !== "/" && firstChar !== "#" && (colonIndex === -1 || colonIndex > fixedUrlMatch.indexOf("/"))) {
+ hasProtocol = protocolRegExp.test(fixedUrlMatch);
+ if (firstChar !== "/" && firstChar !== "#" && !hasProtocol) {
//It is a relative URL, tack on the cssPrefix and path prefix
urlMatch = cssPrefix + path + fixedUrlMatch;
-
- } else {
+ } else if (!hasProtocol) {
logger.trace(fileName + "\n URL not a relative URL, skipping: " + urlMatch);
}
//Collapse .. and .
parts = urlMatch.split("/");
@@ -25068,10 +25177,15 @@
var allowRun = true,
hasProp = lang.hasProp,
falseProp = lang.falseProp,
getOwn = lang.getOwn;
+ //Turn off throwing on resolution conflict, that was just an older prim
+ //idea about finding errors early, but does not comply with how promises
+ //should operate.
+ prim.hideResolutionConflict = true;
+
//This method should be called when the patches to require should take hold.
return function () {
if (!allowRun) {
return;
}
@@ -25212,11 +25326,11 @@
fullExec = context.fullExec,
mod = getOwn(context.registry, id);
if (mod && !mod.defined) {
if (parentId && getOwn(needFullExec, parentId)) {
- needFullExec[id] = true;
+ needFullExec[id] = depMap;
}
} else if ((getOwn(needFullExec, id) && falseProp(fullExec, id)) ||
(parentId && getOwn(needFullExec, parentId) &&
falseProp(fullExec, id))) {
@@ -25417,11 +25531,11 @@
pluginMap = context.makeModuleMap(map.prefix),
pluginId = pluginMap.id,
pluginMod = getOwn(context.registry, pluginId);
context.plugins[pluginId] = true;
- context.needFullExec[pluginId] = true;
+ context.needFullExec[pluginId] = map;
//If the module is not waiting to finish being defined,
//undef it and start over, to get full execution.
if (falseProp(context.fullExec, pluginId) && (!pluginMod || pluginMod.defined)) {
context.require.undef(pluginMap.id);
@@ -25494,17 +25608,30 @@
//what order of execution.
require.onResourceLoad = function (context, map) {
var id = map.id,
url;
+ // Fix up any maps that need to be normalized as part of the fullExec
+ // plumbing for plugins to participate in the build.
+ if (context.plugins && lang.hasProp(context.plugins, id)) {
+ lang.eachProp(context.needFullExec, function(value, prop) {
+ // For plugin entries themselves, they do not have a map
+ // value in needFullExec, just a "true" entry.
+ if (value !== true && value.prefix === id && value.unnormalized) {
+ var map = context.makeModuleMap(value.originalName, value.parentMap);
+ context.needFullExec[map.id] = map;
+ }
+ });
+ }
+
//If build needed a full execution, indicate it
//has been done now. But only do it if the context is tracking
//that. Only valid for the context used in a build, not for
//other contexts being run, like for useLib, plain requirejs
//use in node/rhino.
if (context.needFullExec && getOwn(context.needFullExec, id)) {
- context.fullExec[id] = true;
+ context.fullExec[id] = map;
}
//A plugin.
if (map.prefix) {
if (falseProp(layer.pathAdded, id)) {
@@ -25646,11 +25773,11 @@
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
/*jslint plusplus: true, nomen: true, regexp: true */
-/*global define, requirejs */
+/*global define, requirejs, java, process, console */
define('build', function (require) {
'use strict';
@@ -26504,11 +26631,12 @@
config[prop] = endsWithSlash(config[prop]);
}
}
- build.makeAbsObject(["out", "cssIn"], config, absFilePath);
+ build.makeAbsObject((config.out === "stdout" ? ["cssIn"] : ["out", "cssIn"]),
+ config, absFilePath);
build.makeAbsObject(["startFile", "endFile"], config.wrap, absFilePath);
};
/**
* Creates a relative path to targetPath from refPath.
@@ -26576,11 +26704,24 @@
value = source[prop];
isArray = lang.isArray(value);
if (typeof value === 'object' && value &&
!isArray && !lang.isFunction(value) &&
!lang.isRegExp(value)) {
- target[prop] = lang.mixin({}, target[prop], value, true);
+
+ // TODO: need to generalize this work, maybe also reuse
+ // the work done in requirejs configure, perhaps move to
+ // just a deep copy/merge overall. However, given the
+ // amount of observable change, wait for a dot release.
+ // This change is in relation to #645
+ if (prop === 'map') {
+ if (!target.map) {
+ target.map = {};
+ }
+ lang.deepMix(target.map, source.map);
+ } else {
+ target[prop] = lang.mixin({}, target[prop], value, true);
+ }
} else if (isArray) {
if (!skipArrays) {
// Some config, like packages, are arrays. For those,
// just merge the results.
targetValue = target[prop];
@@ -26787,10 +26928,27 @@
//Make sure dirBaseUrl ends in a slash, since it is
//concatenated with other strings.
config.dirBaseUrl = endsWithSlash(config.dirBaseUrl);
}
+
+ //If out=stdout, write output to STDOUT instead of a file.
+ if (config.out && config.out === 'stdout') {
+ config.out = function (content) {
+ var e = env.get();
+ if (e === 'rhino') {
+ var out = new java.io.PrintStream(java.lang.System.out, true, 'UTF-8');
+ out.println(content);
+ } else if (e === 'node') {
+ process.stdout.setEncoding('utf8');
+ process.stdout.write(content);
+ } else {
+ console.log(content);
+ }
+ };
+ }
+
//Check for errors in config
if (config.main) {
throw new Error('"main" passed as an option, but the ' +
'supported option is called "name".');
}
@@ -26824,11 +26982,11 @@
'where "out" with "baseUrl" is used to just ' +
'optimize to one file.');
}
if (config.out && config.dir) {
throw new Error('The "out" and "dir" options are incompatible.' +
- ' Use "out" if you are targeting a single file for' +
+ ' Use "out" if you are targeting a single file' +
' for optimization, and "dir" if you want the appDir' +
' or baseUrl directories optimized.');
}
if (config.dir) {
@@ -26924,14 +27082,15 @@
config.cssPrefix = endsWithSlash(config.cssPrefix);
} else {
config.cssPrefix = '';
}
- //Cycle through modules and combine any local stubModules with
- //global values.
+ //Cycle through modules and normalize
if (config.modules && config.modules.length) {
config.modules.forEach(function (mod) {
+
+ //Combine any local stubModules with global values.
if (config.stubModules) {
mod.stubModules = config.stubModules.concat(mod.stubModules || []);
}
//Create a hash lookup for the stubModules config to make lookup
@@ -26941,10 +27100,16 @@
mod.stubModules.forEach(function (id) {
mod.stubModules._byName[id] = true;
});
}
+ // Legacy command support, which allowed a single string ID
+ // for include.
+ if (typeof mod.include === 'string') {
+ mod.include = [mod.include];
+ }
+
//Allow wrap config in overrides, but normalize it.
if (mod.override) {
normalizeWrapConfig(mod.override, absFilePath);
}
});
@@ -26981,11 +27146,23 @@
//name for fileExclusionRegExp before 1.0.2. Support for backwards
//compatibility
file.exclusionRegExp = config.dirExclusionRegExp;
}
+ //Track the deps, but in a different key, so that they are not loaded
+ //as part of config seeding before all config is in play (#648). Was
+ //going to merge this in with "include", but include is added after
+ //the "name" target. To preserve what r.js has done previously, make
+ //sure "deps" comes before the "name".
+ if (config.deps) {
+ config._depsInclude = config.deps;
+ }
+
+
//Remove things that may cause problems in the build.
+ //deps already merged above
+ delete config.deps;
delete config.jQuery;
delete config.enforceDefine;
delete config.urlArgs;
return config;
@@ -27058,11 +27235,12 @@
require(lang.deeplikeCopy(baseLoaderConfig));
}
logger.trace("\nTracing dependencies for: " + (module.name ||
(typeof module.out === 'function' ? 'FUNCTION' : module.out)));
- include = module.name && !module.create ? [module.name] : [];
+ include = config._depsInclude || [];
+ include = include.concat(module.name && !module.create ? [module.name] : []);
if (module.include) {
include = include.concat(module.include);
}
//If there are overrides to basic config, set that up now.;
@@ -27446,20 +27624,23 @@
//If we have a name, but no defined module, then add in the placeholder.
if (moduleName && falseProp(layer.modulesWithNames, moduleName) && !config.skipModuleInsertion) {
shim = config.shim && (getOwn(config.shim, moduleName) || (packageMain && getOwn(config.shim, moduleName) || getOwn(config.shim, packageName)));
if (shim) {
if (config.wrapShim) {
- singleContents = '(function(root) {' +
- '\n' + namespaceWithDot + 'define("' + moduleName + '", ' +
+ singleContents = '(function(root) {\n' +
+ namespaceWithDot + 'define("' + moduleName + '", ' +
(shim.deps && shim.deps.length ?
build.makeJsArrayString(shim.deps) + ', ' : '[], ') +
'function() {\n' +
- ' return (function() {\n' +
+ ' return (function() {\n' +
singleContents +
- (shim.exportsFn ? shim.exportsFn() : '') +
- ' }).apply(root, arguments);\n' +
- ' });\n' +
+ // Start with a \n in case last line is a comment
+ // in the singleContents, like a sourceURL comment.
+ '\n' + (shim.exportsFn ? shim.exportsFn() : '') +
+ '\n' +
+ ' }).apply(root, arguments);\n' +
+ '});\n' +
'}(this));\n';
} else {
singleContents += '\n' + namespaceWithDot + 'define("' + moduleName + '", ' +
(shim.deps && shim.deps.length ?
build.makeJsArrayString(shim.deps) + ', ' : '') +
@@ -27767,10 +27948,10 @@
} else if (commandOption === 'v') {
console.log('r.js: ' + version +
', RequireJS: ' + this.requirejsVars.require.version +
- ', UglifyJS2: 2.4.12, UglifyJS: 1.3.4');
+ ', UglifyJS2: 2.4.13, UglifyJS: 1.3.4');
} else if (commandOption === 'convert') {
loadLib();
this.requirejsVars.require(['env!env/args', 'commonJs', 'env!env/print'],
function (args, commonJs, print) {