JSDOC/Packer.vala

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

diff --git a/JSDOC/Packer.vala b/JSDOC/Packer.vala
index 26173d1..e4a54b8 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?
        
@@ -112,6 +116,8 @@ namespace JSDOC
                        this.target = target;
                        this.targetDebug  = targetDebug;
                        this.files = new Gee.ArrayList<string>();
+                       
+                       new Lang_Class(); ///initilizaze lang..
                         
                }
                
@@ -216,7 +222,7 @@ namespace JSDOC
                        
                        print("reading %s\n",file );
                        
-                       if (!FileUtils.test (file, FileTest.EXISTS) && FileUtils.test (file, FileTest.IS_DIR)) {
+                       if (!FileUtils.test (file, FileTest.EXISTS) || FileUtils.test (file, FileTest.IS_DIR)) {
                            print("SKIP (is not a file) %s\n ", file);
                            continue;
                        }
@@ -245,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();
@@ -262,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);
@@ -276,55 +282,7 @@ namespace JSDOC
                      
                    }
                    
-                   
-                   
-                   // if we are translating, write the translations strings at the top
-                   // of the file..
-                   /*
-                   if (this.translateJSON) {
-                       
-                          
-                       print("MERGING LANGUAGE");
-                       var out = "if (typeof(_T) == 'undefined') { _T={};}\n";
-                       if (this.target) {
-                           File.write(this.target, out);
-                       } else {
-                           this.out += out;
-                       }
-                        
-                       File.write(this.translateJSON, "");
-                       for(var i=0; i < this.files.length; i++)  {
-                           var file = this.files[i];
-                           var transfile= this.tmpDir + '/' +file.replace(/\//g, '.') +'.lang.trans';
-                           var transmd5 = this.tmpDir  + '/' +file.replace(/\//g, '.') +'.lang';
-                           if (File.exists(transmd5)) {
-                               var str = File.read(transmd5);
-                               if (str.length) {
-                                   if (this.target) {
-                                       File.append(this.target, str + "\n");
-                                   } else {
-                                       this.out += str + "\n";
-                                   }
-                                   
-                               }
-                               if (this.cleanup) {
-                                   File.remove(transmd5);
-                               }
-                           }
-                           if (File.exists(transfile)) {
-                               var str = File.read(transfile);
-                               if (str.length) {
-                                   File.append(this.translateJSON, str);
-                               }
-                               if (this.cleanup) {
-                                   File.remove(transfile);
-                               }
-                           }
-                           
-                          
-                       }
-                   }
-                   */
+                 
                    print("MERGING SOURCE");
                    
                    for(var i=0; i < this.files.size; i++)  {
@@ -397,6 +355,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);
@@ -411,13 +372,14 @@ namespace JSDOC
                
                        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;