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

fix export default of anonymous generators and async functions (#2607)

Browse Source 
fixes #2606
This commit is contained in:
kzc
2017-12-17 11:11:52 -05:00
committed by Alex Lam S.L
parent f8ff349ba7
commit 80c8dfcde6
2 changed files with 196 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/parse.js
View File

@@ -982,7 +982,7 @@ function parse($TEXT, options) {
}
};
var statement = embed_tokens(function() {
var statement = embed_tokens(function(is_export_default) {
handle_regexp();
switch (S.token.type) {
case "string":
@@ -1011,7 +1011,7 @@ function parse($TEXT, options) {
if (S.token.value == "async" && is_token(peek(), "keyword", "function")) {
next();
next();
return function_(AST_Defun, false, true);
return function_(AST_Defun, false, true, is_export_default);
}
if (S.token.value == "import" && !is_token(peek(), "punc", "(")) {
next();
@@ -1085,7 +1085,7 @@ function parse($TEXT, options) {
case "function":
next();
return function_(AST_Defun);
return function_(AST_Defun, false, false, is_export_default);
case "if":
next();
@@ -1308,9 +1308,9 @@ function parse($TEXT, options) {
});
};
var function_ = function(ctor, is_generator_property, is_async) {
var function_ = function(ctor, is_generator_property, is_async, is_export_default) {
if (is_generator_property && is_async) croak("generators cannot be async");
var start = S.token
var start = S.token;
var in_statement = ctor === AST_Defun;
var is_generator = is("operator", "*");
@@ -1319,8 +1319,13 @@ function parse($TEXT, options) {
}
var name = is("name") ? as_symbol(in_statement ? AST_SymbolDefun : AST_SymbolLambda) : null;
if (in_statement && !name)
unexpected();
if (in_statement && !name) {
if (is_export_default) {
ctor = AST_Function;
} else {
unexpected();
}
}
if (name && ctor !== AST_Accessor && !(name instanceof AST_SymbolDeclaration))
unexpected(prev());
@@ -2528,9 +2533,9 @@ function parse($TEXT, options) {
&& is_token(peek(), "punc")) {
exported_value = expression(false);
semicolon();
} else if ((node = statement()) instanceof AST_Definitions && is_default) {
} else if ((node = statement(is_default)) instanceof AST_Definitions && is_default) {
unexpected(node.start);
} else if (node instanceof AST_Definitions || node instanceof AST_Defun || node instanceof AST_DefClass) {
} else if (node instanceof AST_Definitions || node instanceof AST_Lambda || node instanceof AST_DefClass) {
exported_definition = node;
} else if (node instanceof AST_SimpleStatement) {
exported_value = node.body;