X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FCompressWhite.js;h=9ff469b0e88b96342a5406365aa80d3c49958d4c;hb=c1024b4b5c81d08f82dfbac13c002d0fd1bff7a6;hp=57713008c43e2c98c01dd48c441542ac326480f3;hpb=ba619fa6a037c9db0cb59e3fd6c48efee7983dd7;p=gnome.introspection-doc-generator diff --git a/JSDOC/CompressWhite.js b/JSDOC/CompressWhite.js index 5771300..9ff469b 100644 --- a/JSDOC/CompressWhite.js +++ b/JSDOC/CompressWhite.js @@ -32,7 +32,16 @@ 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") { //var tokident = ts.look(-1).data + tok.data + ts.look(1).data + ts.look(2).data; @@ -73,11 +82,27 @@ CompressWhite = function (ts, packer) 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") { - // presever linebraek + // 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 () { ... }; /* @@ -107,6 +132,10 @@ CompressWhite = function (ts, packer) var cu = ts.cursor; if (!ts.balance("{") ){ + ts.dump(cu-40, cu+1); + print(">>>>>>>>>>>>>>>>>HERE>>>>>>>>>>>>"); + ts.dump(cu+1, cu+40); + throw "could not find end lbrace!!!"; } // if next is not ';' -> make it so... @@ -217,6 +246,7 @@ CompressWhite = function (ts, packer) out = ''; while (true) { var tok = ts.nextTok(); + if (!tok) { break; } @@ -236,7 +266,7 @@ CompressWhite = function (ts, packer) continue; } } - //f.write(tok.outData); + out += tok.outData !== false ? tok.outData : tok.data; if ((tok.outData == ';') && (out.length - outoff > 255)) {