JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
02811ce35e
UglifyJS/lib/parse.js

2796 lines
101 KiB
JavaScript
Raw Normal View History

added license
2012-08-22 18:28:59 +00:00
/***********************************************************************
A JavaScript tokenizer / parser / beautifier / compressor.
https://github.com/mishoo/UglifyJS2
-------------------------------- (C) ---------------------------------
Author: Mihai Bazon
<mihai.bazon@gmail.com>
http://mihai.bazon.net/blog
Distributed under the BSD license:
update (c) years
2012-08-27 08:01:27 +00:00
Copyright 2012 (c) Mihai Bazon <mihai.bazon@gmail.com>
added license
2012-08-22 18:28:59 +00:00
Parser based on parse-js (http://marijn.haverbeke.nl/parse-js/).
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
* Redistributions of source code must retain the above
copyright notice, this list of conditions and the following
disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials
provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
***********************************************************************/
"use strict";
2012-10-02 09:45:31 +00:00
"use strict";
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
var KEYWORDS = 'break case catch class const continue debugger default delete do else export extends finally for function if in instanceof new return switch throw try typeof var let void while with import';
using makeComparator from acorn to generate functions that tests whether a string is keyword, reserved etc. speeds up the parser a bit, though not spectacular.. still far from acorn.
2012-10-11 08:52:05 +00:00
var KEYWORDS_ATOM = 'false null true';
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
var RESERVED_WORDS = 'enum implements interface package private protected public static super this ' + KEYWORDS_ATOM + " " + KEYWORDS;
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
var KEYWORDS_BEFORE_EXPRESSION = 'return new delete throw else case yield';
init repo
2012-05-27 11:09:01 +00:00
using makeComparator from acorn to generate functions that tests whether a string is keyword, reserved etc. speeds up the parser a bit, though not spectacular.. still far from acorn.
2012-10-11 08:52:05 +00:00
KEYWORDS = makePredicate(KEYWORDS);
RESERVED_WORDS = makePredicate(RESERVED_WORDS);
KEYWORDS_BEFORE_EXPRESSION = makePredicate(KEYWORDS_BEFORE_EXPRESSION);
KEYWORDS_ATOM = makePredicate(KEYWORDS_ATOM);
init repo
2012-05-27 11:09:01 +00:00
using makeComparator from acorn to generate functions that tests whether a string is keyword, reserved etc. speeds up the parser a bit, though not spectacular.. still far from acorn.
2012-10-11 08:52:05 +00:00
var OPERATOR_CHARS = makePredicate(characters("+-*&%=<>!?|~^"));
init repo
2012-05-27 11:09:01 +00:00
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
var RE_NUM_LITERAL = /[0-9a-f]/i;
init repo
2012-05-27 11:09:01 +00:00
var RE_HEX_NUMBER = /^0x[0-9a-f]+$/i;
var RE_OCT_NUMBER = /^0[0-7]+$/;
Add new-style octal literals and make the B and the O case insensitive.
2015-08-17 10:50:56 +00:00
var RE_ES6_OCT_NUMBER = /^0o[0-7]+$/i;
var RE_BIN_NUMBER = /^0b[01]+$/i;
init repo
2012-05-27 11:09:01 +00:00
var RE_DEC_NUMBER = /^\d*\.?\d*(?:e[+-]?\d*(?:\d\.?|\.?\d)\d*)?$/i;
using makeComparator from acorn to generate functions that tests whether a string is keyword, reserved etc. speeds up the parser a bit, though not spectacular.. still far from acorn.
2012-10-11 08:52:05 +00:00
var OPERATORS = makePredicate([
init repo
2012-05-27 11:09:01 +00:00
"in",
"instanceof",
"typeof",
"new",
"void",
"delete",
"++",
"--",
"+",
"-",
"!",
"~",
"&",
"|",
"^",
"*",
Add exponentiation operator
2016-06-17 22:25:18 +00:00
"**",
init repo
2012-05-27 11:09:01 +00:00
"/",
"%",
">>",
"<<",
">>>",
"<",
">",
"<=",
">=",
"==",
"===",
"!=",
"!==",
"?",
"=",
"+=",
"-=",
"/=",
"*=",
Add exponentiation operator
2016-06-17 22:25:18 +00:00
"**=",
init repo
2012-05-27 11:09:01 +00:00
"%=",
">>=",
"<<=",
">>>=",
"|=",
"^=",
"&=",
"&&",
"||"
]);
Various LineTerminator changes * Escaped newlines should also produce SyntaxError * Fix multiline comment parsing and add tests * Adapt makePredicate to handle \u2028 and \u2029 * Move up nlb check in regex so it's checked before any escape handling * Change error messages to conform ecma standard * Find_eol not recornizing \u2028 and \u2029 as line terminator * Remove \u180e as it is removed in unicode 6.3.0 from the category zs
2016-06-13 10:36:47 +00:00
var WHITESPACE_CHARS = makePredicate(characters(" \u00a0\n\r\t\f\u000b\u200b\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000\uFEFF"));
var NEWLINE_CHARS = makePredicate(characters("\n\r\u2028\u2029"));
init repo
2012-05-27 11:09:01 +00:00
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
var PUNC_AFTER_EXPRESSION = makePredicate(characters(";]),:"));
fix parser bugs & CLI reporting (#1827) fixes #1825
2017-04-18 20:27:13 +00:00
var PUNC_BEFORE_EXPRESSION = makePredicate(characters("[{(,;:"));
init repo
2012-05-27 11:09:01 +00:00
Template fixes * Fixes #1147: template strings not obeying -b ascii_only true * Allow evaluation of template expressions by adding optimizers and walkers * Make sure tagged templates are never changed * Remove template tokenizer in parser, add template tokenizer in tokenizer. It is using a brace counter to track brace position of templates * Add tokens `template_head` and `template_substitution` but parsing tokens stays mostly the same * Do not output strings anymore in AST_TemplateString, instead use AST_TemplateSegment * Fix parsing tagged templates, allowing multiple templates behind as spec allows this These changes don't influence tagged templates because raw content may influence code execution, however they are safe to do in normal templates: * Allow basic string concatenation of templates where possible * Allow custom character escape style similar to strings, except in tagged templates Note that expressions are still compressed in tagged templates. Optional things that may be improved later: * Custom quote style for templates if it doesn't have expressions. Making it obey the quote_style option if this is the case.
2016-06-22 17:24:03 +00:00
var PUNC_CHARS = makePredicate(characters("[]{}(),;:"));
init repo
2012-05-27 11:09:01 +00:00
using makeComparator from acorn to generate functions that tests whether a string is keyword, reserved etc. speeds up the parser a bit, though not spectacular.. still far from acorn.
2012-10-11 08:52:05 +00:00
var REGEXP_MODIFIERS = makePredicate(characters("gmsiy"));
init repo
2012-05-27 11:09:01 +00:00
/* -----[ Tokenizer ]----- */
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
// surrogate safe regexps adapted from https://github.com/mathiasbynens/unicode-8.0.0/tree/89b412d8a71ecca9ed593d9e9fa073ab64acfebe/Binary_Property
init repo
2012-05-27 11:09:01 +00:00
var UNICODE = {
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
ID_Start: /[A-Za-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\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-\u08B4\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\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\u0AF9\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-\u0C39\u0C3D\u0C58-\u0C5A\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\u0D5F-\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-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\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\u2118-\u211D\u2124\u2126\u2128\u212A-\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\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\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-\uFD3
ID_Continue: /[0-9A-Z_a-z\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\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-\u08B4\u08E3-\u0963\u0966-\u096F\u0971-\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\u0AF9\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\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\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\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\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\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\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-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\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\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\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\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4
init repo
2012-05-27 11:09:01 +00:00
};
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
function get_full_char(str, pos) {
var char = str.charAt(pos);
fix Unicode handling in parser (#1884) There was an implicit assumption that first character within surrogate header range implies the next character must form a surrogate pair, which is not necessarily true.
2017-05-08 17:58:31 +00:00
if (is_surrogate_pair_head(char)) {
var next = str.charAt(pos + 1);
if (is_surrogate_pair_tail(next)) {
return char + next;
}
}
if (is_surrogate_pair_tail(char)) {
var prev = str.charAt(pos - 1);
if (is_surrogate_pair_head(prev)) {
return prev + char;
}
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
}
return char;
}
init repo
2012-05-27 11:09:01 +00:00
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
function get_full_char_code(str, pos) {
// https://en.wikipedia.org/wiki/Universal_Character_Set_characters#Surrogates
if (is_surrogate_pair_head(str.charAt(pos))) {
return 0x10000 + (str.charCodeAt(pos) - 0xd800 << 10) + str.charCodeAt(pos + 1) - 0xdc00;
}
return str.charCodeAt(pos);
}
init repo
2012-05-27 11:09:01 +00:00
Improve multi-line comment parsing * Make sure comments are skipped correctly with surrogates * Fix regression in multiline comments with nlb
2016-07-04 12:30:27 +00:00
function get_full_char_length(str) {
var surrogates = 0;
for (var i = 0; i < str.length; i++) {
fix Unicode handling in parser (#1884) There was an implicit assumption that first character within surrogate header range implies the next character must form a surrogate pair, which is not necessarily true.
2017-05-08 17:58:31 +00:00
if (is_surrogate_pair_head(str.charCodeAt(i))) {
if (is_surrogate_pair_tail(str.charCodeAt(i + 1))) {
Improve multi-line comment parsing * Make sure comments are skipped correctly with surrogates * Fix regression in multiline comments with nlb
2016-07-04 12:30:27 +00:00
surrogates++;
i++;
}
}
}
return str.length - surrogates;
}
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
function from_char_code(code) {
// Based on https://github.com/mathiasbynens/String.fromCodePoint/blob/master/fromcodepoint.js
if (code > 0xFFFF) {
code -= 0x10000;
return (String.fromCharCode((code >> 10) + 0xD800) +
String.fromCharCode((code % 0x400) + 0xDC00));
}
return String.fromCharCode(code);
}
function is_surrogate_pair_head(code) {
if (typeof code === "string")
code = code.charCodeAt(0);
init repo
2012-05-27 11:09:01 +00:00
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
return code >= 0xd800 && code <= 0xdbff;
Add unicode digit parsing support
2015-01-19 20:35:53 +00:00
}
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
function is_surrogate_pair_tail(code) {
if (typeof code === "string")
code = code.charCodeAt(0);
return code >= 0xdc00 && code <= 0xdfff;
}
init repo
2012-05-27 11:09:01 +00:00
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
function is_digit(code) {
return code >= 48 && code <= 57;
init repo
2012-05-27 11:09:01 +00:00
};
code generator finally seems to work properly
2012-08-17 12:59:42 +00:00
function is_identifier(name) {
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
if (typeof name !== "string" || RESERVED_WORDS(name))
return false;
return true;
code generator finally seems to work properly
2012-08-17 12:59:42 +00:00
};
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
function is_identifier_start(ch) {
var code = ch.charCodeAt(0);
return UNICODE.ID_Start.test(ch) || code == 36 || code == 95;
init repo
2012-05-27 11:09:01 +00:00
};
function is_identifier_char(ch) {
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var code = ch.charCodeAt(0);
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
return UNICODE.ID_Continue.test(ch)
|| code == 36
|| code == 95
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
|| code == 8204 // \u200c: zero-width non-joiner <ZWNJ>
|| code == 8205 // \u200d: zero-width joiner <ZWJ> (in my ECMA-262 PDF, this is also 200c)
init repo
2012-05-27 11:09:01 +00:00
;
};
Fixed dot properties not optimizing unicode identifiers. Signed-off-by: Justin Lau <justin@tclau.com>
2013-05-05 18:45:41 +00:00
function is_identifier_string(str){
Always quote property names that contain non-ASCII characters. Fix #328
2014-04-18 07:47:38 +00:00
return /^[a-z_$][a-z0-9_$]*$/i.test(str);
Fixed dot properties not optimizing unicode identifiers. Signed-off-by: Justin Lau <justin@tclau.com>
2013-05-05 18:45:41 +00:00
};
init repo
2012-05-27 11:09:01 +00:00
function parse_js_number(num) {
if (RE_HEX_NUMBER.test(num)) {
return parseInt(num.substr(2), 16);
} else if (RE_OCT_NUMBER.test(num)) {
return parseInt(num.substr(1), 8);
Add new-style octal literals and make the B and the O case insensitive.
2015-08-17 10:50:56 +00:00
} else if (RE_ES6_OCT_NUMBER.test(num)) {
return parseInt(num.substr(2), 8);
Parse binary number literals
2015-08-14 02:24:54 +00:00
} else if (RE_BIN_NUMBER.test(num)) {
return parseInt(num.substr(2), 2);
init repo
2012-05-27 11:09:01 +00:00
} else if (RE_DEC_NUMBER.test(num)) {
return parseFloat(num);
Prevent ReDoS by not using a regexp to verify floating point numbers `parseFloat` will return `NaN` for invalid numbers anyway, which is the check used to throw the parse error. Fixes #857
2015-11-09 10:28:27 +00:00
} else {
Fix parsing invalid input i.e. `x = 1.xe` — because parseFloat("1.xe") returns 1, this parsed as `x = 1`. Ref #857
2015-11-09 11:15:20 +00:00
var val = parseFloat(num);
if (val == num) return val;
init repo
2012-05-27 11:09:01 +00:00
}
};
Add filename to the JS_Parse_Error exception. It would be nice to have access to the filename of the file that includes the code that causes a JavaScript error. This is especially handy if uglifying multiple files at once. Only a small change is needed for this to happen as it's already available in the function that throws the error.
2014-08-11 11:40:01 +00:00
function JS_Parse_Error(message, filename, line, col, pos) {
init repo
2012-05-27 11:09:01 +00:00
this.message = message;
Add filename to the JS_Parse_Error exception. It would be nice to have access to the filename of the file that includes the code that causes a JavaScript error. This is especially handy if uglifying multiple files at once. Only a small change is needed for this to happen as it's already available in the function that throws the error.
2014-08-11 11:40:01 +00:00
this.filename = filename;
line numbers start at 1
2012-10-02 13:39:53 +00:00
this.line = line;
this.col = col;
fix pos in syntax error exception
2012-10-11 12:25:38 +00:00
this.pos = pos;
init repo
2012-05-27 11:09:01 +00:00
};
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
JS_Parse_Error.prototype = Object.create(Error.prototype);
JS_Parse_Error.prototype.constructor = JS_Parse_Error;
JS_Parse_Error.prototype.name = "SyntaxError";
configure_error_stack(JS_Parse_Error);
init repo
2012-05-27 11:09:01 +00:00
log filename in parse errors / compressor warnings
2012-09-21 11:38:52 +00:00
function js_error(message, filename, line, col, pos) {
Add filename to the JS_Parse_Error exception. It would be nice to have access to the filename of the file that includes the code that causes a JavaScript error. This is especially handy if uglifying multiple files at once. Only a small change is needed for this to happen as it's already available in the function that throws the error.
2014-08-11 11:40:01 +00:00
throw new JS_Parse_Error(message, filename, line, col, pos);
init repo
2012-05-27 11:09:01 +00:00
};
function is_token(token, type, val) {
return token.type == type && (val == null || token.value == val);
};
var EX_EOF = {};
Implement shebang support
2015-02-20 15:08:01 +00:00
function tokenizer($TEXT, filename, html5_comments, shebang) {
init repo
2012-05-27 11:09:01 +00:00
var S = {
Treat \uFEFF as whitespace. Fix #714
2015-05-20 13:17:46 +00:00
text : $TEXT,
log filename in parse errors / compressor warnings
2012-09-21 11:38:52 +00:00
filename : filename,
Revert previous patch, it was no good.
2013-07-15 08:59:23 +00:00
pos : 0,
tokpos : 0,
line : 1,
tokline : 0,
col : 0,
tokcol : 0,
init repo
2012-05-27 11:09:01 +00:00
newline_before : false,
regex_allowed : false,
Template fixes * Fixes #1147: template strings not obeying -b ascii_only true * Allow evaluation of template expressions by adding optimizers and walkers * Make sure tagged templates are never changed * Remove template tokenizer in parser, add template tokenizer in tokenizer. It is using a brace counter to track brace position of templates * Add tokens `template_head` and `template_substitution` but parsing tokens stays mostly the same * Do not output strings anymore in AST_TemplateString, instead use AST_TemplateSegment * Fix parsing tagged templates, allowing multiple templates behind as spec allows this These changes don't influence tagged templates because raw content may influence code execution, however they are safe to do in normal templates: * Allow basic string concatenation of templates where possible * Allow custom character escape style similar to strings, except in tagged templates Note that expressions are still compressed in tagged templates. Optional things that may be improved later: * Custom quote style for templates if it doesn't have expressions. Making it obey the quote_style option if this is the case.
2016-06-22 17:24:03 +00:00
brace_counter : 0,
template_braces : [],
Throw errors in strict mode for octal strings Adds a directive tracker for the parser/tokenizer to allow parsing depending on directive context.
2016-05-20 08:25:35 +00:00
comments_before : [],
directives : {},
directive_stack : []
init repo
2012-05-27 11:09:01 +00:00
};
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
function peek() { return get_full_char(S.text, S.pos); };
init repo
2012-05-27 11:09:01 +00:00
function next(signal_eof, in_string) {
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
var ch = get_full_char(S.text, S.pos++);
init repo
2012-05-27 11:09:01 +00:00
if (signal_eof && !ch)
throw EX_EOF;
Various LineTerminator changes * Escaped newlines should also produce SyntaxError * Fix multiline comment parsing and add tests * Adapt makePredicate to handle \u2028 and \u2029 * Move up nlb check in regex so it's checked before any escape handling * Change error messages to conform ecma standard * Find_eol not recornizing \u2028 and \u2029 as line terminator * Remove \u180e as it is removed in unicode 6.3.0 from the category zs
2016-06-13 10:36:47 +00:00
if (NEWLINE_CHARS(ch)) {
init repo
2012-05-27 11:09:01 +00:00
S.newline_before = S.newline_before || !in_string;
++S.line;
S.col = 0;
Fix handling \r\n Close #437
2015-01-05 10:14:42 +00:00
if (!in_string && ch == "\r" && peek() == "\n") {
// treat a \r\n sequence as a single \n
++S.pos;
ch = "\n";
}
init repo
2012-05-27 11:09:01 +00:00
} else {
fix Unicode handling in parser (#1884) There was an implicit assumption that first character within surrogate header range implies the next character must form a surrogate pair, which is not necessarily true.
2017-05-08 17:58:31 +00:00
if (ch.length > 1) {
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
++S.pos;
++S.col;
}
init repo
2012-05-27 11:09:01 +00:00
++S.col;
}
return ch;
};
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
function forward(i) {
while (i-- > 0) next();
};
function looking_at(str) {
return S.text.substr(S.pos, str.length) == str;
};
Handle CR line endings in comments. Fixes #1050
2016-04-25 04:42:18 +00:00
function find_eol() {
var text = S.text;
for (var i = S.pos, n = S.text.length; i < n; ++i) {
var ch = text[i];
Various LineTerminator changes * Escaped newlines should also produce SyntaxError * Fix multiline comment parsing and add tests * Adapt makePredicate to handle \u2028 and \u2029 * Move up nlb check in regex so it's checked before any escape handling * Change error messages to conform ecma standard * Find_eol not recornizing \u2028 and \u2029 as line terminator * Remove \u180e as it is removed in unicode 6.3.0 from the category zs
2016-06-13 10:36:47 +00:00
if (NEWLINE_CHARS(ch))
Handle CR line endings in comments. Fixes #1050
2016-04-25 04:42:18 +00:00
return i;
}
return -1;
};
init repo
2012-05-27 11:09:01 +00:00
function find(what, signal_eof) {
var pos = S.text.indexOf(what, S.pos);
if (signal_eof && pos == -1) throw EX_EOF;
return pos;
};
function start_token() {
S.tokline = S.line;
S.tokcol = S.col;
S.tokpos = S.pos;
};
Fix parsing `a.case /= 1` Close #286
2013-09-02 08:09:54 +00:00
var prev_was_dot = false;
init repo
2012-05-27 11:09:01 +00:00
function token(type, value, is_comment) {
Fix typo. Close #239
2013-07-12 06:56:58 +00:00
S.regex_allowed = ((type == "operator" && !UNARY_POSTFIX(value)) ||
Better fix for #286
2013-09-02 08:36:48 +00:00
(type == "keyword" && KEYWORDS_BEFORE_EXPRESSION(value)) ||
Allow parsing regexp after arrow token (#1439)
2017-01-26 11:06:46 +00:00
(type == "punc" && PUNC_BEFORE_EXPRESSION(value))) ||
(type == "arrow");
fix parsing of property access after new line (#1944) Account for comments when detecting property access in `tokenizer`. fixes #1943
2017-05-15 21:40:49 +00:00
if (type == "punc" && value == ".") {
prev_was_dot = true;
} else if (!is_comment) {
prev_was_dot = false;
}
init repo
2012-05-27 11:09:01 +00:00
var ret = {
Track ending lines/columns; fix end locations in Mozilla AST.
2014-08-08 11:15:43 +00:00
type : type,
value : value,
line : S.tokline,
col : S.tokcol,
pos : S.tokpos,
endline : S.line,
endcol : S.col,
endpos : S.pos,
nlb : S.newline_before,
file : filename
init repo
2012-05-27 11:09:01 +00:00
};
Rework has_directive It's now available during tree walking, i.e. walker.has_directive("use asm"), rather than as part of the scope. It's thus no longer necessary to call `figure_out_scope` before codegen. Added special bits in the code generator to overcome the fact that it doesn't inherit from TreeWalker. Fix #861
2015-11-11 20:15:25 +00:00
if (/^(?:num|string|regexp)$/i.test(type)) {
Fix output for "use asm" code from SpiderMonkey AST (will only work properly if the SM tree contains "raw" properties for Literal number nodes)
2015-11-12 10:18:25 +00:00
ret.raw = $TEXT.substring(ret.pos, ret.endpos);
Rework has_directive It's now available during tree walking, i.e. walker.has_directive("use asm"), rather than as part of the scope. It's thus no longer necessary to call `figure_out_scope` before codegen. Added special bits in the code generator to overcome the fact that it doesn't inherit from TreeWalker. Fix #861
2015-11-11 20:15:25 +00:00
}
init repo
2012-05-27 11:09:01 +00:00
if (!is_comment) {
ret.comments_before = S.comments_before;
S.comments_before = [];
// make note of any newlines in the comments that came before
for (var i = 0, len = ret.comments_before.length; i < len; i++) {
ret.nlb = ret.nlb || ret.comments_before[i].nlb;
}
}
S.newline_before = false;
return new AST_Token(ret);
};
function skip_whitespace() {
Various LineTerminator changes * Escaped newlines should also produce SyntaxError * Fix multiline comment parsing and add tests * Adapt makePredicate to handle \u2028 and \u2029 * Move up nlb check in regex so it's checked before any escape handling * Change error messages to conform ecma standard * Find_eol not recornizing \u2028 and \u2029 as line terminator * Remove \u180e as it is removed in unicode 6.3.0 from the category zs
2016-06-13 10:36:47 +00:00
while (WHITESPACE_CHARS(peek()))
init repo
2012-05-27 11:09:01 +00:00
next();
};
function read_while(pred) {
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var ret = "", ch, i = 0;
while ((ch = peek()) && pred(ch, i++))
init repo
2012-05-27 11:09:01 +00:00
ret += next();
return ret;
};
function parse_error(err) {
log filename in parse errors / compressor warnings
2012-09-21 11:38:52 +00:00
js_error(err, filename, S.tokline, S.tokcol, S.tokpos);
init repo
2012-05-27 11:09:01 +00:00
};
function read_num(prefix) {
var has_e = false, after_e = false, has_x = false, has_dot = prefix == ".";
var num = read_while(function(ch, i){
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var code = ch.charCodeAt(0);
switch (code) {
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
case 98: case 66: // bB
return (has_x = true); // Can occur in hex sequence, don't return false yet
case 111: case 79: // oO
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
case 120: case 88: // xX
return has_x ? false : (has_x = true);
case 101: case 69: // eE
return has_x ? true : has_e ? false : (has_e = after_e = true);
case 45: // -
return after_e || (i == 0 && !prefix);
case 43: // +
return after_e;
case (after_e = false, 46): // .
return (!has_dot && !has_x && !has_e) ? (has_dot = true) : false;
init repo
2012-05-27 11:09:01 +00:00
}
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
return RE_NUM_LITERAL.test(ch);
init repo
2012-05-27 11:09:01 +00:00
});
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
if (prefix) num = prefix + num;
Legacy octal integer strict mode fixes
2016-07-21 01:19:24 +00:00
if (RE_OCT_NUMBER.test(num) && next_token.has_directive("use strict")) {
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
parse_error("Legacy octal literals are not allowed in strict mode");
Legacy octal integer strict mode fixes
2016-07-21 01:19:24 +00:00
}
init repo
2012-05-27 11:09:01 +00:00
var valid = parse_js_number(num);
if (!isNaN(valid)) {
Rework has_directive It's now available during tree walking, i.e. walker.has_directive("use asm"), rather than as part of the scope. It's thus no longer necessary to call `figure_out_scope` before codegen. Added special bits in the code generator to overcome the fact that it doesn't inherit from TreeWalker. Fix #861
2015-11-11 20:15:25 +00:00
return token("num", valid);
init repo
2012-05-27 11:09:01 +00:00
} else {
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
parse_error("Invalid syntax: " + num);
init repo
2012-05-27 11:09:01 +00:00
}
};
function read_escaped_char(in_string) {
var ch = next(true, in_string);
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
switch (ch.charCodeAt(0)) {
case 110 : return "\n";
case 114 : return "\r";
case 116 : return "\t";
case 98 : return "\b";
case 118 : return "\u000b"; // \v
case 102 : return "\f";
case 120 : return String.fromCharCode(hex_bytes(2)); // \x
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
case 117 : // \u
if (peek() == "{") {
next(true);
if (peek() === "}")
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
parse_error("Expecting hex-character between {}");
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
while (peek() == "0") next(true); // No significance
var result, length = find("}", true) - S.pos;
// Avoid 32 bit integer overflow (1 << 32 === 1)
// We know first character isn't 0 and thus out of range anyway
if (length > 6 || (result = hex_bytes(length)) > 0x10FFFF) {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
parse_error("Unicode reference out of bounce");
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
}
next(true);
return from_char_code(result);
}
return String.fromCharCode(hex_bytes(4));
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
case 10 : return ""; // newline
Fix parsing strings with literal DOS newlines (should not set newline_before) Fix #693
2015-04-23 09:08:19 +00:00
case 13 : // \r
if (peek() == "\n") { // DOS newline
next(true, in_string);
return "";
}
init repo
2012-05-27 11:09:01 +00:00
}
Move OctalEscapeSequence to read_escape_char This should simplify and improve implementation, make it easier to implement template strings, and keep master a bit more in sync with harmony. Previous implementation wasn't broken, though the loop gave me the impression it could read infinite numbers and annoyed me a bit. It was also slightly unnecessary because the lookup involved only 3 characters.
2016-06-23 14:53:48 +00:00
if (ch >= "0" && ch <= "7")
return read_octal_escape_sequence(ch);
Fix parsing strings with literal DOS newlines (should not set newline_before) Fix #693
2015-04-23 09:08:19 +00:00
return ch;
init repo
2012-05-27 11:09:01 +00:00
};
Move OctalEscapeSequence to read_escape_char This should simplify and improve implementation, make it easier to implement template strings, and keep master a bit more in sync with harmony. Previous implementation wasn't broken, though the loop gave me the impression it could read infinite numbers and annoyed me a bit. It was also slightly unnecessary because the lookup involved only 3 characters.
2016-06-23 14:53:48 +00:00
function read_octal_escape_sequence(ch) {
// Read
var p = peek();
if (p >= "0" && p <= "7") {
ch += next(true);
if (ch[0] <= "3" && (p = peek()) >= "0" && p <= "7")
ch += next(true);
}
// Parse
if (ch === "0") return "\0";
if (ch.length > 0 && next_token.has_directive("use strict"))
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
parse_error("Legacy octal escape sequences are not allowed in strict mode");
Move OctalEscapeSequence to read_escape_char This should simplify and improve implementation, make it easier to implement template strings, and keep master a bit more in sync with harmony. Previous implementation wasn't broken, though the loop gave me the impression it could read infinite numbers and annoyed me a bit. It was also slightly unnecessary because the lookup involved only 3 characters.
2016-06-23 14:53:48 +00:00
return String.fromCharCode(parseInt(ch, 8));
}
init repo
2012-05-27 11:09:01 +00:00
function hex_bytes(n) {
var num = 0;
for (; n > 0; --n) {
var digit = parseInt(next(true), 16);
if (isNaN(digit))
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
parse_error("Invalid hex-character pattern in string");
init repo
2012-05-27 11:09:01 +00:00
num = (num << 4) | digit;
}
return num;
};
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
var read_string = with_eof_error("Unterminated string constant", function(quote_char){
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var quote = next(), ret = "";
for (;;) {
Fix parsing strings with literal DOS newlines (should not set newline_before) Fix #693
2015-04-23 09:08:19 +00:00
var ch = next(true, true);
Move OctalEscapeSequence to read_escape_char This should simplify and improve implementation, make it easier to implement template strings, and keep master a bit more in sync with harmony. Previous implementation wasn't broken, though the loop gave me the impression it could read infinite numbers and annoyed me a bit. It was also slightly unnecessary because the lookup involved only 3 characters.
2016-06-23 14:53:48 +00:00
if (ch == "\\") ch = read_escaped_char(true);
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
else if (NEWLINE_CHARS(ch)) parse_error("Unterminated string constant");
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
else if (ch == quote) break;
ret += ch;
}
Add option to preserve/enforce string quote style `-q 0` (default) use single or double quotes such as to minimize the number of bytes (prefers double quotes when both will do); this is the previous behavior. `-q 1` -- always use single quotes `-q 2` -- always use double quotes `-q 3` or just `-q` -- always use the original quotes. Related codegen option: `quote_style`. Close #495 Close #460 Some `yargs` guru please tell me why `uglifyjs --help` doesn't display the help string for `-q` / `--quotes`, and why it doesn't output the expected argument types anymore, like good old `optimist` did.
2015-01-27 20:26:27 +00:00
var tok = token("string", ret);
tok.quote = quote_char;
return tok;
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
});
init repo
2012-05-27 11:09:01 +00:00
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
var read_template_characters = with_eof_error("Unterminated template", function(begin){
Template fixes * Fixes #1147: template strings not obeying -b ascii_only true * Allow evaluation of template expressions by adding optimizers and walkers * Make sure tagged templates are never changed * Remove template tokenizer in parser, add template tokenizer in tokenizer. It is using a brace counter to track brace position of templates * Add tokens `template_head` and `template_substitution` but parsing tokens stays mostly the same * Do not output strings anymore in AST_TemplateString, instead use AST_TemplateSegment * Fix parsing tagged templates, allowing multiple templates behind as spec allows this These changes don't influence tagged templates because raw content may influence code execution, however they are safe to do in normal templates: * Allow basic string concatenation of templates where possible * Allow custom character escape style similar to strings, except in tagged templates Note that expressions are still compressed in tagged templates. Optional things that may be improved later: * Custom quote style for templates if it doesn't have expressions. Making it obey the quote_style option if this is the case.
2016-06-22 17:24:03 +00:00
if (begin) {
S.template_braces.push(S.brace_counter);
}
var content = "", raw = "", ch, tok;
Fix nlb property for template strings tokens starting with nlb Also add .gitattributes to checkout lf eol style
2016-10-28 21:47:03 +00:00
next(true, true);
while ((ch = next(true, true)) !== "`") {
Template fixes * Fixes #1147: template strings not obeying -b ascii_only true * Allow evaluation of template expressions by adding optimizers and walkers * Make sure tagged templates are never changed * Remove template tokenizer in parser, add template tokenizer in tokenizer. It is using a brace counter to track brace position of templates * Add tokens `template_head` and `template_substitution` but parsing tokens stays mostly the same * Do not output strings anymore in AST_TemplateString, instead use AST_TemplateSegment * Fix parsing tagged templates, allowing multiple templates behind as spec allows this These changes don't influence tagged templates because raw content may influence code execution, however they are safe to do in normal templates: * Allow basic string concatenation of templates where possible * Allow custom character escape style similar to strings, except in tagged templates Note that expressions are still compressed in tagged templates. Optional things that may be improved later: * Custom quote style for templates if it doesn't have expressions. Making it obey the quote_style option if this is the case.
2016-06-22 17:24:03 +00:00
if (ch === "$" && peek() === "{") {
Fix nlb property for template strings tokens starting with nlb Also add .gitattributes to checkout lf eol style
2016-10-28 21:47:03 +00:00
next(true, true);
Template fixes * Fixes #1147: template strings not obeying -b ascii_only true * Allow evaluation of template expressions by adding optimizers and walkers * Make sure tagged templates are never changed * Remove template tokenizer in parser, add template tokenizer in tokenizer. It is using a brace counter to track brace position of templates * Add tokens `template_head` and `template_substitution` but parsing tokens stays mostly the same * Do not output strings anymore in AST_TemplateString, instead use AST_TemplateSegment * Fix parsing tagged templates, allowing multiple templates behind as spec allows this These changes don't influence tagged templates because raw content may influence code execution, however they are safe to do in normal templates: * Allow basic string concatenation of templates where possible * Allow custom character escape style similar to strings, except in tagged templates Note that expressions are still compressed in tagged templates. Optional things that may be improved later: * Custom quote style for templates if it doesn't have expressions. Making it obey the quote_style option if this is the case.
2016-06-22 17:24:03 +00:00
S.brace_counter++;
tok = token(begin ? "template_head" : "template_substitution", content);
tok.begin = begin;
tok.raw = raw;
tok.end = false;
return tok;
}
raw += ch;
if (ch === "\\") {
var tmp = S.pos;
ch = read_escaped_char();
raw += S.text.substr(tmp, S.pos - tmp);
}
content += ch;
}
S.template_braces.pop();
tok = token(begin ? "template_head" : "template_substitution", content);
tok.begin = begin;
tok.raw = raw;
tok.end = true;
return tok;
});
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
function skip_line_comment(type) {
var regex_allowed = S.regex_allowed;
Handle CR line endings in comments. Fixes #1050
2016-04-25 04:42:18 +00:00
var i = find_eol(), ret;
init repo
2012-05-27 11:09:01 +00:00
if (i == -1) {
ret = S.text.substr(S.pos);
S.pos = S.text.length;
} else {
ret = S.text.substring(S.pos, i);
S.pos = i;
}
Track ending lines/columns; fix end locations in Mozilla AST.
2014-08-08 11:15:43 +00:00
S.col = S.tokcol + (S.pos - S.tokpos);
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
S.comments_before.push(token(type, ret, true));
S.regex_allowed = regex_allowed;
Parse comments without recursion to avoid RangeError. Fixes #993
2016-04-15 23:58:46 +00:00
return next_token;
init repo
2012-05-27 11:09:01 +00:00
};
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
var skip_multiline_comment = with_eof_error("Unterminated multiline comment", function(){
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
var regex_allowed = S.regex_allowed;
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var i = find("*/", true);
Various LineTerminator changes * Escaped newlines should also produce SyntaxError * Fix multiline comment parsing and add tests * Adapt makePredicate to handle \u2028 and \u2029 * Move up nlb check in regex so it's checked before any escape handling * Change error messages to conform ecma standard * Find_eol not recornizing \u2028 and \u2029 as line terminator * Remove \u180e as it is removed in unicode 6.3.0 from the category zs
2016-06-13 10:36:47 +00:00
var text = S.text.substring(S.pos, i).replace(/\r\n|\r|\u2028|\u2029/g, '\n');
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
// update stream position
Improve multi-line comment parsing * Make sure comments are skipped correctly with surrogates * Fix regression in multiline comments with nlb
2016-07-04 12:30:27 +00:00
forward(get_full_char_length(text) /* text length doesn't count \r\n as 2 char while S.pos - i does */ + 2);
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
S.comments_before.push(token("comment2", text, true));
Improve multi-line comment parsing * Make sure comments are skipped correctly with surrogates * Fix regression in multiline comments with nlb
2016-07-04 12:30:27 +00:00
S.newline_before = S.newline_before || text.indexOf("\n") >= 0;
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
S.regex_allowed = regex_allowed;
Parse comments without recursion to avoid RangeError. Fixes #993
2016-04-15 23:58:46 +00:00
return next_token;
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
});
init repo
2012-05-27 11:09:01 +00:00
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
var read_name = with_eof_error("Unterminated identifier name", function() {
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
var name = "", ch, escaped = false, hex;
var read_escaped_identifier_char = function() {
escaped = true;
next();
if (peek() !== "u") {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
parse_error("Expecting UnicodeEscapeSequence -- uXXXX or u{XXXX}");
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
}
return read_escaped_char();
}
// Read first character (ID_Start)
if ((name = peek()) === "\\") {
name = read_escaped_identifier_char();
if (!is_identifier_start(name)) {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
parse_error("First identifier char is an invalid identifier char");
init repo
2012-05-27 11:09:01 +00:00
}
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
} else if (is_identifier_start(name)){
next();
} else {
return "";
}
// Read ID_Continue
while ((ch = peek()) != null) {
if ((ch = peek()) === "\\") {
ch = read_escaped_identifier_char();
if (!is_identifier_char(ch)) {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
parse_error("Invalid escaped identifier char");
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
}
} else {
if (!is_identifier_char(ch)) {
break;
}
next();
init repo
2012-05-27 11:09:01 +00:00
}
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
name += ch;
init repo
2012-05-27 11:09:01 +00:00
}
Add reserved words to list unescapable keywords Additionals: * Update list reserved keywords
2016-06-26 23:17:53 +00:00
if (RESERVED_WORDS(name) && escaped) {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
parse_error("Escaped characters are not allowed in keywords");
init repo
2012-05-27 11:09:01 +00:00
}
return name;
Don't allow escaped surrogated identifiers + introduce ascii_identifiers Don't use 2 characters for surrogates in identifiers because there is support for the \u{} syntax when escaped identifiers were introduced. Also catch eof errors while reading identifier names Introduce ascii_identifiers: By setting ascii_identifiers to undefined (default value), ascii_identifiers will print identifiers using the same setting as ascii_only within the limits of the ecmascript 6 grammar. ascii_identifiers accept true and false, allowing identifiers to be printed under different settings than strings with the ascii_only setting.
2016-07-22 15:33:24 +00:00
});
init repo
2012-05-27 11:09:01 +00:00
improve `RegExp` handling (#1959) - remove `options.output.unescape_regexps` - preserve original pattern whenever possible fixes #54 fixes #1929
2017-05-17 12:10:50 +00:00
var read_regexp = with_eof_error("Unterminated regular expression", function(source) {
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var prev_backslash = false, ch, in_class = false;
Various LineTerminator changes * Escaped newlines should also produce SyntaxError * Fix multiline comment parsing and add tests * Adapt makePredicate to handle \u2028 and \u2029 * Move up nlb check in regex so it's checked before any escape handling * Change error messages to conform ecma standard * Find_eol not recornizing \u2028 and \u2029 as line terminator * Remove \u180e as it is removed in unicode 6.3.0 from the category zs
2016-06-13 10:36:47 +00:00
while ((ch = next(true))) if (NEWLINE_CHARS(ch)) {
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
parse_error("Unexpected line terminator");
Various LineTerminator changes * Escaped newlines should also produce SyntaxError * Fix multiline comment parsing and add tests * Adapt makePredicate to handle \u2028 and \u2029 * Move up nlb check in regex so it's checked before any escape handling * Change error messages to conform ecma standard * Find_eol not recornizing \u2028 and \u2029 as line terminator * Remove \u180e as it is removed in unicode 6.3.0 from the category zs
2016-06-13 10:36:47 +00:00
} else if (prev_backslash) {
improve `RegExp` handling (#1959) - remove `options.output.unescape_regexps` - preserve original pattern whenever possible fixes #54 fixes #1929
2017-05-17 12:10:50 +00:00
source += "\\" + ch;
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
prev_backslash = false;
} else if (ch == "[") {
in_class = true;
improve `RegExp` handling (#1959) - remove `options.output.unescape_regexps` - preserve original pattern whenever possible fixes #54 fixes #1929
2017-05-17 12:10:50 +00:00
source += ch;
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
} else if (ch == "]" && in_class) {
in_class = false;
improve `RegExp` handling (#1959) - remove `options.output.unescape_regexps` - preserve original pattern whenever possible fixes #54 fixes #1929
2017-05-17 12:10:50 +00:00
source += ch;
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
} else if (ch == "/" && !in_class) {
break;
} else if (ch == "\\") {
prev_backslash = true;
} else {
improve `RegExp` handling (#1959) - remove `options.output.unescape_regexps` - preserve original pattern whenever possible fixes #54 fixes #1929
2017-05-17 12:10:50 +00:00
source += ch;
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
}
var mods = read_name();
Give a good error message if an invalid regular expression is found.
2015-05-14 19:03:54 +00:00
try {
improve `RegExp` handling (#1959) - remove `options.output.unescape_regexps` - preserve original pattern whenever possible fixes #54 fixes #1929
2017-05-17 12:10:50 +00:00
var regexp = new RegExp(source, mods);
regexp.raw_source = source;
return token("regexp", regexp);
Give a good error message if an invalid regular expression is found.
2015-05-14 19:03:54 +00:00
} catch(e) {
improve `RegExp` handling (#1959) - remove `options.output.unescape_regexps` - preserve original pattern whenever possible fixes #54 fixes #1929
2017-05-17 12:10:50 +00:00
parse_error(e.message);
Give a good error message if an invalid regular expression is found.
2015-05-14 19:03:54 +00:00
}
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
});
init repo
2012-05-27 11:09:01 +00:00
function read_operator(prefix) {
function grow(op) {
if (!peek()) return op;
var bigger = op + peek();
using makeComparator from acorn to generate functions that tests whether a string is keyword, reserved etc. speeds up the parser a bit, though not spectacular.. still far from acorn.
2012-10-11 08:52:05 +00:00
if (OPERATORS(bigger)) {
init repo
2012-05-27 11:09:01 +00:00
next();
return grow(bigger);
} else {
return op;
}
};
return token("operator", grow(prefix || next()));
};
function handle_slash() {
next();
switch (peek()) {
case "/":
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
next();
return skip_line_comment("comment1");
init repo
2012-05-27 11:09:01 +00:00
case "*":
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
next();
return skip_multiline_comment();
init repo
2012-05-27 11:09:01 +00:00
}
return S.regex_allowed ? read_regexp("") : read_operator("/");
};
Adding arrow functions
2015-01-11 20:07:19 +00:00
function handle_eq_sign() {
next();
if (peek() === ">") {
next();
return token("arrow", "=>");
} else {
return read_operator("=");
}
};
init repo
2012-05-27 11:09:01 +00:00
function handle_dot() {
next();
expand parameters Conflicts: test/compress/harmony.js
2015-04-13 00:26:26 +00:00
if (is_digit(peek().charCodeAt(0))) {
return read_num(".");
}
if (peek() === ".") {
next(); // Consume second dot
next(); // Consume third dot
return token("expand", "...");
}
return token("punc", ".");
init repo
2012-05-27 11:09:01 +00:00
};
function read_word() {
var word = read_name();
Better fix for #286
2013-09-02 08:36:48 +00:00
if (prev_was_dot) return token("name", word);
using makeComparator from acorn to generate functions that tests whether a string is keyword, reserved etc. speeds up the parser a bit, though not spectacular.. still far from acorn.
2012-10-11 08:52:05 +00:00
return KEYWORDS_ATOM(word) ? token("atom", word)
: !KEYWORDS(word) ? token("name", word)
: OPERATORS(word) ? token("operator", word)
init repo
2012-05-27 11:09:01 +00:00
: token("keyword", word);
};
function with_eof_error(eof_error, cont) {
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
return function(x) {
try {
return cont(x);
} catch(ex) {
if (ex === EX_EOF) parse_error(eof_error);
else throw ex;
}
};
init repo
2012-05-27 11:09:01 +00:00
};
function next_token(force_regexp) {
if (force_regexp != null)
return read_regexp(force_regexp);
fix handling of shebang and preamble (#1545) fixes #1332
2017-03-05 04:16:02 +00:00
if (shebang && S.pos == 0 && looking_at("#!")) {
start_token();
forward(2);
skip_line_comment("comment5");
}
Parse comments without recursion to avoid RangeError. Fixes #993
2016-04-15 23:58:46 +00:00
for (;;) {
skip_whitespace();
start_token();
if (html5_comments) {
if (looking_at("<!--")) {
forward(4);
skip_line_comment("comment3");
continue;
}
if (looking_at("-->") && S.newline_before) {
forward(3);
skip_line_comment("comment4");
continue;
}
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
}
Parse comments without recursion to avoid RangeError. Fixes #993
2016-04-15 23:58:46 +00:00
var ch = peek();
if (!ch) return token("eof");
var code = ch.charCodeAt(0);
switch (code) {
case 34: case 39: return read_string(ch);
case 46: return handle_dot();
case 47: {
var tok = handle_slash();
if (tok === next_token) continue;
return tok;
}
Merge branch 'master' into harmony
2016-04-17 11:37:01 +00:00
case 61: return handle_eq_sign();
Template fixes * Fixes #1147: template strings not obeying -b ascii_only true * Allow evaluation of template expressions by adding optimizers and walkers * Make sure tagged templates are never changed * Remove template tokenizer in parser, add template tokenizer in tokenizer. It is using a brace counter to track brace position of templates * Add tokens `template_head` and `template_substitution` but parsing tokens stays mostly the same * Do not output strings anymore in AST_TemplateString, instead use AST_TemplateSegment * Fix parsing tagged templates, allowing multiple templates behind as spec allows this These changes don't influence tagged templates because raw content may influence code execution, however they are safe to do in normal templates: * Allow basic string concatenation of templates where possible * Allow custom character escape style similar to strings, except in tagged templates Note that expressions are still compressed in tagged templates. Optional things that may be improved later: * Custom quote style for templates if it doesn't have expressions. Making it obey the quote_style option if this is the case.
2016-06-22 17:24:03 +00:00
case 96: return read_template_characters(true);
case 123:
S.brace_counter++;
break;
case 125:
S.brace_counter--;
if (S.template_braces.length > 0
&& S.template_braces[S.template_braces.length - 1] === S.brace_counter)
return read_template_characters(false);
break;
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
}
Parse comments without recursion to avoid RangeError. Fixes #993
2016-04-15 23:58:46 +00:00
if (is_digit(code)) return read_num();
if (PUNC_CHARS(ch)) return token("punc", next());
if (OPERATOR_CHARS(ch)) return read_operator();
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
if (code == 92 || is_identifier_start(ch)) return read_word();
Parse comments without recursion to avoid RangeError. Fixes #993
2016-04-15 23:58:46 +00:00
break;
Implement shebang support
2015-02-20 15:08:01 +00:00
}
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
parse_error("Unexpected character '" + ch + "'");
init repo
2012-05-27 11:09:01 +00:00
};
Parse and output ES6 template strings. Yikes!
2015-09-05 21:32:57 +00:00
next_token.next = next;
next_token.peek = peek;
init repo
2012-05-27 11:09:01 +00:00
next_token.context = function(nc) {
if (nc) S = nc;
return S;
};
Throw errors in strict mode for octal strings Adds a directive tracker for the parser/tokenizer to allow parsing depending on directive context.
2016-05-20 08:25:35 +00:00
next_token.add_directive = function(directive) {
S.directive_stack[S.directive_stack.length - 1].push(directive);
if (S.directives[directive] === undefined) {
S.directives[directive] = 1;
} else {
S.directives[directive]++;
}
}
next_token.push_directives_stack = function() {
S.directive_stack.push([]);
}
next_token.pop_directives_stack = function() {
var directives = S.directive_stack[S.directive_stack.length - 1];
for (var i = 0; i < directives.length; i++) {
S.directives[directives[i]]--;
}
S.directive_stack.pop();
}
next_token.has_directive = function(directive) {
improve parser under "use strict" (#1836) - `const` without value - `delete` of expression - redefining `arguments` or `eval` extend `test/ufuzz.js` - optionally generate "use strict" - improve handling of test cases with syntax errors - group IIFE generation - generate bare anonymous functions - workaround `console.log()` for `new function()` - generate expressions with `this` fixes #1810
2017-04-23 12:05:22 +00:00
return S.directives[directive] > 0;
Throw errors in strict mode for octal strings Adds a directive tracker for the parser/tokenizer to allow parsing depending on directive context.
2016-05-20 08:25:35 +00:00
}
init repo
2012-05-27 11:09:01 +00:00
return next_token;
};
/* -----[ Parser (constants) ]----- */
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var UNARY_PREFIX = makePredicate([
init repo
2012-05-27 11:09:01 +00:00
"typeof",
"void",
"delete",
"--",
"++",
"!",
"~",
"-",
"+"
]);
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var UNARY_POSTFIX = makePredicate([ "--", "++" ]);
init repo
2012-05-27 11:09:01 +00:00
Add exponentiation operator
2016-06-17 22:25:18 +00:00
var ASSIGNMENT = makePredicate([ "=", "+=", "-=", "/=", "*=", "**=", "%=", ">>=", "<<=", ">>>=", "|=", "^=", "&=" ]);
init repo
2012-05-27 11:09:01 +00:00
var PRECEDENCE = (function(a, ret){
minor
2013-10-30 07:10:56 +00:00
for (var i = 0; i < a.length; ++i) {
init repo
2012-05-27 11:09:01 +00:00
var b = a[i];
for (var j = 0; j < b.length; ++j) {
minor
2013-10-30 07:10:56 +00:00
ret[b[j]] = i + 1;
init repo
2012-05-27 11:09:01 +00:00
}
}
return ret;
})(
[
["||"],
["&&"],
["|"],
["^"],
["&"],
["==", "===", "!=", "!=="],
["<", ">", "<=", ">=", "in", "instanceof"],
[">>", "<<", ">>>"],
["+", "-"],
Add exponentiation operator
2016-06-17 22:25:18 +00:00
["*", "/", "%"],
["**"]
init repo
2012-05-27 11:09:01 +00:00
],
{}
);
var STATEMENTS_WITH_LABELS = array_to_hash([ "for", "do", "while", "switch" ]);
var ATOMIC_START_TOKEN = array_to_hash([ "atom", "num", "string", "regexp", "name" ]);
/* -----[ Parser ]----- */
better support for multiple input files: - use a single AST_Toplevel node for all files - keep original source filename in the tokens
2012-09-21 11:19:05 +00:00
function parse($TEXT, options) {
options = defaults(options, {
sort options in alphabetical order (#1743) They started off as functional groups I guess, but given the sheer number of options this is becoming too difficult to read.
2017-03-31 08:41:04 +00:00
bare_returns : false,
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
expression : false,
sort options in alphabetical order (#1743) They started off as functional groups I guess, but given the sheer number of options this is becoming too difficult to read.
2017-03-31 08:41:04 +00:00
filename : null,
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
html5_comments : true,
Implement shebang support
2015-02-20 15:08:01 +00:00
shebang : true,
sort options in alphabetical order (#1743) They started off as functional groups I guess, but given the sheer number of options this is becoming too difficult to read.
2017-03-31 08:41:04 +00:00
strict : false,
toplevel : null,
better support for multiple input files: - use a single AST_Toplevel node for all files - keep original source filename in the tokens
2012-09-21 11:19:05 +00:00
});
init repo
2012-05-27 11:09:01 +00:00
var S = {
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
input : (typeof $TEXT == "string"
? tokenizer($TEXT, options.filename,
Implement shebang support
2015-02-20 15:08:01 +00:00
options.html5_comments, options.shebang)
Support HTML5 comment syntax (enabled by default!) See http://javascript.spec.whatwg.org/#comment-syntax https://github.com/mishoo/UglifyJS/issues/503 https://github.com/marijnh/acorn/issues/62
2013-09-06 06:54:30 +00:00
: $TEXT),
init repo
2012-05-27 11:09:01 +00:00
token : null,
prev : null,
peeked : null,
in_function : 0,
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
in_generator : -1,
init repo
2012-05-27 11:09:01 +00:00
in_directives : true,
in_loop : 0,
labels : []
};
S.token = next();
function is(type, value) {
return is_token(S.token, type, value);
};
function peek() { return S.peeked || (S.peeked = S.input()); };
function next() {
S.prev = S.token;
if (S.peeked) {
S.token = S.peeked;
S.peeked = null;
} else {
S.token = S.input();
}
S.in_directives = S.in_directives && (
S.token.type == "string" || is("punc", ";")
);
return S.token;
};
function prev() {
return S.prev;
};
function croak(msg, line, col, pos) {
var ctx = S.input.context();
js_error(msg,
log filename in parse errors / compressor warnings
2012-09-21 11:38:52 +00:00
ctx.filename,
init repo
2012-05-27 11:09:01 +00:00
line != null ? line : ctx.tokline,
col != null ? col : ctx.tokcol,
pos != null ? pos : ctx.tokpos);
};
function token_error(token, msg) {
croak(msg, token.line, token.col);
};
function unexpected(token) {
if (token == null)
token = S.token;
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
token_error(token, "Unexpected token: " + token.type + " (" + token.value + ")");
init repo
2012-05-27 11:09:01 +00:00
};
function expect_token(type, val) {
if (is(type, val)) {
return next();
}
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
token_error(S.token, "Unexpected token " + S.token.type + " «" + S.token.value + "»" + ", expected " + type + " «" + val + "»");
init repo
2012-05-27 11:09:01 +00:00
};
function expect(punc) { return expect_token("punc", punc); };
function can_insert_semicolon() {
better support for multiple input files: - use a single AST_Toplevel node for all files - keep original source filename in the tokens
2012-09-21 11:19:05 +00:00
return !options.strict && (
init repo
2012-05-27 11:09:01 +00:00
S.token.nlb || is("eof") || is("punc", "}")
);
};
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
function is_in_generator() {
return S.in_generator === S.in_function;
}
Semicolon after do...while statement is optional
2015-12-17 22:02:35 +00:00
function semicolon(optional) {
init repo
2012-05-27 11:09:01 +00:00
if (is("punc", ";")) next();
Semicolon after do...while statement is optional
2015-12-17 22:02:35 +00:00
else if (!optional && !can_insert_semicolon()) unexpected();
init repo
2012-05-27 11:09:01 +00:00
};
function parenthesised() {
code generator finally seems to work properly
2012-08-17 12:59:42 +00:00
expect("(");
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var exp = expression(true);
code generator finally seems to work properly
2012-08-17 12:59:42 +00:00
expect(")");
return exp;
init repo
2012-05-27 11:09:01 +00:00
};
function embed_tokens(parser) {
return function() {
var start = S.token;
Add holes in destructuring defs, also make them nestable
2015-08-14 00:16:54 +00:00
var expr = parser.apply(null, arguments);
init repo
2012-05-27 11:09:01 +00:00
var end = prev();
expr.start = start;
expr.end = end;
return expr;
};
};
Fix parsing regexp after unary-prefix operator ++/x/.y Fix #284
2013-09-02 06:56:27 +00:00
function handle_regexp() {
init repo
2012-05-27 11:09:01 +00:00
if (is("operator", "/") || is("operator", "/=")) {
S.peeked = null;
S.token = S.input(S.token.value.substr(1)); // force regexp
}
Fix parsing regexp after unary-prefix operator ++/x/.y Fix #284
2013-09-02 06:56:27 +00:00
};
var statement = embed_tokens(function() {
handle_regexp();
init repo
2012-05-27 11:09:01 +00:00
switch (S.token.type) {
case "string":
fix & improve coverage of `estree` (#1935) - fix `estree` conversion of getter/setter - fix non-directive literal in `to_mozilla_ast()` - revamp `test/mozilla-ast.js` - reuse `test/ufuzz.js` for code generation - use `acorn.parse()` for creating `estree` - extend `test/ufuzz.js` for `acorn` workaround - catch variable redefinition - non-trivial literal as directive - adjust options for tolerance Miscellaneous - optional semi-colon when parsing directives fixes #1914 closes #1915
2017-05-14 18:37:53 +00:00
if (S.in_directives) {
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
var token = peek();
fix & improve coverage of `estree` (#1935) - fix `estree` conversion of getter/setter - fix non-directive literal in `to_mozilla_ast()` - revamp `test/mozilla-ast.js` - reuse `test/ufuzz.js` for code generation - use `acorn.parse()` for creating `estree` - extend `test/ufuzz.js` for `acorn` workaround - catch variable redefinition - non-trivial literal as directive - adjust options for tolerance Miscellaneous - optional semi-colon when parsing directives fixes #1914 closes #1915
2017-05-14 18:37:53 +00:00
if (S.token.raw.indexOf("\\") == -1
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
&& (token.nlb
|| is_token(token, "eof")
|| is_token(token, "punc", ";")
|| is_token(token, "punc", "}"))) {
Don't mix strings with directives in output * Don't interpret strings with escaped content as directive * Don't interpret strings after empty statement as directive * Adapt output to prevent strings being represent as directive * Introduce UGLIFY_DEBUG to allow internal testing like EXPECT_DIRECTIVE
2016-06-13 19:11:08 +00:00
S.input.add_directive(S.token.value);
Throw errors in strict mode for octal strings Adds a directive tracker for the parser/tokenizer to allow parsing depending on directive context.
2016-05-20 08:25:35 +00:00
} else {
S.in_directives = false;
}
}
init repo
2012-05-27 11:09:01 +00:00
var dir = S.in_directives, stat = simple_statement();
fix & improve coverage of `estree` (#1935) - fix `estree` conversion of getter/setter - fix non-directive literal in `to_mozilla_ast()` - revamp `test/mozilla-ast.js` - reuse `test/ufuzz.js` for code generation - use `acorn.parse()` for creating `estree` - extend `test/ufuzz.js` for `acorn` workaround - catch variable redefinition - non-trivial literal as directive - adjust options for tolerance Miscellaneous - optional semi-colon when parsing directives fixes #1914 closes #1915
2017-05-14 18:37:53 +00:00
return dir ? new AST_Directive(stat.body) : stat;
Template fixes * Fixes #1147: template strings not obeying -b ascii_only true * Allow evaluation of template expressions by adding optimizers and walkers * Make sure tagged templates are never changed * Remove template tokenizer in parser, add template tokenizer in tokenizer. It is using a brace counter to track brace position of templates * Add tokens `template_head` and `template_substitution` but parsing tokens stays mostly the same * Do not output strings anymore in AST_TemplateString, instead use AST_TemplateSegment * Fix parsing tagged templates, allowing multiple templates behind as spec allows this These changes don't influence tagged templates because raw content may influence code execution, however they are safe to do in normal templates: * Allow basic string concatenation of templates where possible * Allow custom character escape style similar to strings, except in tagged templates Note that expressions are still compressed in tagged templates. Optional things that may be improved later: * Custom quote style for templates if it doesn't have expressions. Making it obey the quote_style option if this is the case.
2016-06-22 17:24:03 +00:00
case "template_head":
init repo
2012-05-27 11:09:01 +00:00
case "num":
case "regexp":
case "operator":
case "atom":
return simple_statement();
case "name":
return is_token(peek(), "punc", ":")
? labeled_statement()
: simple_statement();
case "punc":
switch (S.token.value) {
case "{":
cleaned up usage of AST_BlockStatement The following nodes were instances of AST_BlockStatement: AST_Scope, AST_SwitchBlock, AST_SwitchBranch. Also, AST_Try, AST_Catch, AST_Finally were having a body instanceof AST_BlockStatement. Overloading the meaning of AST_BlockStatement this way turned out to be a mess; we now have an AST_Block class that is the base class for things having a block of statements (might or might not be bracketed). The `this.body` of AST_Scope, AST_Try, AST_Catch, AST_Finally is now an array of statements (as they inherit from AST_Block). Avoiding calling superclass's _walk function in walkers (turns out we walked a node multiple times).
2012-09-05 08:31:02 +00:00
return new AST_BlockStatement({
start : S.token,
body : block_(),
end : prev()
});
init repo
2012-05-27 11:09:01 +00:00
case "[":
case "(":
return simple_statement();
case ";":
Don't mix strings with directives in output * Don't interpret strings with escaped content as directive * Don't interpret strings after empty statement as directive * Adapt output to prevent strings being represent as directive * Introduce UGLIFY_DEBUG to allow internal testing like EXPECT_DIRECTIVE
2016-06-13 19:11:08 +00:00
S.in_directives = false;
init repo
2012-05-27 11:09:01 +00:00
next();
WIP
2012-08-15 10:32:37 +00:00
return new AST_EmptyStatement();
init repo
2012-05-27 11:09:01 +00:00
default:
unexpected();
}
case "keyword":
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
switch (S.token.value) {
init repo
2012-05-27 11:09:01 +00:00
case "break":
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
init repo
2012-05-27 11:09:01 +00:00
return break_cont(AST_Break);
case "continue":
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
init repo
2012-05-27 11:09:01 +00:00
return break_cont(AST_Continue);
case "debugger":
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
init repo
2012-05-27 11:09:01 +00:00
semicolon();
return new AST_Debugger();
case "do":
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
var body = in_loop(statement);
expect_token("keyword", "while");
var condition = parenthesised();
semicolon(true);
init repo
2012-05-27 11:09:01 +00:00
return new AST_Do({
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
body : body,
condition : condition
init repo
2012-05-27 11:09:01 +00:00
});
case "while":
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
init repo
2012-05-27 11:09:01 +00:00
return new AST_While({
condition : parenthesised(),
body : in_loop(statement)
});
case "for":
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
init repo
2012-05-27 11:09:01 +00:00
return for_();
Starting ES6 classes
2015-10-27 00:40:46 +00:00
case "class":
Merge branch 'master' into harmony-v3.0.6
2017-05-15 22:48:23 +00:00
next();
Separate class expressions from class declarations and their symbols like defuns
2015-11-21 09:17:32 +00:00
return class_(AST_DefClass);
Starting ES6 classes
2015-10-27 00:40:46 +00:00
init repo
2012-05-27 11:09:01 +00:00
case "function":
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
Fix parsing setters/getters (allow keywords for name). The "key" property was always "set" or "get", which didn't make much sense. Now it'll be the actual name of the setter/getter (AST_Node), and the AST_Accessor object itself, which represents the function, won't store any name. Close #319
2013-10-30 09:50:22 +00:00
return function_(AST_Defun);
init repo
2012-05-27 11:09:01 +00:00
case "if":
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
init repo
2012-05-27 11:09:01 +00:00
return if_();
case "return":
Add option to allow return outside of functions. Close #288
2014-10-20 15:12:13 +00:00
if (S.in_function == 0 && !options.bare_returns)
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
croak("'return' outside of function");
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
var value = null;
if (is("punc", ";")) {
next();
} else if (!can_insert_semicolon()) {
value = expression(true);
semicolon();
}
init repo
2012-05-27 11:09:01 +00:00
return new AST_Return({
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
value: value
init repo
2012-05-27 11:09:01 +00:00
});
case "switch":
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
init repo
2012-05-27 11:09:01 +00:00
return new AST_Switch({
expression : parenthesised(),
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
body : in_loop(switch_body_)
init repo
2012-05-27 11:09:01 +00:00
});
case "throw":
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
init repo
2012-05-27 11:09:01 +00:00
if (S.token.nlb)
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
croak("Illegal newline after 'throw'");
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
var value = expression(true);
semicolon();
init repo
2012-05-27 11:09:01 +00:00
return new AST_Throw({
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
value: value
init repo
2012-05-27 11:09:01 +00:00
});
case "try":
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
init repo
2012-05-27 11:09:01 +00:00
return try_();
case "var":
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
var node = var_();
semicolon();
return node;
init repo
2012-05-27 11:09:01 +00:00
parse, output the let statement
2015-09-06 20:33:17 +00:00
case "let":
Merge branch 'master' into harmony-v3.0.6
2017-05-15 22:48:23 +00:00
next();
var node = let_();
semicolon();
return node;
parse, output the let statement
2015-09-06 20:33:17 +00:00
init repo
2012-05-27 11:09:01 +00:00
case "const":
Merge branch 'master' into harmony-v3.0.6
2017-05-15 22:48:23 +00:00
next();
var node = const_();
semicolon();
return node;
init repo
2012-05-27 11:09:01 +00:00
case "with":
Don't allow with statements in strict mode
2016-06-12 16:58:20 +00:00
if (S.input.has_directive("use strict")) {
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
croak("Strict mode may not include a with statement");
Don't allow with statements in strict mode
2016-06-12 16:58:20 +00:00
}
improve keyword-related parser errors (#1941) fixes #1937
2017-05-15 15:02:55 +00:00
next();
init repo
2012-05-27 11:09:01 +00:00
return new AST_With({
expression : parenthesised(),
body : statement()
});
Starting out the import statement
2016-01-29 20:47:49 +00:00
case "import":
Merge branch 'master' into harmony-v3.0.6
2017-05-15 22:48:23 +00:00
next();
var node = import_();
semicolon();
return node;
Starting out the import statement
2016-01-29 20:47:49 +00:00
Implement the export statement
2016-02-27 12:24:18 +00:00
case "export":
Merge branch 'master' into harmony-v3.0.6
2017-05-15 22:48:23 +00:00
next();
[ES6] Fix handling of semicolons in export parse.
2016-07-26 13:50:35 +00:00
return export_();
init repo
2012-05-27 11:09:01 +00:00
}
}
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
unexpected();
init repo
2012-05-27 11:09:01 +00:00
});
function labeled_statement() {
simple visitor API and code to figure out scope and references
2012-08-19 12:57:50 +00:00
var label = as_symbol(AST_Label);
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
if (label.name === "yield" && is_in_generator()) {
// Ecma-262, 12.1.1 Static Semantics: Early Errors
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
token_error(S.prev, "Yield cannot be used as label inside generators");
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
}
simple visitor API and code to figure out scope and references
2012-08-19 12:57:50 +00:00
if (find_if(function(l){ return l.name == label.name }, S.labels)) {
// ECMA-262, 12.12: An ECMAScript program is considered
// syntactically incorrect if it contains a
// LabelledStatement that is enclosed by a
// LabelledStatement with the same Identifier as label.
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
croak("Label " + label.name + " defined twice");
simple visitor API and code to figure out scope and references
2012-08-19 12:57:50 +00:00
}
init repo
2012-05-27 11:09:01 +00:00
expect(":");
S.labels.push(label);
removed some unused variables
2012-10-04 05:49:18 +00:00
var stat = statement();
init repo
2012-05-27 11:09:01 +00:00
S.labels.pop();
Disallow `continue` referring to a non-IterationStatement. Fix #287 Simplifies handling of labels (their definition/references can be easily figured out at parse time, no need to do it in `figure_out_scope`).
2013-09-02 16:36:16 +00:00
if (!(stat instanceof AST_IterationStatement)) {
// check for `continue` that refers to this label.
// those should be reported as syntax errors.
// https://github.com/mishoo/UglifyJS2/issues/287
label.references.forEach(function(ref){
if (ref instanceof AST_Continue) {
ref = ref.label.start;
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
croak("Continue label `" + label.name + "` refers to non-IterationStatement.",
Disallow `continue` referring to a non-IterationStatement. Fix #287 Simplifies handling of labels (their definition/references can be easily figured out at parse time, no need to do it in `figure_out_scope`).
2013-09-02 16:36:16 +00:00
ref.line, ref.col, ref.pos);
}
});
}
a LabeledStatement should be in fact a StatementWithBody This fixes output for: if (foo) { moo: if (bar) { break moo; } } else { baz(); } (the labeled statement must be outputted inside brackets)
2012-09-03 09:05:10 +00:00
return new AST_LabeledStatement({ body: stat, label: label });
init repo
2012-05-27 11:09:01 +00:00
};
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
function simple_statement(tmp) {
return new AST_SimpleStatement({ body: (tmp = expression(true), semicolon(), tmp) });
init repo
2012-05-27 11:09:01 +00:00
};
function break_cont(type) {
Disallow `continue` referring to a non-IterationStatement. Fix #287 Simplifies handling of labels (their definition/references can be easily figured out at parse time, no need to do it in `figure_out_scope`).
2013-09-02 16:36:16 +00:00
var label = null, ldef;
init repo
2012-05-27 11:09:01 +00:00
if (!can_insert_semicolon()) {
simple visitor API and code to figure out scope and references
2012-08-19 12:57:50 +00:00
label = as_symbol(AST_LabelRef, true);
init repo
2012-05-27 11:09:01 +00:00
}
simple visitor API and code to figure out scope and references
2012-08-19 12:57:50 +00:00
if (label != null) {
Disallow `continue` referring to a non-IterationStatement. Fix #287 Simplifies handling of labels (their definition/references can be easily figured out at parse time, no need to do it in `figure_out_scope`).
2013-09-02 16:36:16 +00:00
ldef = find_if(function(l){ return l.name == label.name }, S.labels);
if (!ldef)
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
croak("Undefined label " + label.name);
Disallow `continue` referring to a non-IterationStatement. Fix #287 Simplifies handling of labels (their definition/references can be easily figured out at parse time, no need to do it in `figure_out_scope`).
2013-09-02 16:36:16 +00:00
label.thedef = ldef;
init repo
2012-05-27 11:09:01 +00:00
}
else if (S.in_loop == 0)
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
croak(type.TYPE + " not inside a loop or switch");
init repo
2012-05-27 11:09:01 +00:00
semicolon();
Disallow `continue` referring to a non-IterationStatement. Fix #287 Simplifies handling of labels (their definition/references can be easily figured out at parse time, no need to do it in `figure_out_scope`).
2013-09-02 16:36:16 +00:00
var stat = new type({ label: label });
if (ldef) ldef.references.push(stat);
return stat;
init repo
2012-05-27 11:09:01 +00:00
};
function for_() {
expect("(");
var init = null;
if (!is("punc", ";")) {
parse, output the let statement
2015-09-06 20:33:17 +00:00
init =
is("keyword", "var") ? (next(), var_(true)) :
is("keyword", "let") ? (next(), let_(true)) :
fix #1021
2016-03-27 11:21:39 +00:00
is("keyword", "const") ? (next(), const_(true)) :
parse, output the let statement
2015-09-06 20:33:17 +00:00
expression(true, true);
for...of
2015-04-13 00:25:46 +00:00
var is_in = is("operator", "in");
Allow 'of' to be a name.
2015-10-26 20:56:59 +00:00
var is_of = is("name", "of");
for...of
2015-04-13 00:25:46 +00:00
if (is_in || is_of) {
fix #1021
2016-03-27 11:21:39 +00:00
if ((init instanceof AST_Definitions) &&
parse, output the let statement
2015-09-06 20:33:17 +00:00
init.definitions.length > 1)
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
croak("Only one variable declaration allowed in for..in loop");
init repo
2012-05-27 11:09:01 +00:00
next();
for...of
2015-04-13 00:25:46 +00:00
if (is_in) {
return for_in(init);
} else {
return for_of(init);
}
init repo
2012-05-27 11:09:01 +00:00
}
}
return regular_for(init);
};
function regular_for(init) {
expect(";");
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var test = is("punc", ";") ? null : expression(true);
init repo
2012-05-27 11:09:01 +00:00
expect(";");
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var step = is("punc", ")") ? null : expression(true);
init repo
2012-05-27 11:09:01 +00:00
expect(")");
return new AST_For({
init : init,
condition : test,
step : step,
body : in_loop(statement)
});
};
for...of
2015-04-13 00:25:46 +00:00
function for_of(init) {
fix #1021
2016-03-27 11:21:39 +00:00
var lhs = init instanceof AST_Definitions ? init.definitions[0].name : null;
for...of
2015-04-13 00:25:46 +00:00
var obj = expression(true);
expect(")");
return new AST_ForOf({
init : init,
name : lhs,
object : obj,
body : in_loop(statement)
});
};
init repo
2012-05-27 11:09:01 +00:00
function for_in(init) {
fix #1021
2016-03-27 11:21:39 +00:00
var lhs = init instanceof AST_Definitions ? init.definitions[0].name : null;
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var obj = expression(true);
init repo
2012-05-27 11:09:01 +00:00
expect(")");
return new AST_ForIn({
init : init,
WIP
2012-05-27 14:25:31 +00:00
name : lhs,
init repo
2012-05-27 11:09:01 +00:00
object : obj,
body : in_loop(statement)
});
};
remove `AST_ArrowParametersOrSeq` (#1997)
2017-05-24 09:45:18 +00:00
var arrow_function = function(start, argnames) {
Improve binding patterns for arrow functions
2016-09-06 23:00:07 +00:00
if (S.token.nlb) {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
croak("Unexpected newline before arrow (=>)");
Improve binding patterns for arrow functions
2016-09-06 23:00:07 +00:00
}
Adding arrow functions
2015-01-11 20:07:19 +00:00
expect_token("arrow", "=>");
remove `AST_ArrowParametersOrSeq` (#1997)
2017-05-24 09:45:18 +00:00
var body = _function_body(is("punc", "{"));
Adding arrow functions
2015-01-11 20:07:19 +00:00
return new AST_Arrow({
remove `AST_ArrowParametersOrSeq` (#1997)
2017-05-24 09:45:18 +00:00
start : start,
=> with destructuring arguments. Requires a lot of parser changes
2015-08-03 23:14:18 +00:00
end : body.end,
argnames : argnames,
body : body
Adding arrow functions
2015-01-11 20:07:19 +00:00
});
};
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
var function_ = function(ctor, is_generator_property) {
Starting destructuring.
2015-01-15 03:03:38 +00:00
var start = S.token
Fix parsing setters/getters (allow keywords for name). The "key" property was always "set" or "get", which didn't make much sense. Now it'll be the actual name of the setter/getter (AST_Node), and the AST_Accessor object itself, which represents the function, won't store any name. Close #319
2013-10-30 09:50:22 +00:00
var in_statement = ctor === AST_Defun;
Implement harmony generators and yield Uses #716's implementation and adds tests. Fixes #716.
2016-02-04 21:19:48 +00:00
var is_generator = is("operator", "*");
if (is_generator) {
next();
}
Fix parsing setters/getters (allow keywords for name). The "key" property was always "set" or "get", which didn't make much sense. Now it'll be the actual name of the setter/getter (AST_Node), and the AST_Accessor object itself, which represents the function, won't store any name. Close #319
2013-10-30 09:50:22 +00:00
var name = is("name") ? as_symbol(in_statement ? AST_SymbolDefun : AST_SymbolLambda) : null;
init repo
2012-05-27 11:09:01 +00:00
if (in_statement && !name)
unexpected();
Starting destructuring.
2015-01-15 03:03:38 +00:00
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
var args = parameters();
Merge branch 'master' into harmony-v3.0.0
2017-05-06 23:18:15 +00:00
var body = _function_body(true, is_generator || is_generator_property, name, args);
init repo
2012-05-27 11:09:01 +00:00
return new ctor({
Starting destructuring.
2015-01-15 03:03:38 +00:00
start : args.start,
end : body.end,
Implement harmony generators and yield Uses #716's implementation and adds tests. Fixes #716.
2016-02-04 21:19:48 +00:00
is_generator: is_generator,
Starting destructuring.
2015-01-15 03:03:38 +00:00
name : name,
argnames: args,
body : body
init repo
2012-05-27 11:09:01 +00:00
});
};
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
function track_used_binding_identifiers(is_parameter, strict) {
var parameters = {};
var duplicate = false;
var default_assignment = false;
var spread = false;
var strict_mode = !!strict;
var tracker = {
add_parameter: function(token) {
if (parameters["$" + token.value] !== undefined) {
if (duplicate === false) {
duplicate = token;
}
tracker.check_strict();
} else {
parameters["$" + token.value] = true;
if (is_parameter) {
switch (token.value) {
case "arguments":
case "eval":
case "yield":
if (strict_mode) {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
token_error(token, "Unexpected " + token.value + " identifier as parameter inside strict mode");
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
}
break;
default:
if (RESERVED_WORDS(token.value)) {
unexpected();
}
}
}
}
},
mark_default_assignment: function(token) {
if (default_assignment === false) {
default_assignment = token;
}
},
mark_spread: function(token) {
if (spread === false) {
spread = token;
}
},
mark_strict_mode: function() {
strict_mode = true;
},
is_strict: function() {
return default_assignment !== false || spread !== false || strict_mode
},
check_strict: function() {
if (tracker.is_strict() && duplicate !== false) {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
token_error(duplicate, "Parameter " + duplicate.value + " was used already");
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
}
}
};
return tracker;
}
function parameters() {
var start = S.token;
var first = true;
var params = [];
var used_parameters = track_used_binding_identifiers(true, S.input.has_directive("use strict"));
expect("(");
while (!is("punc", ")")) {
if (first) {
first = false;
} else {
expect(",");
}
var param = parameter(used_parameters);
params.push(param);
if (param instanceof AST_Expansion) {
break;
}
}
next();
return params;
}
function parameter(used_parameters, symbol_type) {
var param;
var expand = false;
if (used_parameters === undefined) {
used_parameters = track_used_binding_identifiers(true, S.input.has_directive("use strict"));
}
if (is("expand", "...")) {
expand = S.token;
used_parameters.mark_spread(S.token);
next();
}
param = binding_element(used_parameters, symbol_type);
if (is("operator", "=") && expand === false) {
used_parameters.mark_default_assignment(S.token);
next();
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
param = new AST_DefaultAssign({
start: param.start,
left: param,
operator: "=",
right: expression(false),
end: S.token
});
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
}
if (expand !== false) {
if (!is("punc", ")")) {
unexpected();
}
param = new AST_Expansion({
start: expand,
expression: param,
end: expand
});
}
used_parameters.check_strict();
return param;
}
function binding_element(used_parameters, symbol_type) {
var elements = [];
var first = true;
var is_expand = false;
var expand_token;
var first_token = S.token;
if (used_parameters === undefined) {
used_parameters = track_used_binding_identifiers(false, S.input.has_directive("use strict"));
}
symbol_type = symbol_type === undefined ? AST_SymbolFunarg : symbol_type;
if (is("punc", "[")) {
next();
while (!is("punc", "]")) {
if (first) {
first = false;
} else {
expect(",");
}
if (is("expand", "...")) {
is_expand = true;
expand_token = S.token;
used_parameters.mark_spread(S.token);
next();
}
if (is("punc")) {
switch (S.token.value) {
case ",":
elements.push(new AST_Hole({
start: S.token,
end: S.token
}));
continue;
Improve binding patterns for arrow functions
2016-09-06 23:00:07 +00:00
case "]": // Trailing comma after last element
break;
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
case "[":
case "{":
elements.push(binding_element(used_parameters, symbol_type));
break;
default:
unexpected();
}
} else if (is("name")) {
used_parameters.add_parameter(S.token);
elements.push(new symbol_type({
start: S.token,
name: S.token.value,
end: S.token
}));
next();
} else {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
croak("Invalid function parameter");
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
}
if (is("operator", "=") && is_expand === false) {
used_parameters.mark_default_assignment(S.token);
next();
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
elements[elements.length - 1] = new AST_DefaultAssign({
start: elements[elements.length - 1].start,
left: elements[elements.length - 1],
operator: "=",
right: expression(false),
end: S.token
});
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
}
if (is_expand) {
if (!is("punc", "]")) {
unexpected(); // Must be last element
}
elements[elements.length - 1] = new AST_Expansion({
start: expand_token,
expression: elements[elements.length - 1],
end: expand_token
});
}
}
expect("]");
used_parameters.check_strict();
return new AST_Destructuring({
start: first_token,
names: elements,
is_array: true,
end: prev()
});
} else if (is("punc", "{")) {
next();
while (!is("punc", "}")) {
if (first) {
first = false;
} else {
expect(",");
}
if (is("name") && (is_token(peek(), "punc") || is_token(peek(), "operator")) && [",", "}", "="].indexOf(peek().value) !== -1) {
used_parameters.add_parameter(S.token);
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
elements.push(new AST_ObjectKeyVal({
start: prev(),
key: S.token.value,
value: new symbol_type({
start: S.token,
name: S.token.value,
end: S.token
}),
end: prev()
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
}));
next();
} else if (is("punc", "}")) {
continue; // Allow trailing hole
} else {
var property_token = S.token;
var property = as_property_name();
if (property === null) {
unexpected(prev());
} else if (prev().type === "name" && !is("punc", ":")) {
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
elements.push(new AST_ObjectKeyVal({
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
start: prev(),
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
key: property,
value: new symbol_type({
start: prev(),
name: property,
end: prev()
}),
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
end: prev()
}));
} else {
expect(":");
elements.push(new AST_ObjectKeyVal({
start: property_token,
quote: property_token.quote,
key: property,
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
value: binding_element(used_parameters, symbol_type),
end: prev()
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
}));
}
}
if (is("operator", "=")) {
used_parameters.mark_default_assignment(S.token);
next();
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
elements[elements.length - 1].value = new AST_DefaultAssign({
start: elements[elements.length - 1].value.start,
left: elements[elements.length - 1].value,
operator: "=",
right: expression(false),
end: S.token
});
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
}
}
expect("}");
used_parameters.check_strict();
return new AST_Destructuring({
start: first_token,
names: elements,
is_array: false,
end: prev()
});
} else if (is("name")) {
used_parameters.add_parameter(S.token);
next();
return new symbol_type({
start: prev(),
name: prev().value,
end: prev()
});
} else {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
croak("Invalid function parameter");
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
}
}
Starting destructuring.
2015-01-15 03:03:38 +00:00
function params_or_seq_() {
var first = true;
var a = [];
while (!is("punc", ")")) {
if (first) first = false; else expect(",");
expand parameters Conflicts: test/compress/harmony.js
2015-04-13 00:26:26 +00:00
if (is("expand", "...")) {
Only last parameter between parentheses can have spread
2016-06-12 20:40:07 +00:00
var spread_token = S.token;
expand parameters Conflicts: test/compress/harmony.js
2015-04-13 00:26:26 +00:00
next();
a.push(new AST_Expansion({
start: prev(),
remove `AST_ArrowParametersOrSeq` (#1997)
2017-05-24 09:45:18 +00:00
expression: expression(),
expand parameters Conflicts: test/compress/harmony.js
2015-04-13 00:26:26 +00:00
end: S.token,
}));
Only last parameter between parentheses can have spread
2016-06-12 20:40:07 +00:00
if (!is("punc", ")")) {
unexpected(spread_token);
}
expand parameters Conflicts: test/compress/harmony.js
2015-04-13 00:26:26 +00:00
} else {
remove `AST_ArrowParametersOrSeq` (#1997)
2017-05-24 09:45:18 +00:00
a.push(expression());
expand parameters Conflicts: test/compress/harmony.js
2015-04-13 00:26:26 +00:00
}
Starting destructuring.
2015-01-15 03:03:38 +00:00
}
remove `AST_ArrowParametersOrSeq` (#1997)
2017-05-24 09:45:18 +00:00
return a;
Starting destructuring.
2015-01-15 03:03:38 +00:00
}
Merge branch 'master' into harmony-v3.0.0
2017-05-06 23:18:15 +00:00
function _function_body(block, generator, name, args) {
Starting destructuring.
2015-01-15 03:03:38 +00:00
var loop = S.in_loop;
var labels = S.labels;
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
var current_generator = S.in_generator;
Starting destructuring.
2015-01-15 03:03:38 +00:00
++S.in_function;
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
if (generator)
S.in_generator = S.in_function;
=> with destructuring arguments. Requires a lot of parser changes
2015-08-03 23:14:18 +00:00
if (block)
S.in_directives = true;
Starting destructuring.
2015-01-15 03:03:38 +00:00
S.in_loop = 0;
S.labels = [];
Merge branch 'master' into harmony
2016-06-12 15:29:42 +00:00
if (block) {
S.input.push_directives_stack();
=> with destructuring arguments. Requires a lot of parser changes
2015-08-03 23:14:18 +00:00
var a = block_();
Merge branch 'master' into harmony-v3.0.0
2017-05-06 23:18:15 +00:00
if (S.input.has_directive("use strict")) {
if (name) strict_verify_symbol(name);
if (args) args.forEach(strict_verify_symbol);
}
Merge branch 'master' into harmony
2016-06-12 15:29:42 +00:00
S.input.pop_directives_stack();
} else {
=> with destructuring arguments. Requires a lot of parser changes
2015-08-03 23:14:18 +00:00
var a = expression(false);
Merge branch 'master' into harmony
2016-06-12 15:29:42 +00:00
}
Starting destructuring.
2015-01-15 03:03:38 +00:00
--S.in_function;
S.in_loop = loop;
S.labels = labels;
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
S.in_generator = current_generator;
Starting destructuring.
2015-01-15 03:03:38 +00:00
return a;
}
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
function _yield_expression() {
// Previous token must be keyword yield and not be interpret as an identifier
if (!is_in_generator()) {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
croak("Unexpected yield expression outside generator function",
Extend unicode support * Support \u{xxxx} syntax * Add support for surrogate pairs * Allow identifiers to have unicode escape sequence
2016-06-22 15:12:23 +00:00
S.prev.line, S.prev.col, S.prev.pos);
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
}
var star = false;
var has_expression = true;
var tmp;
Fix newline handling after yield YieldExpressions can only be defined as: * `yield` * `yield` [no nlb] AssignmentExpression * `yield` [no nlb] `*` AssignmentExpression
2016-06-11 19:41:16 +00:00
// Attempt to get expression or star (and then the mandatory expression)
// behind yield on the same line.
//
// If nothing follows on the same line of the yieldExpression,
// it should default to the value `undefined` for yield to return.
// In that case, the `undefined` stored as `null` in ast.
//
// Note 1: It isn't allowed for yield* to close without an expression
// Note 2: If there is a nlb between yield and star, it is interpret as
// yield <explicit undefined> <inserted automatic semicolon> *
if (can_insert_semicolon() ||
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
(is("punc") && PUNC_AFTER_EXPRESSION(S.token.value))) {
has_expression = false;
Fix newline handling after yield YieldExpressions can only be defined as: * `yield` * `yield` [no nlb] AssignmentExpression * `yield` [no nlb] `*` AssignmentExpression
2016-06-11 19:41:16 +00:00
} else if (is("operator", "*")) {
star = true;
next();
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
}
return new AST_Yield({
is_star : star,
expression : has_expression ? expression() : null
});
}
init repo
2012-05-27 11:09:01 +00:00
function if_() {
var cond = parenthesised(), body = statement(), belse = null;
if (is("keyword", "else")) {
next();
belse = statement();
}
return new AST_If({
condition : cond,
an AST_If is too a StatementWithBody
2012-09-03 09:11:44 +00:00
body : body,
init repo
2012-05-27 11:09:01 +00:00
alternative : belse
});
};
cleaned up usage of AST_BlockStatement The following nodes were instances of AST_BlockStatement: AST_Scope, AST_SwitchBlock, AST_SwitchBranch. Also, AST_Try, AST_Catch, AST_Finally were having a body instanceof AST_BlockStatement. Overloading the meaning of AST_BlockStatement this way turned out to be a mess; we now have an AST_Block class that is the base class for things having a block of statements (might or might not be bracketed). The `this.body` of AST_Scope, AST_Try, AST_Catch, AST_Finally is now an array of statements (as they inherit from AST_Block). Avoiding calling superclass's _walk function in walkers (turns out we walked a node multiple times).
2012-09-05 08:31:02 +00:00
function block_() {
init repo
2012-05-27 11:09:01 +00:00
expect("{");
var a = [];
while (!is("punc", "}")) {
if (is("eof")) unexpected();
a.push(statement());
}
next();
cleaned up usage of AST_BlockStatement The following nodes were instances of AST_BlockStatement: AST_Scope, AST_SwitchBlock, AST_SwitchBranch. Also, AST_Try, AST_Catch, AST_Finally were having a body instanceof AST_BlockStatement. Overloading the meaning of AST_BlockStatement this way turned out to be a mess; we now have an AST_Block class that is the base class for things having a block of statements (might or might not be bracketed). The `this.body` of AST_Scope, AST_Try, AST_Catch, AST_Finally is now an array of statements (as they inherit from AST_Block). Avoiding calling superclass's _walk function in walkers (turns out we walked a node multiple times).
2012-09-05 08:31:02 +00:00
return a;
init repo
2012-05-27 11:09:01 +00:00
};
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
function switch_body_() {
init repo
2012-05-27 11:09:01 +00:00
expect("{");
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var a = [], cur = null, branch = null, tmp;
init repo
2012-05-27 11:09:01 +00:00
while (!is("punc", "}")) {
if (is("eof")) unexpected();
if (is("keyword", "case")) {
WIP
2012-05-27 14:25:31 +00:00
if (branch) branch.end = prev();
init repo
2012-05-27 11:09:01 +00:00
cur = [];
WIP
2012-05-27 14:25:31 +00:00
branch = new AST_Case({
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
start : (tmp = S.token, next(), tmp),
expression : expression(true),
WIP
2012-05-27 14:25:31 +00:00
body : cur
});
a.push(branch);
init repo
2012-05-27 11:09:01 +00:00
expect(":");
}
else if (is("keyword", "default")) {
WIP
2012-05-27 14:25:31 +00:00
if (branch) branch.end = prev();
init repo
2012-05-27 11:09:01 +00:00
cur = [];
WIP
2012-05-27 14:25:31 +00:00
branch = new AST_Default({
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
start : (tmp = S.token, next(), expect(":"), tmp),
WIP
2012-05-27 14:25:31 +00:00
body : cur
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
});
WIP
2012-05-27 14:25:31 +00:00
a.push(branch);
init repo
2012-05-27 11:09:01 +00:00
}
else {
if (!cur) unexpected();
cur.push(statement());
}
}
WIP
2012-05-27 14:25:31 +00:00
if (branch) branch.end = prev();
init repo
2012-05-27 11:09:01 +00:00
next();
more cleanup (dropped AST_SwitchBlock)
2012-10-03 12:52:01 +00:00
return a;
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
};
init repo
2012-05-27 11:09:01 +00:00
function try_() {
cleaned up usage of AST_BlockStatement The following nodes were instances of AST_BlockStatement: AST_Scope, AST_SwitchBlock, AST_SwitchBranch. Also, AST_Try, AST_Catch, AST_Finally were having a body instanceof AST_BlockStatement. Overloading the meaning of AST_BlockStatement this way turned out to be a mess; we now have an AST_Block class that is the base class for things having a block of statements (might or might not be bracketed). The `this.body` of AST_Scope, AST_Try, AST_Catch, AST_Finally is now an array of statements (as they inherit from AST_Block). Avoiding calling superclass's _walk function in walkers (turns out we walked a node multiple times).
2012-09-05 08:31:02 +00:00
var body = block_(), bcatch = null, bfinally = null;
init repo
2012-05-27 11:09:01 +00:00
if (is("keyword", "catch")) {
WIP
2012-05-27 14:25:31 +00:00
var start = S.token;
init repo
2012-05-27 11:09:01 +00:00
next();
expect("(");
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
var name = parameter(undefined, AST_SymbolCatch);
init repo
2012-05-27 11:09:01 +00:00
expect(")");
bcatch = new AST_Catch({
WIP
2012-05-27 14:25:31 +00:00
start : start,
init repo
2012-05-27 11:09:01 +00:00
argname : name,
cleaned up usage of AST_BlockStatement The following nodes were instances of AST_BlockStatement: AST_Scope, AST_SwitchBlock, AST_SwitchBranch. Also, AST_Try, AST_Catch, AST_Finally were having a body instanceof AST_BlockStatement. Overloading the meaning of AST_BlockStatement this way turned out to be a mess; we now have an AST_Block class that is the base class for things having a block of statements (might or might not be bracketed). The `this.body` of AST_Scope, AST_Try, AST_Catch, AST_Finally is now an array of statements (as they inherit from AST_Block). Avoiding calling superclass's _walk function in walkers (turns out we walked a node multiple times).
2012-09-05 08:31:02 +00:00
body : block_(),
WIP
2012-05-27 14:25:31 +00:00
end : prev()
init repo
2012-05-27 11:09:01 +00:00
});
}
if (is("keyword", "finally")) {
WIP
2012-05-27 14:25:31 +00:00
var start = S.token;
init repo
2012-05-27 11:09:01 +00:00
next();
WIP
2012-05-27 14:25:31 +00:00
bfinally = new AST_Finally({
start : start,
cleaned up usage of AST_BlockStatement The following nodes were instances of AST_BlockStatement: AST_Scope, AST_SwitchBlock, AST_SwitchBranch. Also, AST_Try, AST_Catch, AST_Finally were having a body instanceof AST_BlockStatement. Overloading the meaning of AST_BlockStatement this way turned out to be a mess; we now have an AST_Block class that is the base class for things having a block of statements (might or might not be bracketed). The `this.body` of AST_Scope, AST_Try, AST_Catch, AST_Finally is now an array of statements (as they inherit from AST_Block). Avoiding calling superclass's _walk function in walkers (turns out we walked a node multiple times).
2012-09-05 08:31:02 +00:00
body : block_(),
WIP
2012-05-27 14:25:31 +00:00
end : prev()
});
init repo
2012-05-27 11:09:01 +00:00
}
if (!bcatch && !bfinally)
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
croak("Missing catch/finally blocks");
init repo
2012-05-27 11:09:01 +00:00
return new AST_Try({
cleaned up usage of AST_BlockStatement The following nodes were instances of AST_BlockStatement: AST_Scope, AST_SwitchBlock, AST_SwitchBranch. Also, AST_Try, AST_Catch, AST_Finally were having a body instanceof AST_BlockStatement. Overloading the meaning of AST_BlockStatement this way turned out to be a mess; we now have an AST_Block class that is the base class for things having a block of statements (might or might not be bracketed). The `this.body` of AST_Scope, AST_Try, AST_Catch, AST_Finally is now an array of statements (as they inherit from AST_Block). Avoiding calling superclass's _walk function in walkers (turns out we walked a node multiple times).
2012-09-05 08:31:02 +00:00
body : body,
init repo
2012-05-27 11:09:01 +00:00
bcatch : bcatch,
bfinally : bfinally
});
};
First class block scope - Make let, const, and class symbols be declared in a block scope. - Piggy back on existing catch symbol implementation to get block-aware mangling working - Make sure unused block-scoped declarations can be dropped - Don't eliminate a block if it has a block-scoped declaration - Remove silly empty anonymous blocks left over from drop_unused - AST_Toplevel now gets to call drop_unused too, since block-scoped variables aren't global! - Don't consider block declarations global
2016-02-28 14:06:51 +00:00
function vardefs(no_in, kind) {
init repo
2012-05-27 11:09:01 +00:00
var a = [];
Parse and compress destructuring VarDefs
2015-08-13 23:20:21 +00:00
var def;
init repo
2012-05-27 11:09:01 +00:00
for (;;) {
First class block scope - Make let, const, and class symbols be declared in a block scope. - Piggy back on existing catch symbol implementation to get block-aware mangling working - Make sure unused block-scoped declarations can be dropped - Don't eliminate a block if it has a block-scoped declaration - Remove silly empty anonymous blocks left over from drop_unused - AST_Toplevel now gets to call drop_unused too, since block-scoped variables aren't global! - Don't consider block declarations global
2016-02-28 14:06:51 +00:00
var sym_type =
kind === "var" ? AST_SymbolVar :
kind === "const" ? AST_SymbolConst :
kind === "let" ? AST_SymbolLet : null;
Parse and compress destructuring VarDefs
2015-08-13 23:20:21 +00:00
if (is("punc", "{") || is("punc", "[")) {
def = new AST_VarDef({
start: S.token,
Improve support for binding pattern Including improvements for parameters, variable assignment and catch parameter.
2016-08-20 20:32:29 +00:00
name: binding_element(undefined ,sym_type),
Destructuring vardef in for..of and for..in
2015-08-14 01:11:38 +00:00
value: is("operator", "=") ? (expect_token("operator", "="), expression(false, no_in)) : null,
Parse and compress destructuring VarDefs
2015-08-13 23:20:21 +00:00
end: prev()
});
} else {
def = new AST_VarDef({
start : S.token,
Add holes in destructuring defs, also make them nestable
2015-08-14 00:16:54 +00:00
name : as_symbol(sym_type),
Merge branch 'master' into harmony-v3.0.0
2017-05-06 23:18:15 +00:00
value : is("operator", "=")
? (next(), expression(false, no_in))
fix for-of loop with const iterator (#1899)
2017-05-10 03:36:03 +00:00
: !no_in && kind === "const" && S.input.has_directive("use strict")
Merge branch 'master' into harmony-v3.0.0
2017-05-06 23:18:15 +00:00
? croak("Missing initializer in const declaration") : null,
Parse and compress destructuring VarDefs
2015-08-13 23:20:21 +00:00
end : prev()
})
}
a.push(def);
init repo
2012-05-27 11:09:01 +00:00
if (!is("punc", ","))
break;
next();
}
return a;
};
WIP
2012-05-27 14:25:31 +00:00
var var_ = function(no_in) {
init repo
2012-05-27 11:09:01 +00:00
return new AST_Var({
WIP
2012-05-27 14:25:31 +00:00
start : prev(),
First class block scope - Make let, const, and class symbols be declared in a block scope. - Piggy back on existing catch symbol implementation to get block-aware mangling working - Make sure unused block-scoped declarations can be dropped - Don't eliminate a block if it has a block-scoped declaration - Remove silly empty anonymous blocks left over from drop_unused - AST_Toplevel now gets to call drop_unused too, since block-scoped variables aren't global! - Don't consider block declarations global
2016-02-28 14:06:51 +00:00
definitions : vardefs(no_in, "var"),
WIP
2012-05-27 14:25:31 +00:00
end : prev()
init repo
2012-05-27 11:09:01 +00:00
});
WIP
2012-05-27 14:25:31 +00:00
};
init repo
2012-05-27 11:09:01 +00:00
parse, output the let statement
2015-09-06 20:33:17 +00:00
var let_ = function(no_in) {
return new AST_Let({
start : prev(),
First class block scope - Make let, const, and class symbols be declared in a block scope. - Piggy back on existing catch symbol implementation to get block-aware mangling working - Make sure unused block-scoped declarations can be dropped - Don't eliminate a block if it has a block-scoped declaration - Remove silly empty anonymous blocks left over from drop_unused - AST_Toplevel now gets to call drop_unused too, since block-scoped variables aren't global! - Don't consider block declarations global
2016-02-28 14:06:51 +00:00
definitions : vardefs(no_in, "let"),
parse, output the let statement
2015-09-06 20:33:17 +00:00
end : prev()
});
};
fix for-of loop with const iterator (#1899)
2017-05-10 03:36:03 +00:00
var const_ = function(no_in) {
init repo
2012-05-27 11:09:01 +00:00
return new AST_Const({
WIP
2012-05-27 14:25:31 +00:00
start : prev(),
fix for-of loop with const iterator (#1899)
2017-05-10 03:36:03 +00:00
definitions : vardefs(no_in, "const"),
WIP
2012-05-27 14:25:31 +00:00
end : prev()
init repo
2012-05-27 11:09:01 +00:00
});
WIP
2012-05-27 14:25:31 +00:00
};
init repo
2012-05-27 11:09:01 +00:00
Fix bad parsing of `new new x()()` constructs Fixes #739
2015-08-06 19:27:46 +00:00
var new_ = function(allow_calls) {
WIP
2012-05-27 14:25:31 +00:00
var start = S.token;
expect_token("operator", "new");
Implement new.target
2015-11-21 14:48:23 +00:00
if (is("punc", ".")) {
next();
Throw error if new.target is like new.foo
2016-06-25 17:32:09 +00:00
expect_token("name", "target");
Implement new.target
2015-11-21 14:48:23 +00:00
return subscripts(new AST_NewTarget({
start : start,
end : prev()
}), allow_calls);
}
init repo
2012-05-27 11:09:01 +00:00
var newexp = expr_atom(false), args;
if (is("punc", "(")) {
next();
args = expr_list(")");
} else {
args = [];
}
return subscripts(new AST_New({
WIP
2012-05-27 14:25:31 +00:00
start : start,
init repo
2012-05-27 11:09:01 +00:00
expression : newexp,
WIP
2012-05-27 14:25:31 +00:00
args : args,
end : prev()
Fix bad parsing of `new new x()()` constructs Fixes #739
2015-08-06 19:27:46 +00:00
}), allow_calls);
WIP
2012-05-27 14:25:31 +00:00
};
init repo
2012-05-27 11:09:01 +00:00
function as_atom_node() {
var tok = S.token, ret;
switch (tok.type) {
case "name":
Fix parsing setters/getters (allow keywords for name). The "key" property was always "set" or "get", which didn't make much sense. Now it'll be the actual name of the setter/getter (AST_Node), and the AST_Accessor object itself, which represents the function, won't store any name. Close #319
2013-10-30 09:50:22 +00:00
case "keyword":
ret = _make_symbol(AST_SymbolRef);
break;
init repo
2012-05-27 11:09:01 +00:00
case "num":
Rework has_directive It's now available during tree walking, i.e. walker.has_directive("use asm"), rather than as part of the scope. It's thus no longer necessary to call `figure_out_scope` before codegen. Added special bits in the code generator to overcome the fact that it doesn't inherit from TreeWalker. Fix #861
2015-11-11 20:15:25 +00:00
ret = new AST_Number({ start: tok, end: tok, value: tok.value });
init repo
2012-05-27 11:09:01 +00:00
break;
case "string":
Add option to preserve/enforce string quote style `-q 0` (default) use single or double quotes such as to minimize the number of bytes (prefers double quotes when both will do); this is the previous behavior. `-q 1` -- always use single quotes `-q 2` -- always use double quotes `-q 3` or just `-q` -- always use the original quotes. Related codegen option: `quote_style`. Close #495 Close #460 Some `yargs` guru please tell me why `uglifyjs --help` doesn't display the help string for `-q` / `--quotes`, and why it doesn't output the expected argument types anymore, like good old `optimist` did.
2015-01-27 20:26:27 +00:00
ret = new AST_String({
start : tok,
end : tok,
value : tok.value,
quote : tok.quote
});
init repo
2012-05-27 11:09:01 +00:00
break;
case "regexp":
added $propdoc to AST nodes and some cleanups hopefully we can make the AST documentation self-generating
2012-10-09 13:25:45 +00:00
ret = new AST_RegExp({ start: tok, end: tok, value: tok.value });
init repo
2012-05-27 11:09:01 +00:00
break;
case "atom":
switch (tok.value) {
case "false":
ret = new AST_False({ start: tok, end: tok });
break;
case "true":
ret = new AST_True({ start: tok, end: tok });
break;
case "null":
ret = new AST_Null({ start: tok, end: tok });
break;
}
break;
Allow operator names as getters/setters Fixes #919 Fix provided by @kzc
2016-01-15 14:58:15 +00:00
case "operator":
if (!is_identifier_string(tok.value)) {
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
croak("Invalid getter/setter name: " + tok.value,
Normalize error messages
2016-06-18 15:28:22 +00:00
tok.line, tok.col, tok.pos);
Allow operator names as getters/setters Fixes #919 Fix provided by @kzc
2016-01-15 14:58:15 +00:00
}
ret = _make_symbol(AST_SymbolRef);
break;
init repo
2012-05-27 11:09:01 +00:00
}
next();
return ret;
};
remove `AST_ArrowParametersOrSeq` (#1997)
2017-05-24 09:45:18 +00:00
function to_fun_args(ex, _, __, default_seen_above) {
var insert_default = function(ex, default_value) {
if (default_value) {
return new AST_DefaultAssign({
start: ex.start,
left: ex,
operator: "=",
right: default_value,
end: default_value.end
});
}
return ex;
}
if (ex instanceof AST_Object) {
return insert_default(new AST_Destructuring({
start: ex.start,
end: ex.end,
is_array: false,
names: ex.properties.map(to_fun_args)
}), default_seen_above);
} else if (ex instanceof AST_ObjectKeyVal) {
if (ex.key instanceof AST_SymbolRef) {
ex.key = to_fun_args(ex.key, 0, [ex.key]);
}
ex.value = to_fun_args(ex.value, 0, [ex.key]);
return insert_default(ex, default_seen_above);
} else if (ex instanceof AST_Hole) {
return ex;
} else if (ex instanceof AST_Destructuring) {
ex.names = ex.names.map(to_fun_args);
return insert_default(ex, default_seen_above);
} else if (ex instanceof AST_SymbolRef) {
return insert_default(new AST_SymbolFunarg({
name: ex.name,
start: ex.start,
end: ex.end
}), default_seen_above);
} else if (ex instanceof AST_Expansion) {
ex.expression = to_fun_args(ex.expression);
return insert_default(ex, default_seen_above);
} else if (ex instanceof AST_Array) {
return insert_default(new AST_Destructuring({
start: ex.start,
end: ex.end,
is_array: true,
names: ex.elements.map(to_fun_args)
}), default_seen_above);
} else if (ex instanceof AST_Assign) {
return insert_default(to_fun_args(ex.left, undefined, undefined, ex.right), default_seen_above);
} else if (ex instanceof AST_DefaultAssign) {
ex.left = to_fun_args(ex.left, 0, [ex.left]);
return ex;
} else {
croak("Invalid function parameter", ex.start.line, ex.start.col);
}
}
init repo
2012-05-27 11:09:01 +00:00
var expr_atom = function(allow_calls) {
if (is("operator", "new")) {
Fix bad parsing of `new new x()()` constructs Fixes #739
2015-08-06 19:27:46 +00:00
return new_(allow_calls);
init repo
2012-05-27 11:09:01 +00:00
}
WIP
2012-05-27 14:25:31 +00:00
var start = S.token;
init repo
2012-05-27 11:09:01 +00:00
if (is("punc")) {
WIP
2012-05-27 14:25:31 +00:00
switch (start.value) {
init repo
2012-05-27 11:09:01 +00:00
case "(":
remove `AST_ArrowParametersOrSeq` (#1997)
2017-05-24 09:45:18 +00:00
next();
var exprs = params_or_seq_();
expect(")");
=> with destructuring arguments. Requires a lot of parser changes
2015-08-03 23:14:18 +00:00
if (is("arrow", "=>")) {
remove `AST_ArrowParametersOrSeq` (#1997)
2017-05-24 09:45:18 +00:00
return arrow_function(start, exprs.map(to_fun_args));
=> with destructuring arguments. Requires a lot of parser changes
2015-08-03 23:14:18 +00:00
}
remove `AST_ArrowParametersOrSeq` (#1997)
2017-05-24 09:45:18 +00:00
var ex = exprs.length == 1 ? exprs[0] : new AST_Sequence({
expressions: exprs
});
fix parser handling of comments
2017-02-27 06:54:47 +00:00
ex.start = start;
ex.end = S.token;
return subscripts(ex, allow_calls);
init repo
2012-05-27 11:09:01 +00:00
case "[":
return subscripts(array_(), allow_calls);
case "{":
=> with destructuring arguments. Requires a lot of parser changes
2015-08-03 23:14:18 +00:00
return subscripts(object_or_object_destructuring_(), allow_calls);
init repo
2012-05-27 11:09:01 +00:00
}
unexpected();
}
if (is("keyword", "function")) {
next();
Fix parsing setters/getters (allow keywords for name). The "key" property was always "set" or "get", which didn't make much sense. Now it'll be the actual name of the setter/getter (AST_Node), and the AST_Accessor object itself, which represents the function, won't store any name. Close #319
2013-10-30 09:50:22 +00:00
var func = function_(AST_Function);
init repo
2012-05-27 11:09:01 +00:00
func.start = start;
func.end = prev();
return subscripts(func, allow_calls);
}
Starting ES6 classes
2015-10-27 00:40:46 +00:00
if (is("keyword", "class")) {
next();
Separate class expressions from class declarations and their symbols like defuns
2015-11-21 09:17:32 +00:00
var cls = class_(AST_ClassExpression);
Starting ES6 classes
2015-10-27 00:40:46 +00:00
cls.start = start;
cls.end = prev();
return subscripts(cls, allow_calls);
}
Template fixes * Fixes #1147: template strings not obeying -b ascii_only true * Allow evaluation of template expressions by adding optimizers and walkers * Make sure tagged templates are never changed * Remove template tokenizer in parser, add template tokenizer in tokenizer. It is using a brace counter to track brace position of templates * Add tokens `template_head` and `template_substitution` but parsing tokens stays mostly the same * Do not output strings anymore in AST_TemplateString, instead use AST_TemplateSegment * Fix parsing tagged templates, allowing multiple templates behind as spec allows this These changes don't influence tagged templates because raw content may influence code execution, however they are safe to do in normal templates: * Allow basic string concatenation of templates where possible * Allow custom character escape style similar to strings, except in tagged templates Note that expressions are still compressed in tagged templates. Optional things that may be improved later: * Custom quote style for templates if it doesn't have expressions. Making it obey the quote_style option if this is the case.
2016-06-22 17:24:03 +00:00
if (is("template_head")) {
return subscripts(template_string(), allow_calls);
}
cleanup - use prototype-less objects where feasible (minor speed improvement) - get rid of HOP
2012-10-11 08:07:42 +00:00
if (ATOMIC_START_TOKEN[S.token.type]) {
init repo
2012-05-27 11:09:01 +00:00
return subscripts(as_atom_node(), allow_calls);
}
unexpected();
};
Parse and output ES6 template strings. Yikes!
2015-09-05 21:32:57 +00:00
function template_string() {
Template fixes * Fixes #1147: template strings not obeying -b ascii_only true * Allow evaluation of template expressions by adding optimizers and walkers * Make sure tagged templates are never changed * Remove template tokenizer in parser, add template tokenizer in tokenizer. It is using a brace counter to track brace position of templates * Add tokens `template_head` and `template_substitution` but parsing tokens stays mostly the same * Do not output strings anymore in AST_TemplateString, instead use AST_TemplateSegment * Fix parsing tagged templates, allowing multiple templates behind as spec allows this These changes don't influence tagged templates because raw content may influence code execution, however they are safe to do in normal templates: * Allow basic string concatenation of templates where possible * Allow custom character escape style similar to strings, except in tagged templates Note that expressions are still compressed in tagged templates. Optional things that may be improved later: * Custom quote style for templates if it doesn't have expressions. Making it obey the quote_style option if this is the case.
2016-06-22 17:24:03 +00:00
var segments = [], start = S.token;
Parse and output ES6 template strings. Yikes!
2015-09-05 21:32:57 +00:00
Template fixes * Fixes #1147: template strings not obeying -b ascii_only true * Allow evaluation of template expressions by adding optimizers and walkers * Make sure tagged templates are never changed * Remove template tokenizer in parser, add template tokenizer in tokenizer. It is using a brace counter to track brace position of templates * Add tokens `template_head` and `template_substitution` but parsing tokens stays mostly the same * Do not output strings anymore in AST_TemplateString, instead use AST_TemplateSegment * Fix parsing tagged templates, allowing multiple templates behind as spec allows this These changes don't influence tagged templates because raw content may influence code execution, however they are safe to do in normal templates: * Allow basic string concatenation of templates where possible * Allow custom character escape style similar to strings, except in tagged templates Note that expressions are still compressed in tagged templates. Optional things that may be improved later: * Custom quote style for templates if it doesn't have expressions. Making it obey the quote_style option if this is the case.
2016-06-22 17:24:03 +00:00
segments.push(new AST_TemplateSegment({
start: S.token,
raw: S.token.raw,
value: S.token.value,
end: S.token
}));
while (S.token.end === false) {
next();
segments.push(expression());
Parse and output ES6 template strings. Yikes!
2015-09-05 21:32:57 +00:00
Template fixes * Fixes #1147: template strings not obeying -b ascii_only true * Allow evaluation of template expressions by adding optimizers and walkers * Make sure tagged templates are never changed * Remove template tokenizer in parser, add template tokenizer in tokenizer. It is using a brace counter to track brace position of templates * Add tokens `template_head` and `template_substitution` but parsing tokens stays mostly the same * Do not output strings anymore in AST_TemplateString, instead use AST_TemplateSegment * Fix parsing tagged templates, allowing multiple templates behind as spec allows this These changes don't influence tagged templates because raw content may influence code execution, however they are safe to do in normal templates: * Allow basic string concatenation of templates where possible * Allow custom character escape style similar to strings, except in tagged templates Note that expressions are still compressed in tagged templates. Optional things that may be improved later: * Custom quote style for templates if it doesn't have expressions. Making it obey the quote_style option if this is the case.
2016-06-22 17:24:03 +00:00
if (!is_token("template_substitution")) {
unexpected();
}
Parse and output ES6 template strings. Yikes!
2015-09-05 21:32:57 +00:00
Template fixes * Fixes #1147: template strings not obeying -b ascii_only true * Allow evaluation of template expressions by adding optimizers and walkers * Make sure tagged templates are never changed * Remove template tokenizer in parser, add template tokenizer in tokenizer. It is using a brace counter to track brace position of templates * Add tokens `template_head` and `template_substitution` but parsing tokens stays mostly the same * Do not output strings anymore in AST_TemplateString, instead use AST_TemplateSegment * Fix parsing tagged templates, allowing multiple templates behind as spec allows this These changes don't influence tagged templates because raw content may influence code execution, however they are safe to do in normal templates: * Allow basic string concatenation of templates where possible * Allow custom character escape style similar to strings, except in tagged templates Note that expressions are still compressed in tagged templates. Optional things that may be improved later: * Custom quote style for templates if it doesn't have expressions. Making it obey the quote_style option if this is the case.
2016-06-22 17:24:03 +00:00
segments.push(new AST_TemplateSegment({
start: S.token,
raw: S.token.raw,
value: S.token.value,
end: S.token
}));
}
Parse and output ES6 template strings. Yikes!
2015-09-05 21:32:57 +00:00
next();
return new AST_TemplateString({
start: start,
segments: segments,
end: S.token
});
}
init repo
2012-05-27 11:09:01 +00:00
function expr_list(closing, allow_trailing_comma, allow_empty) {
var first = true, a = [];
while (!is("punc", closing)) {
if (first) first = false; else expect(",");
if (allow_trailing_comma && is("punc", closing)) break;
if (is("punc", ",") && allow_empty) {
Fix output for arrays containing undefined values. 1b6bcca7 was a first attempt at this. That commit made Uglify stop replacing holes with undefined, but instead it started replacing undefined with holes. This is slightly problematic, because there is a difference between a hole and an undefined value. More problematically, it changed [1,undefined] to [1,] which generally doesn't even parse as a hole (just as a trailing comma), so it didn't even preserve the length of the array! Instead, parse holes as their own special AST node which prints invisibly.
2013-01-16 19:59:19 +00:00
a.push(new AST_Hole({ start: S.token, end: S.token }));
Allow expand in array literals
2016-06-10 23:40:45 +00:00
} else if (is("expand", "...")) {
next();
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
a.push(new AST_Expansion({start: prev(), expression: expression(),end: S.token}));
init repo
2012-05-27 11:09:01 +00:00
} else {
a.push(expression(false));
}
}
next();
return a;
};
WIP
2012-05-27 14:25:31 +00:00
var array_ = embed_tokens(function() {
expect("[");
init repo
2012-05-27 11:09:01 +00:00
return new AST_Array({
better support for multiple input files: - use a single AST_Toplevel node for all files - keep original source filename in the tokens
2012-09-21 11:19:05 +00:00
elements: expr_list("]", !options.strict, true)
init repo
2012-05-27 11:09:01 +00:00
});
WIP
2012-05-27 14:25:31 +00:00
});
init repo
2012-05-27 11:09:01 +00:00
fix parser test not sure if `start.pos` is correct, but oh well
2017-02-28 06:08:31 +00:00
var create_accessor = embed_tokens(function(is_generator) {
return function_(AST_Accessor, is_generator);
Fix: AST_Accessor missing start / end tokens fixes #1492 closes #1493
2017-02-20 09:14:53 +00:00
});
=> with destructuring arguments. Requires a lot of parser changes
2015-08-03 23:14:18 +00:00
var object_or_object_destructuring_ = embed_tokens(function() {
Remove unused state variable in_parameters, and also remove unreachable code (try_an_object always returned an object!)
2015-09-05 22:01:25 +00:00
var start = S.token, first = true, a = [];
WIP
2012-05-27 14:25:31 +00:00
expect("{");
Remove unused state variable in_parameters, and also remove unreachable code (try_an_object always returned an object!)
2015-09-05 22:01:25 +00:00
while (!is("punc", "}")) {
if (first) first = false; else expect(",");
if (!options.strict && is("punc", "}"))
// allow trailing comma
break;
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
start = S.token;
Remove unused state variable in_parameters, and also remove unreachable code (try_an_object always returned an object!)
2015-09-05 22:01:25 +00:00
var name = as_property_name();
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
var value;
// Check property and fetch value
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
if (!is("punc", ":")) {
Starting ES6 classes
2015-10-27 00:40:46 +00:00
var concise = concise_method_or_getset(name, start);
if (concise) {
a.push(concise);
Remove unused state variable in_parameters, and also remove unreachable code (try_an_object always returned an object!)
2015-09-05 22:01:25 +00:00
continue;
init repo
2012-05-27 11:09:01 +00:00
}
computed properties
2015-09-07 21:46:07 +00:00
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
value = new AST_SymbolRef({
start: prev(),
name: name,
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
end: prev()
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
});
} else if (name === null) {
unexpected(prev());
} else {
next(); // `:` - see first condition
value = expression(false);
computed properties
2015-09-07 21:46:07 +00:00
}
Merge branch 'master' into harmony
2016-04-17 11:37:01 +00:00
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
// Check for default value and alter value accordingly if necessary
Default values inside destructurings
2015-11-22 19:04:42 +00:00
if (is("operator", "=")) {
next();
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
value = new AST_Assign({
Default values inside destructurings
2015-11-22 19:04:42 +00:00
start: start,
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
left: value,
Default values inside destructurings
2015-11-22 19:04:42 +00:00
operator: "=",
right: expression(false),
end: prev()
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
});
Remove unused state variable in_parameters, and also remove unreachable code (try_an_object always returned an object!)
2015-09-05 22:01:25 +00:00
}
Destructuring consistency fixes (#1417) - Use AST_Destructuring for lhf assignment patterns - Use AST_DefaultAssign for default assignments - Add more checks for lhs expressions - Add lots of testing - Cleanup ast (e.g. remove default property) - Fix #1402 based on a patch from @kzc - Refine spread allowance in array destructring pattern - Add destructuring AST tree checker
2017-02-24 00:49:19 +00:00
// Create property
a.push(new AST_ObjectKeyVal({
start: start,
quote: start.quote,
key: name,
value: value,
end: prev()
}));
=> with destructuring arguments. Requires a lot of parser changes
2015-08-03 23:14:18 +00:00
}
Remove unused state variable in_parameters, and also remove unreachable code (try_an_object always returned an object!)
2015-09-05 22:01:25 +00:00
next();
return new AST_Object({ properties: a })
init repo
2012-05-27 11:09:01 +00:00
});
Separate class expressions from class declarations and their symbols like defuns
2015-11-21 09:17:32 +00:00
function class_(KindOfClass) {
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
var start, method, class_name, extends_, a = [];
Starting ES6 classes
2015-10-27 00:40:46 +00:00
Make classes implicitly strict mode
2016-09-11 13:06:10 +00:00
S.input.push_directives_stack(); // Push directive stack, but not scope stack
S.input.add_directive("use strict");
Starting ES6 classes
2015-10-27 00:40:46 +00:00
if (S.token.type == "name" && S.token.value != "extends") {
Separate class expressions from class declarations and their symbols like defuns
2015-11-21 09:17:32 +00:00
class_name = as_symbol(KindOfClass === AST_DefClass ? AST_SymbolDefClass : AST_SymbolClass);
}
if (KindOfClass === AST_DefClass && !class_name) {
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
unexpected();
Starting ES6 classes
2015-10-27 00:40:46 +00:00
}
if (S.token.value == "extends") {
next();
extends_ = expression(true);
}
expect("{");
if (is("punc", ";")) { next(); } // Leading semicolons are okay in class bodies.
while (!is("punc", "}")) {
start = S.token;
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
method = concise_method_or_getset(as_property_name(), start, true);
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
if (!method) { unexpected(); }
Starting ES6 classes
2015-10-27 00:40:46 +00:00
a.push(method);
if (is("punc", ";")) { next(); }
}
Make classes implicitly strict mode
2016-09-11 13:06:10 +00:00
S.input.pop_directives_stack();
Starting ES6 classes
2015-10-27 00:40:46 +00:00
next();
Separate class expressions from class declarations and their symbols like defuns
2015-11-21 09:17:32 +00:00
return new KindOfClass({
Starting ES6 classes
2015-10-27 00:40:46 +00:00
start: start,
name: class_name,
extends: extends_,
properties: a,
end: prev(),
});
}
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
function concise_method_or_getset(name, start, is_class) {
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
var get_ast = function(name, token) {
if (typeof name === "string" || typeof name === "number") {
return new AST_SymbolMethod({
start: token,
name: name,
end: prev()
});
Make distinction between * method and * operator Also add quotes to properties when necessary, this might be the case if the name isn't a valid identifier
2016-07-22 09:46:30 +00:00
} else if (name === null) {
unexpected();
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
}
return name;
}
static properties
2015-10-27 00:51:47 +00:00
var is_static = false;
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
var is_generator = false;
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
var property_token = start;
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
if (is_class && name === "static" && !is("punc", "(")) {
static properties
2015-10-27 00:51:47 +00:00
is_static = true;
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
property_token = S.token;
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
name = as_property_name();
static properties
2015-10-27 00:51:47 +00:00
}
Make distinction between * method and * operator Also add quotes to properties when necessary, this might be the case if the name isn't a valid identifier
2016-07-22 09:46:30 +00:00
if (name === null) {
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
is_generator = true;
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
property_token = S.token;
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
name = as_property_name();
Make distinction between * method and * operator Also add quotes to properties when necessary, this might be the case if the name isn't a valid identifier
2016-07-22 09:46:30 +00:00
if (name === null) {
unexpected();
}
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
}
Starting ES6 classes
2015-10-27 00:40:46 +00:00
if (is("punc", "(")) {
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
name = get_ast(name, start);
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
var node = new AST_ConciseMethod({
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
start : start,
static : is_static,
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
is_generator: is_generator,
key : name,
quote : name instanceof AST_SymbolMethod ?
property_token.quote : undefined,
fix parser test not sure if `start.pos` is correct, but oh well
2017-02-28 06:08:31 +00:00
value : create_accessor(is_generator),
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
end : prev()
Starting ES6 classes
2015-10-27 00:40:46 +00:00
});
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
return node;
Starting ES6 classes
2015-10-27 00:40:46 +00:00
}
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
property_token = S.token;
Starting ES6 classes
2015-10-27 00:40:46 +00:00
if (name == "get") {
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
if (!is("punc") || is("punc", "[")) {
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
name = get_ast(as_property_name(), start);
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
return new AST_ObjectGetter({
start : start,
static: is_static,
key : name,
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
quote : name instanceof AST_SymbolMethod ?
property_token.quote : undefined,
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
value : create_accessor(),
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
end : prev()
});
}
Starting ES6 classes
2015-10-27 00:40:46 +00:00
}
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
else if (name == "set") {
if (!is("punc") || is("punc", "[")) {
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
name = get_ast(as_property_name(), start);
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
return new AST_ObjectSetter({
start : start,
static: is_static,
key : name,
Fix quoting of properties - Make AST_ConciseMethod child of AST_ObjectProperty. - Fix some typos.
2016-07-29 01:18:21 +00:00
quote : name instanceof AST_SymbolMethod ?
property_token.quote : undefined,
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
value : create_accessor(),
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
end : prev()
});
}
Starting ES6 classes
2015-10-27 00:40:46 +00:00
}
}
Starting out the import statement
2016-01-29 20:47:49 +00:00
function import_() {
Importing names from places
2016-02-21 17:06:09 +00:00
var start = prev();
var imported_name;
importing names in the modules, not just default imports
2016-02-26 21:12:19 +00:00
var imported_names;
Importing names from places
2016-02-21 17:06:09 +00:00
if (is("name")) {
imported_name = as_symbol(AST_SymbolImport);
importing names in the modules, not just default imports
2016-02-26 21:12:19 +00:00
}
if (is("punc", ",")) {
next();
}
More variants of import added (#1738) - `import * from "x.js"` - `import * as Name from "x.js"`
2017-03-31 09:52:56 +00:00
imported_names = import_names(true);
importing names in the modules, not just default imports
2016-02-26 21:12:19 +00:00
if (imported_names || imported_name) {
Importing names from places
2016-02-21 17:06:09 +00:00
expect_token("name", "from");
}
var mod_str = S.token;
if (mod_str.type !== 'string') {
unexpected();
}
next();
Starting out the import statement
2016-01-29 20:47:49 +00:00
return new AST_Import({
Importing names from places
2016-02-21 17:06:09 +00:00
start: start,
imported_name: imported_name,
importing names in the modules, not just default imports
2016-02-26 21:12:19 +00:00
imported_names: imported_names,
Starting out the import statement
2016-01-29 20:47:49 +00:00
module_name: new AST_String({
Importing names from places
2016-02-21 17:06:09 +00:00
start: mod_str,
value: mod_str.value,
quote: mod_str.quote,
end: mod_str,
Starting out the import statement
2016-01-29 20:47:49 +00:00
}),
Importing names from places
2016-02-21 17:06:09 +00:00
end: S.token,
Starting out the import statement
2016-01-29 20:47:49 +00:00
});
}
importing names in the modules, not just default imports
2016-02-26 21:12:19 +00:00
function import_name() {
var start = S.token;
var foreign_name;
var name;
if (peek().value === "as" && peek().type === "name") {
foreign_name = as_symbol(AST_SymbolImportForeign);
next(); // The "as" word
}
name = as_symbol(AST_SymbolImport);
Mangling externally imported names by using aliasing
2016-02-27 12:01:16 +00:00
if (foreign_name === undefined) {
foreign_name = new AST_SymbolImportForeign({
name: name.name,
start: name.start,
end: name.end,
});
}
importing names in the modules, not just default imports
2016-02-26 21:12:19 +00:00
return new AST_NameImport({
start: start,
foreign_name: foreign_name,
name: name,
end: prev(),
})
}
More variants of import added (#1738) - `import * from "x.js"` - `import * as Name from "x.js"`
2017-03-31 09:52:56 +00:00
function import_nameAsterisk(name) {
[ES6] Implemented parse for export Name from Module variants. (#1701) - add `AST_Export` new variants output - add tests to `test/compress/` - update `$propdoc` of `AST_Export` ("exported_names" & "module_name") - add tests for `export ... as ...` variants
2017-03-30 09:07:50 +00:00
var start = S.token;
var foreign_name;
var end = prev();
More variants of import added (#1738) - `import * from "x.js"` - `import * as Name from "x.js"`
2017-03-31 09:52:56 +00:00
name = name || new AST_SymbolImport({
[ES6] Implemented parse for export Name from Module variants. (#1701) - add `AST_Export` new variants output - add tests to `test/compress/` - update `$propdoc` of `AST_Export` ("exported_names" & "module_name") - add tests for `export ... as ...` variants
2017-03-30 09:07:50 +00:00
name: '*',
start: start,
end: end,
});
foreign_name = new AST_SymbolImportForeign({
name: '*',
start: start,
end: end,
});
return new AST_NameImport({
start: start,
foreign_name: foreign_name,
name: name,
end: end,
})
}
More variants of import added (#1738) - `import * from "x.js"` - `import * as Name from "x.js"`
2017-03-31 09:52:56 +00:00
function import_names(allow_as) {
var names;
if (is("punc", "{")) {
next();
names = [];
while (!is("punc", "}")) {
names.push(import_name());
if (is("punc", ",")) {
next();
}
}
next();
} else if (is("operator", "*")) {
var name;
next();
if (allow_as && is("name", "as")) {
next(); // The "as" word
name = as_symbol(AST_SymbolImportForeign);
}
names = [import_nameAsterisk(name)];
}
return names;
}
Implement the export statement
2016-02-27 12:24:18 +00:00
function export_() {
var start = S.token;
var is_default;
var exported_value;
var exported_definition;
[ES6] Implemented parse for export Name from Module variants. (#1701) - add `AST_Export` new variants output - add tests to `test/compress/` - update `$propdoc` of `AST_Export` ("exported_names" & "module_name") - add tests for `export ... as ...` variants
2017-03-30 09:07:50 +00:00
var exported_names;
Implement the export statement
2016-02-27 12:24:18 +00:00
if (is("keyword", "default")) {
is_default = true;
next();
fix `export default expression;` (#1932)
2017-05-13 04:56:46 +00:00
} else {
exported_names = import_names(false);
Implement the export statement
2016-02-27 12:24:18 +00:00
fix `export default expression;` (#1932)
2017-05-13 04:56:46 +00:00
if (exported_names) {
if (is("name", "from")) {
next();
[ES6] Implemented parse for export Name from Module variants. (#1701) - add `AST_Export` new variants output - add tests to `test/compress/` - update `$propdoc` of `AST_Export` ("exported_names" & "module_name") - add tests for `export ... as ...` variants
2017-03-30 09:07:50 +00:00
fix `export default expression;` (#1932)
2017-05-13 04:56:46 +00:00
var mod_str = S.token;
if (mod_str.type !== 'string') {
unexpected();
}
next();
[ES6] Implemented parse for export Name from Module variants. (#1701) - add `AST_Export` new variants output - add tests to `test/compress/` - update `$propdoc` of `AST_Export` ("exported_names" & "module_name") - add tests for `export ... as ...` variants
2017-03-30 09:07:50 +00:00
fix `export default expression;` (#1932)
2017-05-13 04:56:46 +00:00
return new AST_Export({
start: start,
is_default: is_default,
exported_names: exported_names,
module_name: new AST_String({
start: mod_str,
value: mod_str.value,
quote: mod_str.quote,
end: mod_str,
}),
end: prev(),
});
} else {
return new AST_Export({
start: start,
is_default: is_default,
exported_names: exported_names,
end: prev(),
});
Another variant of export added - export {Name}. (#1737)
2017-03-31 09:51:27 +00:00
}
}
[ES6] Implemented parse for export Name from Module variants. (#1701) - add `AST_Export` new variants output - add tests to `test/compress/` - update `$propdoc` of `AST_Export` ("exported_names" & "module_name") - add tests for `export ... as ...` variants
2017-03-30 09:07:50 +00:00
}
fix issues related to `export` & `function` (#2002) - `unused` function names - confusion with function call syntax fixes #2001
2017-05-25 19:12:52 +00:00
var is_definition = is("keyword", "var")
|| is("keyword", "let")
|| is("keyword", "const")
|| is("keyword", "function") && !is_default;
Implement the export statement
2016-02-27 12:24:18 +00:00
if (is_definition) {
exported_definition = statement();
fix issues related to `export` & `function` (#2002) - `unused` function names - confusion with function call syntax fixes #2001
2017-05-25 19:12:52 +00:00
} else if (is("keyword", "function")) {
exported_value = expr_atom(false);
Implement the export statement
2016-02-27 12:24:18 +00:00
} else {
fix issues related to `export` & `function` (#2002) - `unused` function names - confusion with function call syntax fixes #2001
2017-05-25 19:12:52 +00:00
exported_value = expression(false);
[ES6] Fix handling of semicolons in export parse.
2016-07-26 13:50:35 +00:00
semicolon();
Implement the export statement
2016-02-27 12:24:18 +00:00
}
return new AST_Export({
start: start,
is_default: is_default,
exported_value: exported_value,
exported_definition: exported_definition,
end: prev(),
});
}
init repo
2012-05-27 11:09:01 +00:00
function as_property_name() {
minor
2012-10-13 09:42:01 +00:00
var tmp = S.token;
switch (tmp.type) {
computed properties
2015-09-07 21:46:07 +00:00
case "punc":
if (tmp.value === "[") {
Merge branch 'master' into harmony-v3.0.0
2017-05-06 23:18:15 +00:00
next();
computed properties
2015-09-07 21:46:07 +00:00
var ex = expression(false);
expect("]");
return ex;
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
} else unexpected(tmp);
case "operator":
Make distinction between * method and * operator Also add quotes to properties when necessary, this might be the case if the name isn't a valid identifier
2016-07-22 09:46:30 +00:00
if (tmp.value === "*") {
Merge branch 'master' into harmony-v3.0.0
2017-05-06 23:18:15 +00:00
next();
Make distinction between * method and * operator Also add quotes to properties when necessary, this might be the case if the name isn't a valid identifier
2016-07-22 09:46:30 +00:00
return null;
}
if (["delete", "in", "instanceof", "new", "typeof", "void"].indexOf(tmp.value) === -1) {
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
unexpected(tmp);
}
WIP
2012-05-27 14:25:31 +00:00
case "name":
fix parsing of `yield` as object key (#1976) fixes #1974
2017-05-20 05:11:37 +00:00
if (tmp.value == "yield" && !is_token(peek(), "punc", ":")
&& S.input.has_directive("use strict") && !is_in_generator()) {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
token_error(tmp, "Unexpected yield identifier inside strict mode");
Restrict yield outside generators in strict mode * Move some yield/generic tests from compress/harmony.js to compress/yield.js * Adjust error messages to conform ecmascript standards
2016-06-17 18:39:03 +00:00
}
case "string":
case "num":
WIP
2012-05-27 14:25:31 +00:00
case "keyword":
case "atom":
fix parser bugs & CLI reporting (#1827) fixes #1825
2017-04-18 20:27:13 +00:00
next();
minor
2012-10-13 09:42:01 +00:00
return tmp.value;
WIP
2012-05-27 14:25:31 +00:00
default:
Various property fixes * Implement getter/setter with computed value * Fix parsing getter/setter after static or generator token * Allow storing expressions for computed expression in AST_SymbolMethod * Allow get and set in shorthand properties in object literals Fixes #1094, #1146 and #1221
2016-07-05 22:40:28 +00:00
unexpected(tmp);
init repo
2012-05-27 11:09:01 +00:00
}
};
function as_name() {
minor
2012-10-13 09:42:01 +00:00
var tmp = S.token;
fix parser bugs & CLI reporting (#1827) fixes #1825
2017-04-18 20:27:13 +00:00
if (tmp.type != "name") unexpected();
minor
2012-10-13 09:42:01 +00:00
next();
fix parser bugs & CLI reporting (#1827) fixes #1825
2017-04-18 20:27:13 +00:00
return tmp.value;
init repo
2012-05-27 11:09:01 +00:00
};
Fix parsing setters/getters (allow keywords for name). The "key" property was always "set" or "get", which didn't make much sense. Now it'll be the actual name of the setter/getter (AST_Node), and the AST_Accessor object itself, which represents the function, won't store any name. Close #319
2013-10-30 09:50:22 +00:00
function _make_symbol(type) {
var name = S.token.value;
Super!
2015-08-07 01:44:53 +00:00
return new (name == "this" ? AST_This :
name == "super" ? AST_Super :
type)({
Fix parsing setters/getters (allow keywords for name). The "key" property was always "set" or "get", which didn't make much sense. Now it'll be the actual name of the setter/getter (AST_Node), and the AST_Accessor object itself, which represents the function, won't store any name. Close #319
2013-10-30 09:50:22 +00:00
name : String(name),
start : S.token,
end : S.token
});
};
improve parser under "use strict" (#1836) - `const` without value - `delete` of expression - redefining `arguments` or `eval` extend `test/ufuzz.js` - optionally generate "use strict" - improve handling of test cases with syntax errors - group IIFE generation - generate bare anonymous functions - workaround `console.log()` for `new function()` - generate expressions with `this` fixes #1810
2017-04-23 12:05:22 +00:00
function strict_verify_symbol(sym) {
if (sym.name == "arguments" || sym.name == "eval")
croak("Unexpected " + sym.name + " in strict mode", sym.start.line, sym.start.col, sym.start.pos);
}
simple visitor API and code to figure out scope and references
2012-08-19 12:57:50 +00:00
function as_symbol(type, noerror) {
if (!is("name")) {
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
if (!noerror) croak("Name expected");
simple visitor API and code to figure out scope and references
2012-08-19 12:57:50 +00:00
return null;
}
Restrict yield outside generators in strict mode * Move some yield/generic tests from compress/harmony.js to compress/yield.js * Adjust error messages to conform ecmascript standards
2016-06-17 18:39:03 +00:00
if (is("name", "yield") && S.input.has_directive("use strict")) {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
token_error(S.prev, "Unexpected yield identifier inside strict mode");
Restrict yield outside generators in strict mode * Move some yield/generic tests from compress/harmony.js to compress/yield.js * Adjust error messages to conform ecmascript standards
2016-06-17 18:39:03 +00:00
}
Fix parsing setters/getters (allow keywords for name). The "key" property was always "set" or "get", which didn't make much sense. Now it'll be the actual name of the setter/getter (AST_Node), and the AST_Accessor object itself, which represents the function, won't store any name. Close #319
2013-10-30 09:50:22 +00:00
var sym = _make_symbol(type);
improve parser under "use strict" (#1836) - `const` without value - `delete` of expression - redefining `arguments` or `eval` extend `test/ufuzz.js` - optionally generate "use strict" - improve handling of test cases with syntax errors - group IIFE generation - generate bare anonymous functions - workaround `console.log()` for `new function()` - generate expressions with `this` fixes #1810
2017-04-23 12:05:22 +00:00
if (S.input.has_directive("use strict") && sym instanceof AST_SymbolDeclaration) {
strict_verify_symbol(sym);
}
init repo
2012-05-27 11:09:01 +00:00
next();
return sym;
};
WIP
2012-05-27 14:25:31 +00:00
var subscripts = function(expr, allow_calls) {
var start = expr.start;
init repo
2012-05-27 11:09:01 +00:00
if (is("punc", ".")) {
next();
return subscripts(new AST_Dot({
WIP
2012-05-27 14:25:31 +00:00
start : start,
init repo
2012-05-27 11:09:01 +00:00
expression : expr,
WIP
2012-05-27 14:25:31 +00:00
property : as_name(),
end : prev()
init repo
2012-05-27 11:09:01 +00:00
}), allow_calls);
}
if (is("punc", "[")) {
next();
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
var prop = expression(true);
WIP
2012-05-27 14:25:31 +00:00
expect("]");
init repo
2012-05-27 11:09:01 +00:00
return subscripts(new AST_Sub({
WIP
2012-05-27 14:25:31 +00:00
start : start,
init repo
2012-05-27 11:09:01 +00:00
expression : expr,
WIP
2012-05-27 14:25:31 +00:00
property : prop,
end : prev()
init repo
2012-05-27 11:09:01 +00:00
}), allow_calls);
}
if (allow_calls && is("punc", "(")) {
next();
return subscripts(new AST_Call({
WIP
2012-05-27 14:25:31 +00:00
start : start,
init repo
2012-05-27 11:09:01 +00:00
expression : expr,
expand parameters Conflicts: test/compress/harmony.js
2015-04-13 00:26:26 +00:00
args : call_args(),
WIP
2012-05-27 14:25:31 +00:00
end : prev()
init repo
2012-05-27 11:09:01 +00:00
}), true);
}
Template fixes * Fixes #1147: template strings not obeying -b ascii_only true * Allow evaluation of template expressions by adding optimizers and walkers * Make sure tagged templates are never changed * Remove template tokenizer in parser, add template tokenizer in tokenizer. It is using a brace counter to track brace position of templates * Add tokens `template_head` and `template_substitution` but parsing tokens stays mostly the same * Do not output strings anymore in AST_TemplateString, instead use AST_TemplateSegment * Fix parsing tagged templates, allowing multiple templates behind as spec allows this These changes don't influence tagged templates because raw content may influence code execution, however they are safe to do in normal templates: * Allow basic string concatenation of templates where possible * Allow custom character escape style similar to strings, except in tagged templates Note that expressions are still compressed in tagged templates. Optional things that may be improved later: * Custom quote style for templates if it doesn't have expressions. Making it obey the quote_style option if this is the case.
2016-06-22 17:24:03 +00:00
if (is("template_head")) {
return subscripts(new AST_PrefixedTemplateString({
start: start,
prefix: expr,
template_string: template_string()
}), allow_calls);
}
init repo
2012-05-27 11:09:01 +00:00
return expr;
WIP
2012-05-27 14:25:31 +00:00
};
init repo
2012-05-27 11:09:01 +00:00
expand parameters Conflicts: test/compress/harmony.js
2015-04-13 00:26:26 +00:00
var call_args = embed_tokens(function call_args() {
var first = true;
var args = [];
while (!is("punc", ")")) {
if (first) first = false; else expect(",");
if (is("expand", "...")) {
next();
args.push(new AST_Expansion({
start: prev(),
[ES6] fix parsing spread arguments that are expressions
2016-09-29 17:25:17 +00:00
expression: expression(false)
expand parameters Conflicts: test/compress/harmony.js
2015-04-13 00:26:26 +00:00
}));
} else {
args.push(expression(false));
}
}
next();
return args;
});
WIP
2012-05-27 14:25:31 +00:00
var maybe_unary = function(allow_calls) {
minor
2012-10-13 09:42:01 +00:00
var start = S.token;
if (is("operator") && UNARY_PREFIX(start.value)) {
next();
Fix parsing regexp after unary-prefix operator ++/x/.y Fix #284
2013-09-02 06:56:27 +00:00
handle_regexp();
fix parser bugs & CLI reporting (#1827) fixes #1825
2017-04-18 20:27:13 +00:00
var ex = make_unary(AST_UnaryPrefix, start, maybe_unary(allow_calls));
WIP
2012-05-27 14:25:31 +00:00
ex.start = start;
ex.end = prev();
return ex;
init repo
2012-05-27 11:09:01 +00:00
}
var val = expr_atom(allow_calls);
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
while (is("operator") && UNARY_POSTFIX(S.token.value) && !S.token.nlb) {
fix parser bugs & CLI reporting (#1827) fixes #1825
2017-04-18 20:27:13 +00:00
val = make_unary(AST_UnaryPostfix, S.token, val);
WIP
2012-05-27 14:25:31 +00:00
val.start = start;
val.end = S.token;
init repo
2012-05-27 11:09:01 +00:00
next();
}
return val;
WIP
2012-05-27 14:25:31 +00:00
};
init repo
2012-05-27 11:09:01 +00:00
fix parser bugs & CLI reporting (#1827) fixes #1825
2017-04-18 20:27:13 +00:00
function make_unary(ctor, token, expr) {
var op = token.value;
improve parser under "use strict" (#1836) - `const` without value - `delete` of expression - redefining `arguments` or `eval` extend `test/ufuzz.js` - optionally generate "use strict" - improve handling of test cases with syntax errors - group IIFE generation - generate bare anonymous functions - workaround `console.log()` for `new function()` - generate expressions with `this` fixes #1810
2017-04-23 12:05:22 +00:00
switch (op) {
case "++":
case "--":
if (!is_assignable(expr))
croak("Invalid use of " + op + " operator", token.line, token.col, token.pos);
break;
case "delete":
if (expr instanceof AST_SymbolRef && S.input.has_directive("use strict"))
croak("Calling delete on expression not allowed in strict mode", expr.start.line, expr.start.col, expr.start.pos);
break;
}
init repo
2012-05-27 11:09:01 +00:00
return new ctor({ operator: op, expression: expr });
};
WIP
2012-05-27 14:25:31 +00:00
var expr_op = function(left, min_prec, no_in) {
init repo
2012-05-27 11:09:01 +00:00
var op = is("operator") ? S.token.value : null;
if (op == "in" && no_in) op = null;
Add exponentiation operator
2016-06-17 22:25:18 +00:00
if (op == "**" && left instanceof AST_UnaryPrefix
&& left.end === S.prev /* unary token in front not allowed, but allowed if prev is for example `)` */
&& left.operator !== "--" && left.operator !== "++")
unexpected(left.start);
init repo
2012-05-27 11:09:01 +00:00
var prec = op != null ? PRECEDENCE[op] : null;
Add exponentiation operator
2016-06-17 22:25:18 +00:00
if (prec != null && (prec > min_prec || (op === "**" && min_prec === prec))) {
init repo
2012-05-27 11:09:01 +00:00
next();
var right = expr_op(maybe_unary(true), prec, no_in);
return expr_op(new AST_Binary({
WIP
2012-05-27 14:25:31 +00:00
start : left.start,
init repo
2012-05-27 11:09:01 +00:00
left : left,
operator : op,
WIP
2012-05-27 14:25:31 +00:00
right : right,
end : right.end
init repo
2012-05-27 11:09:01 +00:00
}), min_prec, no_in);
}
return left;
WIP
2012-05-27 14:25:31 +00:00
};
init repo
2012-05-27 11:09:01 +00:00
function expr_ops(no_in) {
return expr_op(maybe_unary(true), 0, no_in);
};
WIP
2012-05-27 14:25:31 +00:00
var maybe_conditional = function(no_in) {
var start = S.token;
init repo
2012-05-27 11:09:01 +00:00
var expr = expr_ops(no_in);
if (is("operator", "?")) {
next();
var yes = expression(false);
expect(":");
return new AST_Conditional({
WIP
2012-05-27 14:25:31 +00:00
start : start,
condition : expr,
consequent : yes,
alternative : expression(false, no_in),
Fix end token for conditionals. Close #404
2014-01-21 08:38:59 +00:00
end : prev()
init repo
2012-05-27 11:09:01 +00:00
});
}
return expr;
WIP
2012-05-27 14:25:31 +00:00
};
init repo
2012-05-27 11:09:01 +00:00
function is_assignable(expr) {
throw parse error on invalid assignments (#1627) fixes #1626
2017-03-21 06:11:32 +00:00
return expr instanceof AST_PropAccess || expr instanceof AST_SymbolRef;
init repo
2012-05-27 11:09:01 +00:00
};
Merge branch 'master' into harmony-v2.8.15
2017-03-23 07:11:16 +00:00
function to_destructuring(node) {
if (node instanceof AST_Object) {
node = new AST_Destructuring({
start: node.start,
names: node.properties.map(to_destructuring),
is_array: false,
end: node.end
});
} else if (node instanceof AST_Array) {
var names = [];
for (var i = 0; i < node.elements.length; i++) {
// Only allow expansion as last element
if (node.elements[i] instanceof AST_Expansion) {
if (i + 1 !== node.elements.length) {
token_error(node.elements[i].start, "Spread must the be last element in destructuring array");
}
node.elements[i].expression = to_destructuring(node.elements[i].expression);
}
names.push(to_destructuring(node.elements[i]));
}
node = new AST_Destructuring({
start: node.start,
names: names,
is_array: true,
end: node.end
});
} else if (node instanceof AST_ObjectProperty) {
node.value = to_destructuring(node.value);
} else if (node instanceof AST_Assign) {
node = new AST_DefaultAssign({
start: node.start,
left: node.left,
operator: "=",
right: node.right,
end: node.end
});
}
return node;
}
=> with destructuring arguments. Requires a lot of parser changes
2015-08-03 23:14:18 +00:00
// In ES6, AssignmentExpression can also be an ArrowFunction
WIP
2012-05-27 14:25:31 +00:00
var maybe_assign = function(no_in) {
var start = S.token;
Adding arrow functions
2015-01-11 20:07:19 +00:00
Restrict yield outside generators in strict mode * Move some yield/generic tests from compress/harmony.js to compress/yield.js * Adjust error messages to conform ecmascript standards
2016-06-17 18:39:03 +00:00
if (start.type == "name" && start.value == "yield") {
if (is_in_generator()) {
next();
return _yield_expression();
} else if (S.input.has_directive("use strict")) {
Merge branch 'master' into harmony-2.8.0
2017-02-26 20:37:48 +00:00
token_error(S.token, "Unexpected yield identifier inside strict mode")
Restrict yield outside generators in strict mode * Move some yield/generic tests from compress/harmony.js to compress/yield.js * Adjust error messages to conform ecmascript standards
2016-06-17 18:39:03 +00:00
}
Improve yield support and restrict usage of strict - Partially reverting 91cdb93e57 and eaf3911c31 and reimplement - Add generators support for objects and classes - Only classes can have static methods so restrict use of it Special thanks to @rvanvelzen and @kzc for reviewing this patch and providing constructive feedback over and over again.
2016-05-26 15:00:37 +00:00
}
Fix eager parsing of arrow functions for non-punc tokens
2016-03-08 07:43:01 +00:00
if (start.type == "punc" && start.value == "(" && peek().value == ")") {
Fix #931: Create arrow functions in maybe_assign so that they can be used in assignments
2016-02-09 00:02:23 +00:00
next();
next();
remove `AST_ArrowParametersOrSeq` (#1997)
2017-05-24 09:45:18 +00:00
return arrow_function(start, []);
Fix #931: Create arrow functions in maybe_assign so that they can be used in assignments
2016-02-09 00:02:23 +00:00
}
Do not allow arrow functions in the middle of an expression
2016-10-28 18:42:28 +00:00
if (is("name") && is_token(peek(), "arrow")) {
var param = new AST_SymbolFunarg({
name: start.value,
start: start,
end: start,
});
next();
remove `AST_ArrowParametersOrSeq` (#1997)
2017-05-24 09:45:18 +00:00
return arrow_function(start, [param]);
Do not allow arrow functions in the middle of an expression
2016-10-28 18:42:28 +00:00
}
=> with destructuring arguments. Requires a lot of parser changes
2015-08-03 23:14:18 +00:00
var left = maybe_conditional(no_in);
var val = S.token.value;
Adding arrow functions
2015-01-11 20:07:19 +00:00
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
if (is("operator") && ASSIGNMENT(val)) {
Merge branch 'master' into harmony-v2.8.15
2017-03-23 07:11:16 +00:00
if (is_assignable(left) || (left = to_destructuring(left)) instanceof AST_Destructuring) {
init repo
2012-05-27 11:09:01 +00:00
next();
return new AST_Assign({
WIP
2012-05-27 14:25:31 +00:00
start : start,
init repo
2012-05-27 11:09:01 +00:00
left : left,
stealing more hacks from acorn in the name of speed
2012-10-11 10:00:58 +00:00
operator : val,
WIP
2012-05-27 14:25:31 +00:00
right : maybe_assign(no_in),
Fix end token for Assign nodes
2013-01-26 12:24:54 +00:00
end : prev()
init repo
2012-05-27 11:09:01 +00:00
});
}
improve error messages (#1506) - better inheritance of `Error` sub-classes - mark parse error against source in CLI closes #235 closes #348 closes #524 closes #1356 closes #1405
2017-02-26 19:40:54 +00:00
croak("Invalid assignment");
init repo
2012-05-27 11:09:01 +00:00
}
return left;
WIP
2012-05-27 14:25:31 +00:00
};
init repo
2012-05-27 11:09:01 +00:00
WIP
2012-05-27 14:25:31 +00:00
var expression = function(commas, no_in) {
var start = S.token;
convert `AST_Seq` from binary tree to array (#1460) - rename `AST_Seq` to `AST_Sequence` - raise default sequences_limit from 200 to 800
2017-04-12 13:56:27 +00:00
var exprs = [];
while (true) {
exprs.push(maybe_assign(no_in));
if (!commas || !is("punc", ",")) break;
init repo
2012-05-27 11:09:01 +00:00
next();
convert `AST_Seq` from binary tree to array (#1460) - rename `AST_Seq` to `AST_Sequence` - raise default sequences_limit from 200 to 800
2017-04-12 13:56:27 +00:00
commas = true;
init repo
2012-05-27 11:09:01 +00:00
}
remove `AST_ArrowParametersOrSeq` (#1997)
2017-05-24 09:45:18 +00:00
return exprs.length == 1 ? exprs[0] : new AST_Sequence({
convert `AST_Seq` from binary tree to array (#1460) - rename `AST_Seq` to `AST_Sequence` - raise default sequences_limit from 200 to 800
2017-04-12 13:56:27 +00:00
start : start,
expressions : exprs,
end : peek()
});
WIP
2012-05-27 14:25:31 +00:00
};
init repo
2012-05-27 11:09:01 +00:00
function in_loop(cont) {
++S.in_loop;
var ret = cont();
--S.in_loop;
return ret;
};
Add `--expr`, an option to parse a single expression (suitable for JSON)
2013-05-15 10:27:23 +00:00
if (options.expression) {
return expression(true);
}
better support for multiple input files: - use a single AST_Toplevel node for all files - keep original source filename in the tokens
2012-09-21 11:19:05 +00:00
return (function(){
var start = S.token;
var body = [];
Throw errors in strict mode for octal strings Adds a directive tracker for the parser/tokenizer to allow parsing depending on directive context.
2016-05-20 08:25:35 +00:00
S.input.push_directives_stack();
better support for multiple input files: - use a single AST_Toplevel node for all files - keep original source filename in the tokens
2012-09-21 11:19:05 +00:00
while (!is("eof"))
body.push(statement());
Throw errors in strict mode for octal strings Adds a directive tracker for the parser/tokenizer to allow parsing depending on directive context.
2016-05-20 08:25:35 +00:00
S.input.pop_directives_stack();
better support for multiple input files: - use a single AST_Toplevel node for all files - keep original source filename in the tokens
2012-09-21 11:19:05 +00:00
var end = prev();
var toplevel = options.toplevel;
if (toplevel) {
toplevel.body = toplevel.body.concat(body);
toplevel.end = end;
} else {
toplevel = new AST_Toplevel({ start: start, body: body, end: end });
}
return toplevel;
})();
init repo
2012-05-27 11:09:01 +00:00
};
Reference in New Issue Copy Permalink