X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FPacker.js;h=677b1dd1df0e05ee657c63654d3761bb642703ea;hb=f411a58df415d07ca3646208f47882db25a22e10;hp=edce427d938cd1e3f22c07d1ab63688914635900;hpb=e8b7c948d0719ea07bf97a6d93c4c4eac22ab3dd;p=gnome.introspection-doc-generator

diff --git a/JSDOC/Packer.js b/JSDOC/Packer.js
index edce427..677b1dd 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,12 @@ Packer.prototype = {
         // and replace if we are generating a different language..
         
         this.timerPrint("Tokenized");
+        //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(new TokenStream(toks));
+        var sp = new ScopeParser(ts);
         this.timerPrint("Converted to Parser");
         sp.packer = this;
         sp.buildSymbolTree();