X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FCompressWhite.js;h=f6981162ce6930f2df30bb35fb9e4d25c7dc0890;hb=2e95f7158d771fb7338779b13209264ea7bd4ab4;hp=f24659ad8f34fd0157f0dbf94bae47a89fd71a02;hpb=8a941b7d4fa8ed128bafde3071253f243c2c72df;p=gnome.introspection-doc-generator

diff --git a/JSDOC/CompressWhite.js b/JSDOC/CompressWhite.js
index f24659a..f698116 100644
--- a/JSDOC/CompressWhite.js
+++ b/JSDOC/CompressWhite.js
@@ -66,13 +66,35 @@ CompressWhite =  function (ts, packer)
                 ts.balance("{");
                 // 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.look(0).data+";";
+                if (ts.lookTok(1).data != ';' && ts.lookTok(1).data != '}' && ts.lookTok(1,true).name == "NEWLINE") {
+                    ts.look(0).outData = ts.look(0).data+";";
                 }
                 // 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)) {
@@ -188,7 +210,7 @@ CompressWhite =  function (ts, packer)
                     tok.outData =  tok.data + " ";
                 }
                 continue;
-             case ";"
+             case ";":
                 //remove semicolon before brace -- 
                 //if(ts.look(1).isTypeN(Script.TOKrbrace)) {
                 //    tok.outData = '';
@@ -216,7 +238,7 @@ CompressWhite =  function (ts, packer)
         }
         
         
-        if (tok.type == "NAME"  && 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;
             continue;
@@ -224,14 +246,14 @@ CompressWhite =  function (ts, packer)
         
         // at this point we can apply a text translation kit...
         
-        if (tok.type == 'STRN') && (tok.name== 'DOUBLE_QUOTE') {
-            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;