JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forbid block-scoped AST_Defun in strict mode (#2718)

Browse Source
This commit is contained in:
Alex Lam S.L
2018-01-04 18:45:51 +08:00
committed by GitHub
parent 7a6d452b54
commit a6873a3859
5 changed files with 79 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/compress.js
View File

@@ -1746,7 +1746,7 @@ merge(Compressor.prototype, {
target.push(node);
return true;
}
if (node instanceof AST_Defun && (node === stat || !compressor.has_directive("use strict"))) {
if (node instanceof AST_Defun) {
target.push(node);
return true;
}

15
lib/parse.js
View File

@@ -800,7 +800,7 @@ function parse($TEXT, options) {
function embed_tokens(parser) {
return function() {
var start = S.token;
var expr = parser();
var expr = parser.apply(null, arguments);
var end = prev();
expr.start = start;
expr.end = end;
@@ -815,7 +815,7 @@ function parse($TEXT, options) {
}
};
var statement = embed_tokens(function() {
var statement = embed_tokens(function(strict_defun) {
handle_regexp();
switch (S.token.type) {
case "string":
@@ -901,6 +901,9 @@ function parse($TEXT, options) {
return for_();
case "function":
if (!strict_defun && S.input.has_directive("use strict")) {
croak("In strict mode code, functions can only be declared at top level or immediately within another function.");
}
next();
return function_(AST_Defun);
@@ -1083,7 +1086,7 @@ function parse($TEXT, options) {
S.input.push_directives_stack();
S.in_loop = 0;
S.labels = [];
var body = block_();
var body = block_(true);
if (S.input.has_directive("use strict")) {
if (name) strict_verify_symbol(name);
argnames.forEach(strict_verify_symbol);
@@ -1112,12 +1115,12 @@ function parse($TEXT, options) {
});
};
function block_() {
function block_(strict_defun) {
expect("{");
var a = [];
while (!is("punc", "}")) {
if (is("eof")) unexpected();
a.push(statement());
a.push(statement(strict_defun));
}
next();
return a;
@@ -1630,7 +1633,7 @@ function parse($TEXT, options) {
var body = [];
S.input.push_directives_stack();
while (!is("eof"))
body.push(statement());
body.push(statement(true));
S.input.pop_directives_stack();
var end = prev();
var toplevel = options.toplevel;