X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FCompressWhite.js;h=13d6df7d2ffb93c497dcbad5cc57e86ee2abeac4;hp=3c81f58de7b4a9f472f5242d0c0fb7e2bdc5bf59;hb=6534df3589197eabe11704e9f7a18cff965898f2;hpb=d7aa6b20ee3fbb61a7f54ec72ad7622728fc8960

diff --git a/JSDOC/CompressWhite.js b/JSDOC/CompressWhite.js
index 3c81f58..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;
@@ -71,13 +72,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 +164,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 +175,7 @@ CompressWhite =  function (ts, packer)
             
             // any more??
             // a = function(....) { } 
-                  print(ts.lookTok(2).toString());
-            if (ts.lookTok(1).data == '=' &&  ts.lookTok(2).is('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;
-            }
-            
+          
         }
         
         
@@ -271,13 +271,17 @@ CompressWhite =  function (ts, packer)
     var outoff = 0;
     out.length = ts.slen; // prealloc.
     out = '';
+    var tok;
     while (true) {
-        var tok = ts.nextTok();
-           
+        
+        tok = keepWhite ? ts.next() : ts.nextTok();
+        
         if (!tok) {
             break;
         }
-        
+        if (tok.name == "COMM") {
+            tok.outData == '\n';
+        }
         
         if (tok.type == "NAME"  && tok.identifier && tok.identifier.mungedValue && tok.identifier.mungedValue.length) {
             //f.write(tok.identifier.mungedValue);