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

Fix output for "use asm" code from SpiderMonkey AST

Browse Source 
(will only work properly if the SM tree contains "raw" properties for
Literal number nodes)
This commit is contained in:
Mihai Bazon
2015-11-12 12:18:25 +02:00
parent c898a26117
commit 08623aa6a7
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ast.js
View File

@@ -85,7 +85,7 @@ function DEFNODE(type, props, methods, base) {
return ctor; return ctor;
}; };
var AST_Token = DEFNODE("Token", "type value line col pos endline endcol endpos nlb comments_before file literal", { var AST_Token = DEFNODE("Token", "type value line col pos endline endcol endpos nlb comments_before file raw", {
}, null); }, null);
var AST_Node = DEFNODE("Node", "start end", { var AST_Node = DEFNODE("Node", "start end", {

18
lib/mozilla-ast.js
View File

@@ -363,13 +363,15 @@
prefix: true, prefix: true,
argument: { argument: {
type: "Literal", type: "Literal",
value: -value value: -value,
raw: M.start.raw
} }
}; };
} }
return { return {
type: "Literal", type: "Literal",
value: value value: value,
raw: M.start.raw
}; };
}); });
@@ -389,6 +391,12 @@
/* -----[ tools ]----- */ /* -----[ tools ]----- */
function raw_token(moznode) {
if (moznode.type == "Literal") {
return moznode.raw != null ? moznode.raw : moznode.value + "";
}
}
function my_start_token(moznode) { function my_start_token(moznode) {
var loc = moznode.loc, start = loc && loc.start; var loc = moznode.loc, start = loc && loc.start;
var range = moznode.range; var range = moznode.range;
@@ -399,7 +407,8 @@
pos : range ? range[0] : moznode.start, pos : range ? range[0] : moznode.start,
endline : start && start.line, endline : start && start.line,
endcol : start && start.column, endcol : start && start.column,
endpos : range ? range[0] : moznode.start endpos : range ? range[0] : moznode.start,
raw : raw_token(moznode),
}); });
}; };
@@ -413,7 +422,8 @@
pos : range ? range[1] : moznode.end, pos : range ? range[1] : moznode.end,
endline : end && end.line, endline : end && end.line,
endcol : end && end.column, endcol : end && end.column,
endpos : range ? range[1] : moznode.end endpos : range ? range[1] : moznode.end,
raw : raw_token(moznode),
}); });
}; };

4
lib/output.js
View File

@@ -1178,8 +1178,8 @@ function OutputStream(options) {
output.print_string(self.getValue(), self.quote); output.print_string(self.getValue(), self.quote);
}); });
DEFPRINT(AST_Number, function(self, output){ DEFPRINT(AST_Number, function(self, output){
if (use_asm) { if (use_asm && self.start.raw != null) {
output.print(self.start.literal); output.print(self.start.raw);
} else { } else {
output.print(make_num(self.getValue())); output.print(make_num(self.getValue()));
} }

2
lib/parse.js
View File

@@ -286,7 +286,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
file : filename file : filename
}; };
if (/^(?:num|string|regexp)$/i.test(type)) { if (/^(?:num|string|regexp)$/i.test(type)) {
ret.literal = $TEXT.substring(ret.pos, ret.endpos); ret.raw = $TEXT.substring(ret.pos, ret.endpos);
} }
if (!is_comment) { if (!is_comment) {
ret.comments_before = S.comments_before; ret.comments_before = S.comments_before;