JSDOC/TokenReader.js

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

diff --git a/JSDOC/Packer.vala b/JSDOC/Packer.vala
index 6bffe65..b6d7e28 100644 (file)
--- a/JSDOC/Packer.vala
+++ b/JSDOC/Packer.vala
@@ -96,7 +96,7 @@ namespace JSDOC
                 *    usefull for debugging compressed files.
                 */
                
-               public bool keepWhite =  true;
+               public bool keepWhite =  false;
                
                
                // list of files to compile...
@@ -283,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;
@@ -298,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 {
@@ -312,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);
+                       }
                     
                
                
@@ -368,17 +374,17 @@ 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);
                                 
-                       } else {
+                       }  
 
                
                        return outf;