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

Reverting "minor perf. improvements"

Browse Source 
Revert "minor perf. improvements"

This reverts commit 24bfd55a22.

broke the parser somehow; too early to optimize, let's get the other stuff running.
This commit is contained in:
Mihai Bazon
2012-09-03 10:26:23 +03:00
parent 596af60587
commit 1bf5928b54
2 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/parse.js
View File

@@ -748,7 +748,7 @@ function parse($TEXT, exigent_mode) {
function parenthesised() {
expect("(");
var exp = expression(true);
var exp = expression();
expect(")");
return exp;
};
@@ -756,7 +756,7 @@ function parse($TEXT, exigent_mode) {
function embed_tokens(parser) {
return function() {
var start = S.token;
var expr = parser();
var expr = parser.apply(this, arguments);
var end = prev();
expr.start = start;
expr.end = end;
@@ -933,9 +933,9 @@ function parse($TEXT, exigent_mode) {
function regular_for(init) {
expect(";");
var test = is("punc", ";") ? null : expression(true);
var test = is("punc", ";") ? null : expression();
expect(";");
var step = is("punc", ")") ? null : expression(true);
var step = is("punc", ")") ? null : expression();
expect(")");
return new AST_For({
init : init,
@@ -947,7 +947,7 @@ function parse($TEXT, exigent_mode) {
function for_in(init) {
var lhs = init instanceof AST_Var ? init.definitions[0].name : null;
var obj = expression(true);
var obj = expression();
expect(")");
return new AST_ForIn({
init : init,
@@ -957,20 +957,6 @@ function parse($TEXT, exigent_mode) {
});
};
var function_body = embed_tokens(function(){
++S.in_function;
var loop = S.in_loop;
var labels = S.labels;
S.in_directives = true;
S.in_loop = 0;
S.labels = [];
var a = block_(true);
--S.in_function;
S.in_loop = loop;
S.labels = labels;
return a;
});
var function_ = function(in_statement) {
var name = is("name") ? as_symbol(in_statement
? AST_SymbolDefun
@@ -989,7 +975,19 @@ function parse($TEXT, exigent_mode) {
next();
return a;
})(true, []),
body: function_body()
body: embed_tokens(function(){
++S.in_function;
var loop = S.in_loop;
var labels = S.labels;
S.in_directives = true;
S.in_loop = 0;
S.labels = [];
var a = block_(true);
--S.in_function;
S.in_loop = loop;
S.labels = labels;
return a;
})()
});
};
@@ -1034,7 +1032,7 @@ function parse($TEXT, exigent_mode) {
cur = [];
branch = new AST_Case({
start : prog1(S.token, next),
expression : expression(true),
expression : expression(),
body : cur
});
a.push(branch);
@@ -1189,7 +1187,7 @@ function parse($TEXT, exigent_mode) {
switch (start.value) {
case "(":
next();
var ex = expression(true);
var ex = expression();
ex.start = start;
ex.end = S.token;
expect(")");
@@ -1333,7 +1331,7 @@ function parse($TEXT, exigent_mode) {
}
if (is("punc", "[")) {
next();
var prop = expression(true);
var prop = expression();
expect("]");
return subscripts(new AST_Sub({
start : start,
@@ -1453,6 +1451,8 @@ function parse($TEXT, exigent_mode) {
};
var expression = function(commas, no_in) {
if (arguments.length == 0)
commas = true;
var start = S.token;
var expr = maybe_assign(no_in);
if (commas && is("punc", ",")) {

13
lib/utils.js
View File

@@ -46,12 +46,11 @@ function curry(f) {
return function() { return f.apply(this, args.concat(slice(arguments))); };
};
function prog1(ret, f1, f2, f3) {
function prog1(ret) {
if (ret instanceof Function)
ret = ret();
if (f1) f1();
if (f2) f2();
if (f3) f3();
for (var i = 1, n = arguments.length; --n > 0; ++i)
arguments[i]();
return ret;
};
@@ -170,9 +169,3 @@ function string_template(text, props) {
return props[p];
});
};
function time_it(name, cont) {
var t1 = new Date().getTime();
try { return cont(); }
finally { sys.debug("// " + name + ": " + ((new Date().getTime() - t1) / 1000).toFixed(3) + " sec."); }
};