JSDOC/TokenReader.js

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

diff --git a/JSDOC/Packer.vala b/JSDOC/Packer.vala
index 7fc0d84..b6d7e28 100644 (file)
--- a/JSDOC/Packer.vala
+++ b/JSDOC/Packer.vala
@@ -75,6 +75,10 @@ namespace JSDOC
                /**
                 * @cfg {String} tmpDir  (optional) where to put the temporary files. 
                 *      if you set this, then files will not be cleaned up
+                *  
+                *  at present we need tmpfiles - as we compile multiple files into one.
+                *  we could do this in memory now, as I suspect vala will not be as bad as javascript for leakage...
+                *
                 */
                public string tmpDir = "/tmp";  // FIXME??? in ctor?
        
@@ -92,7 +96,7 @@ namespace JSDOC
                 *    usefull for debugging compressed files.
                 */
                
-               public bool keepWhite =  true;
+               public bool keepWhite =  false;
                
                
                // list of files to compile...
@@ -247,7 +251,7 @@ namespace JSDOC
                        // this might happen if tmpDir is set .. 
 
                        
-                       if (true && FileUtils.test (minfile, FileTest.EXISTS)) {
+                       if (false && FileUtils.test (minfile, FileTest.EXISTS)) {
                                
                                var otv = File.new_for_path(file).query_info (FileAttribute.TIME_MODIFIED, 0).get_modification_time();
                                var mtv = File.new_for_path(minfile).query_info (FileAttribute.TIME_MODIFIED, 0).get_modification_time();
@@ -264,7 +268,7 @@ namespace JSDOC
                            
                        }
                         
-                       print("COMPRESSING ");
+                       print("COMPRESSING to %s\n", minfile);
                        //var codeComp = pack(str, 10, 0, 0);
                        if (FileUtils.test (minfile, FileTest.EXISTS)) {
                            FileUtils.remove(minfile);
@@ -279,14 +283,15 @@ namespace JSDOC
                    }
                    
                  
-                   print("MERGING SOURCE");
+                   print("MERGING SOURCE\n");
                    
                    for(var i=0; i < this.files.size; i++)  {
                        var file = this.files[i];
                        var minfile = this.tmpDir + "/" + file.replace("/", ".");
                        
                        
-                       if ( FileUtils.test(minfile, FileTest.EXISTS)) {
+                       if ( !FileUtils.test(minfile, FileTest.EXISTS)) {
+                               print("skipping source %s - does not exist\n", minfile);
                            continue;
                        }
                        string str;
@@ -294,7 +299,7 @@ namespace JSDOC
                        print("using MIN FILE  %s\n", minfile);
                        if (str.length > 0) {
                            if (this.targetStream != null) {
-                                       this.targetStream.write(("//" + file + "\n").data); 
+                                       this.targetStream.write(("// " + file + "\n").data); 
                                        this.targetStream.write((str + "\n").data); 
 
                            } else {
@@ -308,11 +313,16 @@ namespace JSDOC
                        }
                        
                    }
-                   print("Output file: " + this.target);
+                   if (this.target.length > 0 ) {
+                           print("Output file: " + this.target);
+                   }
                    if (this.targetDebug.length > 0) {
-                                print("Output debug file: " + this.targetDebug);
-                        }
-                   
+                                print("Output debug file: %s\n" , this.targetDebug);
+                       }  
+                       
+                       if (this.outstr.length > 0 ) {
+                               print(this.outstr);
+                       }
                     
                
                
@@ -351,6 +361,9 @@ namespace JSDOC
                        //var ts = new TokenStream(toks);
                        //print(JSON.stringify(toks, null,4 )); Seed.quit();
                        var ts = new Collapse(toks.tokens);
+                       
+                       //ts.dumpAll("");                       print("Done collaps"); Process.exit(1);
+                       
                   // print(JSON.stringify(ts.tokens, null,4 )); Seed.quit();
                        //return;//
                        var sp = new ScopeParser(ts);
@@ -361,17 +374,18 @@ namespace JSDOC
                        sp.mungeSymboltree();
                        sp.printWarnings();
                        //print(sp.warnings.join("\n"));
-
-               
+                       //(new TokenStream(toks.tokens)).dumpAll(""); GLib.Process.exit(1);
+                       // compress works on the original array - in theory the replacements have already been done by now 
                        var outf = CompressWhite(new TokenStream(toks.tokens), this, this.keepWhite); // do not kill whitespace..
                
-               
-               
+                       
+                       print("RESULT: \n %s\n", outf);
                
                         if (outf.length > 0) {
                                FileUtils.set_contents(minfile, outf);
                                 
-                       }
+                       }  
+
                
                        return outf;