diff options
author | David Glasser <glasser@davidglasser.net> | 2013-01-16 14:59:19 -0500 |
---|---|---|
committer | Mihai Bazon <mihai@bazon.net> | 2013-01-17 11:36:10 +0200 |
commit | 1529ab965a4a434e6024977a53f8460f6a474086 (patch) | |
tree | c9bd418871d6e8352d0edfa1fd952a2be0802375 | |
parent | 605f330e6949ca699a8770a9dd7d80bbacc6a175 (diff) | |
download | tracifyjs-1529ab965a4a434e6024977a53f8460f6a474086.tar.gz tracifyjs-1529ab965a4a434e6024977a53f8460f6a474086.zip |
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.
-rw-r--r-- | lib/ast.js | 5 | ||||
-rw-r--r-- | lib/output.js | 6 | ||||
-rw-r--r-- | lib/parse.js | 2 | ||||
-rw-r--r-- | test/compress/arrays.js | 12 |
4 files changed, 22 insertions, 3 deletions
@@ -863,6 +863,11 @@ var AST_Undefined = DEFNODE("Undefined", null, { value: (function(){}()) }, AST_Atom); +var AST_Hole = DEFNODE("Hole", null, { + $documentation: "A hole in an array", + value: (function(){}()) +}, AST_Atom); + var AST_Infinity = DEFNODE("Infinity", null, { $documentation: "The `Infinity` value", value: 1/0 diff --git a/lib/output.js b/lib/output.js index 464a4593..5da27e7d 100644 --- a/lib/output.js +++ b/lib/output.js @@ -984,8 +984,7 @@ function OutputStream(options) { if (len > 0) output.space(); a.forEach(function(exp, i){ if (i) output.comma(); - if (!(exp instanceof AST_Undefined)) - exp.print(output); + exp.print(output); }); if (len > 0) output.space(); }); @@ -1036,6 +1035,9 @@ function OutputStream(options) { DEFPRINT(AST_Undefined, function(self, output){ output.print("void 0"); }); + DEFPRINT(AST_Hole, function(self, output){ + output.print(""); + }); DEFPRINT(AST_Infinity, function(self, output){ output.print("1/0"); }); diff --git a/lib/parse.js b/lib/parse.js index 5b6820ff..01fbb88f 100644 --- a/lib/parse.js +++ b/lib/parse.js @@ -1131,7 +1131,7 @@ function parse($TEXT, options) { if (first) first = false; else expect(","); if (allow_trailing_comma && is("punc", closing)) break; if (is("punc", ",") && allow_empty) { - a.push(new AST_Undefined({ start: S.token, end: S.token })); + a.push(new AST_Hole({ start: S.token, end: S.token })); } else { a.push(expression(false)); } diff --git a/test/compress/arrays.js b/test/compress/arrays.js new file mode 100644 index 00000000..10fe6eb5 --- /dev/null +++ b/test/compress/arrays.js @@ -0,0 +1,12 @@ +holes_and_undefined: { + input: { + x = [1, 2, undefined]; + y = [1, , 2, ]; + z = [1, undefined, 3]; + } + expect: { + x=[1,2,void 0]; + y=[1,,2]; + z=[1,void 0,3]; + } +} |