JSDOC/TokenReader.js

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

diff --git a/JSDOC/CompressWhite.js b/JSDOC/CompressWhite.js
index 5c7ffec..50d7476 100644 (file)
--- a/JSDOC/CompressWhite.js
+++ b/JSDOC/CompressWhite.js
@@ -8,22 +8,22 @@
    @arg packer {Packer} 
  */
  
-CompressWhite =  function (ts, packer, keepWhite)
+const CompressWhite =  function (ts, packer, keepWhite)
 {
     keepWhite = keepWhite || false;
     ts.rewind();
     //var str = File.read(fn);
     var rep_var = 1;
     
+    
+    
     while (true) {
         var tok = ts.next();
         if (!tok) {
             break;
         }
         if (tok.type == "WHIT") {
-            if (keepWhite) {
-                ts.look(0).outData = ts.look(0).data;
-               }
+           
             continue;
             //if (tok._isDoc) {
             //    continue;
@@ -271,18 +271,27 @@ CompressWhite =  function (ts, packer, keepWhite)
     
     var out = '';
     var outoff = 0;
-    out.length = ts.slen; // prealloc.
+    try { out.length = ts.slen; } catch (e) {} // prealloc.
+    
     out = '';
+    var tok;
     while (true) {
-        var tok = ts.nextTok();
-           
+        
+        tok = keepWhite ? ts.next() : ts.nextTok();
+        
         if (!tok) {
             break;
         }
+        if (tok.type == "COMM") {
+            tok.outData = '\n';
+        }
         
+        ///print(tok.type + ':' + tok.data);
         
-        if (tok.type == "NAME"  && tok.identifier && tok.identifier.mungedValue && tok.identifier.mungedValue.length) {
+        if (tok.type == "NAME"  && tok.identifier 
+            && tok.identifier.mungedValue && tok.identifier.mungedValue.length) {
             //f.write(tok.identifier.mungedValue);
+            //print("MUNGED: " + tok.identifier.mungedValue);
             out += tok.identifier.mungedValue;
             continue;
         }