Compare commits

...

5 Commits

Author SHA1 Message Date
Mihai Bazon
6f9d051784 v2.4.11 2014-01-21 11:44:28 +02:00
Mihai Bazon
931862e97f More chars that cannot be unescaped in regexps. 2014-01-21 11:44:00 +02:00
Mihai Bazon
1d0127de21 Fix end token for conditionals. Close #404 2014-01-21 10:38:59 +02:00
Mihai Bazon
2d8fc61677 Merge pull request #402 from lautis/bom-regexps
Don't unescape byte order marks in regexps
2014-01-19 06:14:12 -08:00
Ville Lautanala
1e31011874 Don't unescape byte order marks in regexps 2014-01-19 12:27:03 +02:00
3 changed files with 31 additions and 3 deletions

View File

@@ -1118,6 +1118,34 @@ function OutputStream(options) {
DEFPRINT(AST_Number, function(self, output){
output.print(make_num(self.getValue()));
});
function regexp_safe_literal(code) {
return [
0x5c , // \
0x2f , // /
0x2e , // .
0x2b , // +
0x2a , // *
0x3f , // ?
0x28 , // (
0x29 , // )
0x5b , // [
0x5d , // ]
0x7b , // {
0x7d , // }
0x24 , // $
0x5e , // ^
0x3a , // :
0x7c , // |
0x21 , // !
0x0a , // \n
0x0d , // \r
0xfeff , // Unicode BOM
0x2028 , // unicode "line separator"
0x2029 , // unicode "paragraph separator"
].indexOf(code) < 0;
};
DEFPRINT(AST_RegExp, function(self, output){
var str = self.getValue().toString();
if (output.option("ascii_only")) {
@@ -1126,7 +1154,7 @@ function OutputStream(options) {
str = str.split("\\\\").map(function(str){
return str.replace(/\\u[0-9a-fA-F]{4}|\\x[0-9a-fA-F]{2}/g, function(s){
var code = parseInt(s.substr(2), 16);
return code == 0x2f || code == 10 || code == 13 || code == 0x2028 || code == 0x2029 ? s : String.fromCharCode(code);
return regexp_safe_literal(code) ? String.fromCharCode(code) : s;
});
}).join("\\\\");
}

View File

@@ -1381,7 +1381,7 @@ function parse($TEXT, options) {
condition : expr,
consequent : yes,
alternative : expression(false, no_in),
end : peek()
end : prev()
});
}
return expr;

View File

@@ -3,7 +3,7 @@
"description": "JavaScript parser, mangler/compressor and beautifier toolkit",
"homepage": "http://lisperator.net/uglifyjs",
"main": "tools/node.js",
"version": "2.4.10",
"version": "2.4.11",
"engines": { "node" : ">=0.4.0" },
"maintainers": [{
"name": "Mihai Bazon",