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

Merge branch 'master' into harmony-v2.8.10

Browse Source
This commit is contained in:
alexlamsl
2017-03-09 06:02:28 +08:00
parent 952e2656eb e9920f7ca1
commit 8f4b45f4f8
12 changed files with 201 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/output.js
View File

@@ -882,16 +882,14 @@ function OutputStream(options) {
DEFPRINT(AST_Do, function(self, output){
output.print("do");
output.space();
self._do_print_body(output);
make_block(self.body, output);
output.space();
output.print("while");
output.space();
output.with_parens(function(){
self.condition.print(output);
});
if (output.option("beautify") && output.option("screw_ie8")) {
output.semicolon();
}
output.semicolon();
});
DEFPRINT(AST_While, function(self, output){
output.print("while");
@@ -1085,10 +1083,10 @@ function OutputStream(options) {
/* -----[ if ]----- */
function make_then(self, output) {
if (output.option("bracketize")) {
make_block(self.body, output);
return;
}
var b = self.body;
if (output.option("bracketize")
|| !output.option("screw_ie8") && b instanceof AST_Do)
return make_block(b, output);
// The squeezer replaces "block"-s that contain only a single
// statement with the statement itself; technically, the AST
// is correct, but this can create problems when we output an
@@ -1096,9 +1094,7 @@ function OutputStream(options) {
// IF *without* an ELSE block (then the outer ELSE would refer
// to the inner IF). This function checks for this case and
// adds the block brackets if needed.
if (!self.body)
return output.force_semicolon();
var b = self.body;
if (!b) return output.force_semicolon();
while (true) {
if (b instanceof AST_If) {
if (!b.alternative) {
@@ -1668,15 +1664,7 @@ function OutputStream(options) {
function force_statement(stat, output) {
if (output.option("bracketize")) {
if (!stat || stat instanceof AST_EmptyStatement)
output.print("{}");
else if (stat instanceof AST_BlockStatement)
stat.print(output);
else output.with_block(function(){
output.indent();
stat.print(output);
output.newline();
});
make_block(stat, output);
} else {
if (!stat || stat instanceof AST_EmptyStatement)
output.force_semicolon();
@@ -1725,11 +1713,11 @@ function OutputStream(options) {
};
function make_block(stmt, output) {
if (stmt instanceof AST_BlockStatement) {
if (!stmt || stmt instanceof AST_EmptyStatement)
output.print("{}");
else if (stmt instanceof AST_BlockStatement)
stmt.print(output);
return;
}
output.with_block(function(){
else output.with_block(function(){
output.indent();
stmt.print(output);
output.newline();