X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FCompressWhite.js;h=44672973e96f497fed81fb05efffb476954af67a;hb=44008f066c87b98a85a3e9d7ce2281105ff365ab;hp=0774741d74bb1cda854e938fecc0963e9dfaa6e9;hpb=cb32c58a86b667590e538fef682d5994ef6affd0;p=gnome.introspection-doc-generator diff --git a/JSDOC/CompressWhite.js b/JSDOC/CompressWhite.js index 0774741..4467297 100644 --- a/JSDOC/CompressWhite.js +++ b/JSDOC/CompressWhite.js @@ -71,13 +71,37 @@ 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).data != ';' && ts.lookTok(1).data != '}' && ts.lookTok(1,true).name == "NEWLINE") { + 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; @@ -139,8 +163,7 @@ CompressWhite = function (ts, packer) throw "could not find end lbrace!!!"; } // if next is not ';' -> make it so... - print(ts.lookTok(1).toString()); - print(ts.lookTok(1,true).toString()); + if (ts.lookTok(1).data != ';' && ts.lookTok(1).data != '}' && ts.look(1,true).name=="NEWLINE") { ts.look(0).outData = ts.look(0).data +";"; } @@ -151,31 +174,7 @@ CompressWhite = function (ts, packer) // any more?? // a = function(....) { } - // print(ts.lookTok(2).toString()); - if (ts.lookTok(1).data == '=' && ts.lookTok(2).name == 'FUNCTION' ) { - // freeze time.. - //println("----------*** 3 *** --------------"); - var cu = ts.cursor; - ts.balance("("); - - 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... - print(ts.lookTok(1).toString()); - print(ts.lookTok(1,true).toString()); - 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; - continue; - } - + }