JSDOC/BuildDocs.js

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

diff --git a/JSDOC/Packer.js b/JSDOC/Packer.js
index c60f089..dde2085 100644 (file)
--- a/JSDOC/Packer.js
+++ b/JSDOC/Packer.js
@@ -2,11 +2,12 @@
 XObject         = imports.XObject.XObject;
 File            = imports.File.File;
 
-TextStream      = imports['JSDOC/TextStream.js'].TextStream;
-TokenReader     = imports['JSDOC/TokenReader.js'].TokenReader;
-ScopeParser     = imports['JSDOC/ScopeParser.js'].ScopeParser;
-TokenStream     = imports['JSDOC/TokenStream.js'].TokenStream;
-CompressWhite   = imports['JSDOC/CompressWhite.js'].CompressWhite;
+TextStream      = imports.TextStream.TextStream;
+TokenReader     = imports.TokenReader.TokenReader;
+ScopeParser     = imports.ScopeParser.ScopeParser;
+TokenStream     = imports.TokenStream.TokenStream;
+CompressWhite   = imports.CompressWhite.CompressWhite;
+Collapse        = imports.Collapse.Collapse;
 
 GLib = imports.gi.GLib;
 /**
@@ -132,16 +133,20 @@ Packer.prototype = {
         lines.forEach(function(f) {
             
             if (/^\s*\//.test(f) || !/[a-z]+/i.test(f)) { // skip comments..
-                continue;
+                return;
             }
             if (/\.js$/.test(f)) {
                 _this.files.push( f);
                 // js file..
-                continue;
+                return;
             }
             
             //println("ADD"+ f.replace(/\./g, '/'));
-            _this.files.push( f.replace(/\./g, '/').replace(/\s+/g,'')+'.js');
+            var add = f.replace(/\./g, '/').replace(/\s+/g,'')+'.js';
+            if (_this.files.indexOf(f) > -1) {
+                return;
+            }
+            _this.files.push( add );
             
         })
     },
@@ -306,7 +311,13 @@ Packer.prototype = {
     pack : function (str,fn,minfile)
     {
     
-        var tr = new  TokenReader(  { keepDocs :true, keepWhite : true,  keepComments : true, sepIdents : true });
+        var tr = new  TokenReader(  { 
+            keepDocs :true, 
+            keepWhite : true,  
+            keepComments : true, 
+            sepIdents : true,
+            collapseWhite : false
+        });
         this.timerPrint("START" + fn);
         
         // we can load translation map here...
@@ -324,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();
@@ -333,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;