X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FCompressWhite.js;h=13d6df7d2ffb93c497dcbad5cc57e86ee2abeac4;hp=7f16282face91e585def2eae0011d49112583daa;hb=6534df3589197eabe11704e9f7a18cff965898f2;hpb=feffa6e03d0e162de955b3bee6a1e92a6af0ee0e diff --git a/JSDOC/CompressWhite.js b/JSDOC/CompressWhite.js index 7f16282..13d6df7 100644 --- a/JSDOC/CompressWhite.js +++ b/JSDOC/CompressWhite.js @@ -8,9 +8,9 @@ @arg packer {Packer} */ -CompressWhite = function (ts, packer) +CompressWhite = function (ts, packer, keepWhite) { - + keepWhite = keepWhite || false; ts.rewind(); //var str = File.read(fn); var rep_var = 1; @@ -21,6 +21,7 @@ CompressWhite = function (ts, packer) break; } if (tok.type == "WHIT") { + continue; //if (tok._isDoc) { // continue; @@ -32,9 +33,18 @@ CompressWhite = function (ts, packer) } - + if (tok.data == "}") { + + if (ts.lookTok(1).type == 'NAME' && ts.look(1,true).name == "NEWLINE") { + + ts.look(0).outData = ts.look(0).data+"\n"; + } + // restore.. + + continue; + } // add semi-colon's where linebreaks are used... - not foolproof yet.! - if (tok.type == "NAME")) { + if (tok.type == "NAME") { //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' && @@ -48,7 +58,7 @@ CompressWhite = function (ts, packer) ts.balance("{"); // if next is not ';' -> make it so... - if (ts.lookTok(1).data != ';' && ts.lookTok(1).data != '}' && ts.lookTok(1,true).name = ="NEW_LINE") { + if (ts.lookTok(1).data != ';' && ts.lookTok(1).data != '}' && ts.lookTok(1,true).name == "NEWLINE") { ts.look(0).outData = ts.cur().data +";"; } // restore.. @@ -62,17 +72,63 @@ CompressWhite = function (ts, packer) //println("got = function() "); var cu = ts.cursor; - ts.balance("("); - ts.balance("{"); + if (!ts.balance("(") ){ + ts.dump(cu-40, cu); + print(">>>>>>>>>>>>>>>>>HERE>>>>>>>>>>>>"); + ts.dump(cu, cu+40); + + throw "could not find end lbrace!!!"; + } + //print("AFTER BALANCE ("); + //ts.dump(cu, ts.cursor); + //ts.cursor--; // cursor at the ( + if (!ts.balance("{") ){ + ts.dump(cu-40, cu); + print(">>>>>>>>>>>>>>>>>HERE>>>>>>>>>>>>"); + ts.dump(cu, cu+40); + + throw "could not find end lbrace!!!"; + } + //print('FN: '+ts.tokens[cu].toString()); + //print('F1: '+ts.lookTok(1).toString()); + //print('F2: '+ts.look(1,true).toString()); + // if next is not ';' -> make it so... // although this var a=function(){},v,c; causes - if (!ts.lookTok(1).isData(';') && !ts.lookTok(1).isData('}') && ts.lookTok(1,true).isLineBreak()) { - ts.cur().outData = ts.cur().data+";"; + if (ts.lookTok(1).data != ';' && ts.lookTok(1).data != '}' && ts.look(1,true).name == "NEWLINE") { + + ts.look(0).outData = ts.look(0).data+";"; + // print("ADDING SEMI: " + ts.look(0).toString()); + //ts.dump(cu, ts.cursor+2); } + + //ts.dump(cu, ts.cursor+2); // restore.. ts.cursor = cu; continue; } + // next item is a name.. + if ((ts.lookTok(1).type == 'NAME' || ts.lookTok(1).type == 'KEYW' ) && ts.look(1,true).name == "NEWLINE") { + // preserve linebraek + ts.look(0).outData = ts.look(0).data+"\n"; + } + // method call followed by name.. + if (ts.lookTok(1).data == "(") { + var cu = ts.cursor; + + ts.balance("("); + // although this var a=function(){},v,c; causes + + if (ts.lookTok(1).type == 'NAME' && ts.look(1,true).name == "NEWLINE") { + + ts.look(0).outData = ts.look(0).data+"\n"; + } + // restore.. + ts.cursor = cu; + continue; + } + + // function a () { ... }; /* if (ts.look(-1).isTypeN(Script.TOKfunction) && ts.look(1).isTypeN(Script.TOKlparen)) { @@ -95,18 +151,22 @@ CompressWhite = function (ts, packer) // a = { .... - if (ts.look(1).data == '=' && ts.look(2).isTypeN(Script.TOKlbrace)) { + if (ts.lookTok(1).data == '=' && ts.lookTok(2).data == '{') { // freeze time.. //println("----------*** 3 *** --------------"); var cu = ts.cursor; if (!ts.balance("{") ){ + ts.dump(cu-40, cu); + print(">>>>>>>>>>>>>>>>>HERE>>>>>>>>>>>>"); + ts.dump(cu, cu+40); + throw "could not find end lbrace!!!"; } // if next is not ';' -> make it so... - - if (!ts.look(1).isData(';') && !ts.look(1).isData('}') && ts.look(1,true).isLineBreak()) { - ts.cur().outData = ts.cur().data +";"; + + if (ts.lookTok(1).data != ';' && ts.lookTok(1).data != '}' && ts.look(1,true).name=="NEWLINE") { + ts.look(0).outData = ts.look(0).data +";"; } // restore.. ts.cursor = cu; @@ -114,6 +174,8 @@ CompressWhite = function (ts, packer) } // any more?? + // a = function(....) { } + } @@ -123,20 +185,20 @@ 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!! + if (ts.lookTok(1).type == "NAME" || ts.lookTok(1).data.match(/^[a-z]+$/i) ) { // as include is a keyword for us!! tok.outData = tok.data + " "; } continue; - case Script.TOKreturn: // if next item is not a semi; (or } - if (ts.look(1).isData(';') || ts.look(1).isData('}')) { + case "RETURN": // if next item is not a semi; (or } + if (ts.lookTok(1).data == ';' || ts.lookTok(1).data == '}') { continue; } tok.outData = tok.data + " "; @@ -144,46 +206,51 @@ CompressWhite = function (ts, packer) continue; - case Script.TOKelse: // if next item is not a semi; (or } - if (!ts.look(1).isTypeN(Script.TOKif)) { + case "ELSE": // if next item is not a semi; (or } + if (!ts.lookTok(1).name == "IF") { continue; } 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 ? '-' : '+'); + var p = (tok.data == "--" ? '-' : '+'); - if (ts.look(1).data == p) { + if (ts.lookTok(1).data == p) { tok.outData = tok.data + " "; } - if (ts.look(-1).data == p) { + if (ts.lookTok(-1).data == p) { tok.outData = " " + tok.data; } 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,43 +264,45 @@ CompressWhite = function (ts, packer) ts.rewind(); - + // NOW OUTPUT THE THING. //var f = new File(minfile, File.NEW); var out = ''; var outoff = 0; out.length = ts.slen; // prealloc. out = ''; + var tok; while (true) { - var tok = ts.next(); + + tok = keepWhite ? ts.next() : ts.nextTok(); + if (!tok) { break; } - if (tok._isWS) { - continue; + if (tok.name == "COMM") { + tok.outData == '\n'; } - - if (tok.isTypeN(Script.TOKidentifier) && tok.identifier && tok.identifier.mungedValue.length) { + if (tok.type == "NAME" && tok.identifier && tok.identifier.mungedValue && tok.identifier.mungedValue.length) { //f.write(tok.identifier.mungedValue); - out +=tok.identifier.mungedValue; + out += tok.identifier.mungedValue; continue; } // at this point we can apply a text translation kit... - if (tok.type == 'string') { - if (packer.stringHandler) { + if ((tok.type == 'STRN') && (tok.name== 'DOUBLE_QUOTE')) { + if (packer && packer.stringHandler) { out += packer.stringHandler(tok); continue; } } - //f.write(tok.outData); - out += tok.outData; + + out += tok.outData !== false ? tok.outData : tok.data; if ((tok.outData == ';') && (out.length - outoff > 255)) { outoff = out.length; - out += '\n'; + out += "\n"; } } //f.close();