JSDOC/CompressWhite.js

[gnome.introspection-doc-generator] / JSDOC / CompressWhite.js

diff --git a/JSDOC/CompressWhite.js b/JSDOC/CompressWhite.js
index e8331bb..f24659a 100644 (file)
--- 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.. 
@@ -95,7 +95,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 +105,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.. 
@@ -129,14 +129,14 @@ CompressWhite =  function (ts, packer)
             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 "RETURN": // if next item is not a semi; (or }
-                if (ts.look(1).data == ';' || ts.look(1).data == '}') {
+                if (ts.lookTok(1).data == ';' || ts.lookTok(1).data == '}') {
                     continue;
                 }
                 tok.outData =  tok.data + " ";
@@ -145,7 +145,7 @@ CompressWhite =  function (ts, packer)
             
                 
             case "ELSE": // if next item is not a semi; (or }
-                if (!ts.look(1).isTypeN(Script.TOKif)) {
+                if (!ts.lookTok(1).name == "IF") {
                     continue;
                 }
                 
@@ -155,12 +155,12 @@ CompressWhite =  function (ts, packer)
             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;
                     
                 }
@@ -210,24 +210,21 @@ 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.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 (tok.type == 'STRN') && (tok.name== 'DOUBLE_QUOTE') {
             if (packer.stringHandler) {
                 out += packer.stringHandler(tok);
                 continue;
@@ -238,7 +235,7 @@ CompressWhite =  function (ts, packer)
         
         if ((tok.outData == ';') && (out.length - outoff > 255)) {
             outoff = out.length;
-            out += '\n';
+            out += "\n";
         }
     }
     //f.close();