From feffa6e03d0e162de955b3bee6a1e92a6af0ee0e Mon Sep 17 00:00:00 2001 From: alan Date: Mon, 19 Apr 2010 13:01:01 +0800 Subject: [PATCH] JSDOC/CompressWhite.js --- JSDOC/CompressWhite.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/JSDOC/CompressWhite.js b/JSDOC/CompressWhite.js index eba5957..7f16282 100644 --- a/JSDOC/CompressWhite.js +++ b/JSDOC/CompressWhite.js @@ -38,18 +38,18 @@ CompressWhite = function (ts, packer) //var tokident = ts.look(-1).data + tok.data + ts.look(1).data + ts.look(2).data; // a = new function() {} if (ts.lookTok(1).data == '=' && ts.lookTok(2).name == 'NEW' && - ts.look(3).name == 'FUNCTION') { + ts.lookTok(3).name == 'FUNCTION') { // freeze time.. var cu = ts.cursor; - ts.balance("lparen"); + ts.balance("("); - ts.balance("lbrace"); + ts.balance("{"); // if next is not ';' -> make it so... - if (!ts.look(1).isTypeN(Script.TOKsemicolon) && !ts.look(1).isTypeN(Script.TOKrbrace) && ts.look(1,true).isLineBreak()) { - ts.cur().outData = ts.cur().data +";"; + if (ts.lookTok(1).data != ';' && ts.lookTok(1).data != '}' && ts.lookTok(1,true).name = ="NEW_LINE") { + ts.look(0).outData = ts.cur().data +";"; } // restore.. ts.cursor = cu; @@ -57,16 +57,16 @@ CompressWhite = function (ts, packer) } // a = function() { ... - if (ts.look(1).isTypeN(Script.TOKassign) && ts.look(2).isTypeN(Script.TOKfunction)) { + if (ts.lookTok(1).data == '=' && ts.lookTok(2).name == "FUNCTION") { // freeze time.. //println("got = function() "); var cu = ts.cursor; - ts.balance("lparen"); - ts.balance("lbrace"); + ts.balance("("); + ts.balance("{"); // if next is not ';' -> make it so... // although this var a=function(){},v,c; causes - if (!ts.look(1).isData(';') && !ts.look(1).isData('}') && ts.look(1,true).isLineBreak()) { + if (!ts.lookTok(1).isData(';') && !ts.lookTok(1).isData('}') && ts.lookTok(1,true).isLineBreak()) { ts.cur().outData = ts.cur().data+";"; } // restore.. @@ -95,12 +95,12 @@ CompressWhite = function (ts, packer) // a = { .... - if (ts.look(1).isTypeN(Script.TOKassign) && ts.look(2).isTypeN(Script.TOKlbrace)) { + if (ts.look(1).data == '=' && ts.look(2).isTypeN(Script.TOKlbrace)) { // freeze time.. //println("----------*** 3 *** --------------"); var cu = ts.cursor; - if (!ts.balance("lbrace") ){ + if (!ts.balance("{") ){ throw "could not find end lbrace!!!"; } // if next is not ';' -> make it so... -- 2.39.2