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

Merge pull request #896 from avdg/do-while-semicolon

Browse Source 
Semicolon after do...while statement is optional
This commit is contained in:
Richard van Velzen 2015-12-26 14:26:22 +01:00
commit ac810dc07a
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/parse.js
View File

@ -724,9 +724,9 @@ function parse($TEXT, options) {
); );
}; };
function semicolon() { function semicolon(optional) {
if (is("punc", ";")) next(); if (is("punc", ";")) next();
else if (!can_insert_semicolon()) unexpected(); else if (!optional && !can_insert_semicolon()) unexpected();
}; };
function parenthesised() { function parenthesised() {
@ -814,7 +814,7 @@ function parse($TEXT, options) {
case "do": case "do":
return new AST_Do({ return new AST_Do({
body : in_loop(statement), body : in_loop(statement),
condition : (expect_token("keyword", "while"), tmp = parenthesised(), semicolon(), tmp) condition : (expect_token("keyword", "while"), tmp = parenthesised(), semicolon(true), tmp)
}); });
case "while": case "while":

24
test/compress/loops.js
View File

@ -121,3 +121,27 @@ drop_if_else_break_4: {
for (; bar() && (x(), y(), foo());) baz(), z(), k(); for (; bar() && (x(), y(), foo());) baz(), z(), k();
} }
} }
parse_do_while_with_semicolon: {
options = { loops: false };
input: {
do {
x();
} while (false);y()
}
expect: {
do x(); while (false);y();
}
}
parse_do_while_without_semicolon: {
options = { loops: false };
input: {
do {
x();
} while (false)y()
}
expect: {
do x(); while (false);y();
}
}