X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FCompressWhite.js;h=5f918b88998f8b1219cdbf9abde07245febaa9e7;hb=385b96ac83744f5560ec0ea4ac959a6a5e4fef97;hp=fd72cd2d4070206161f00a417bf0ed9bcee2d0d7;hpb=fffa30c369e2d1dd23eeafc5c5563472929a99db;p=gnome.introspection-doc-generator

diff --git a/JSDOC/CompressWhite.js b/JSDOC/CompressWhite.js
index fd72cd2..5f918b8 100644
--- a/JSDOC/CompressWhite.js
+++ b/JSDOC/CompressWhite.js
@@ -34,7 +34,7 @@ CompressWhite =  function (ts, packer)
         }
         
         // 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 +48,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 = ="NEWLINE") {
+                if (ts.lookTok(1).data != ';'  && ts.lookTok(1).data != '}' && ts.lookTok(1,true).name == "NEWLINE") {
                     ts.look(0).outData = ts.cur().data +";";
                 }
                 // restore.. 
@@ -66,13 +66,32 @@ 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 (tok.lookTok(1).data == "(")  {
+                var cu = ts.cursor;
+                
+                ts.balance("(");
+                 // although this var a=function(){},v,c; causes 
+                if (ts.lookTok(1).type == 'NAME' && ts.lookTok(1,true).name == "NEWLINE") {
+                    ts.look(0).outData = ts.look(0).data+"\n";
+                }
+                // restore.. 
+                ts.cursor = cu;
+            }
+            
+            
             // function a () { ... };
                 /*
             if (ts.look(-1).isTypeN(Script.TOKfunction) &&  ts.look(1).isTypeN(Script.TOKlparen)) {
@@ -95,7 +114,7 @@ CompressWhite =  function (ts, packer)
             
             // a = { ....
                 
-            if (ts.look(1).data == '=' &&  ts.look(2).data == '{')) {
+            if (ts.lookTok(1).data == '=' &&  ts.lookTok(2).data == '{') {
                 // freeze time.. 
                 //println("----------*** 3 *** --------------");
                 var cu = ts.cursor;
@@ -105,7 +124,7 @@ CompressWhite =  function (ts, packer)
                 }
                 // if next is not ';' -> make it so...
 
-                if (!ts.look(1).data == ';' && ts.look(1).data != '}' && ts.look(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 +";";
                 }
                 // restore.. 
@@ -123,20 +142,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).data == ';' || ts.look(1).data == '}') {
+            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 +163,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,7 +221,7 @@ CompressWhite =  function (ts, packer)
     
     ts.rewind();
     
-    
+    // NOW OUTPUT THE THING.
     //var f = new File(minfile, File.NEW);
     
     var out = '';
@@ -205,35 +229,32 @@ CompressWhite =  function (ts, packer)
     out.length = ts.slen; // prealloc.
     out = '';
     while (true) {
-        var tok = ts.next();
+        var tok = ts.nextTok();
         if (!tok) {
             break;
         }
-        if (tok._isWS) {
-            continue;
-        }
         
         
-        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();