X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FPacker.js;h=dde208516007d2ae72fb541999c82f3a23f76135;hp=7dae913f0a16e65dd6b7bb1387f416aac12552b5;hb=d5bdc9227e031e019cf0dd2a062e1db5b329974b;hpb=dc0ee4d9eedd41df6f70a12add506ef89db32194

diff --git a/JSDOC/Packer.js b/JSDOC/Packer.js
index 7dae913..dde2085 100644
--- a/JSDOC/Packer.js
+++ b/JSDOC/Packer.js
@@ -7,6 +7,7 @@ TokenReader     = imports.TokenReader.TokenReader;
 ScopeParser     = imports.ScopeParser.ScopeParser;
 TokenStream     = imports.TokenStream.TokenStream;
 CompressWhite   = imports.CompressWhite.CompressWhite;
+Collapse        = imports.Collapse.Collapse;
 
 GLib = imports.gi.GLib;
 /**
@@ -314,7 +315,8 @@ Packer.prototype = {
             keepDocs :true, 
             keepWhite : true,  
             keepComments : true, 
-            sepIdents : true 
+            sepIdents : true,
+            collapseWhite : false
         });
         this.timerPrint("START" + fn);
         
@@ -333,8 +335,10 @@ Packer.prototype = {
         // and replace if we are generating a different language..
         
         this.timerPrint("Tokenized");
-        var ts = new TokenStream(toks);
-        ts.dump();
+        //var ts = new TokenStream(toks);
+        //print(JSON.stringify(toks, null,4 )); Seed.quit();
+        var ts = new Collapse(toks);
+       // print(JSON.stringify(ts.tokens, null,4 )); Seed.quit();
         //return;//
         var sp = new ScopeParser(ts);
         this.timerPrint("Converted to Parser");
@@ -344,7 +348,10 @@ Packer.prototype = {
         sp.mungeSymboltree();
         this.timerPrint("Munged Sym tree");
         print(sp.warnings.join("\n"));
-        var out = CompressWhite(sp.ts, this);
+        
+        
+        //var out = CompressWhite(new TokenStream(toks), this, true); // do not kill whitespace..
+        var out = CompressWhite(new TokenStream(toks), this, false);
         this.timerPrint("Compressed");
         return out;