From 28cab37207a0fb91c5b697c1a8dd73727d850f12 Mon Sep 17 00:00:00 2001 From: alan Date: Mon, 19 Apr 2010 13:15:28 +0800 Subject: [PATCH] JSDOC/CompressWhite.js --- JSDOC/CompressWhite.js | 45 +++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/JSDOC/CompressWhite.js b/JSDOC/CompressWhite.js index fd72cd2..e8331bb 100644 --- a/JSDOC/CompressWhite.js +++ b/JSDOC/CompressWhite.js @@ -123,11 +123,11 @@ CompressWhite = function (ts, packer) - switch(tok.tokN) { + switch(tok.data.toUpperCase()) { // things that need space appending - case Script.TOKfunction: - case Script.TOKbreak: - case Script.TOKcontinue: + case "FUNCTION": + case "BREAK": + case "CONTINUE": // if next item is a identifier.. if (ts.look(1).isTypeN(Script.TOKidentifier) || ts.look(1).data.match(/^[a-z]+$/i) ) { // as include is a keyword for us!! tok.outData = tok.data + " "; @@ -135,7 +135,7 @@ CompressWhite = function (ts, packer) continue; - case Script.TOKreturn: // if next item is not a semi; (or } + case "RETURN": // if next item is not a semi; (or } if (ts.look(1).data == ';' || ts.look(1).data == '}') { continue; } @@ -144,7 +144,7 @@ CompressWhite = function (ts, packer) continue; - case Script.TOKelse: // if next item is not a semi; (or } + case "ELSE": // if next item is not a semi; (or } if (!ts.look(1).isTypeN(Script.TOKif)) { continue; } @@ -152,8 +152,8 @@ CompressWhite = function (ts, packer) tok.outData = tok.data + " "; continue; - case Script.TOKplusplus: // if previous was a plus or next is a + add a space.. - case Script.TOKminusminus: // if previous was a - or next is a - add a space.. + case "++": // if previous was a plus or next is a + add a space.. + case "--": // if previous was a - or next is a - add a space.. var p = (Script.TOKminusminus == tok.tokN ? '-' : '+'); @@ -166,24 +166,29 @@ CompressWhite = function (ts, packer) } continue; - case Script.TOKin: // before and after?? - case Script.TOKinstanceof: + case "IN": // before and after?? + case "INSTANCEOF": tok.outData = " " + tok.data + " "; continue; - case Script.TOKvar: // always after.. - case Script.TOKnew: - case Script.TOKdelete: - case Script.TOKthrow: - case Script.TOKnew: - case Script.TOKcase: - case Script.TOKtypeof: - case Script.TOKvoid: + case "VAR": // always after.. + case "NEW": + case "DELETE": + case "THROW": + case "CASE": + + case "VOID": tok.outData = tok.data + " "; continue - case Script.TOKsemicolon: + + case "TYPEOF": // what about typeof( + if (ts.lookTok(1).data != '(') { + tok.outData = tok.data + " "; + } + continue; + case ";" //remove semicolon before brace -- //if(ts.look(1).isTypeN(Script.TOKrbrace)) { // tok.outData = ''; @@ -197,7 +202,7 @@ CompressWhite = function (ts, packer) ts.rewind(); - + // NOW OUTPUT THE THING. //var f = new File(minfile, File.NEW); var out = ''; -- 2.39.2