JSDOC/PackerRun.vala

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

diff --git a/JSDOC/Packer.vala b/JSDOC/Packer.vala
index 99fb199..0e74718 100644 (file)
--- a/JSDOC/Packer.vala
+++ b/JSDOC/Packer.vala
@@ -18,11 +18,9 @@ x.srcfiles = array of files (that list other files...) << not supported?
 x.target = "output.pathname.js"
 x.debugTarget = "output.pathname.debug.js"
 
-
-x.debugTranslateTarget : "/tmp/output.translate.js" << this used to be the single vs double quotes.. we may not use it in future..
-x.translateJSON: "/tmp/translate.json",
+ 
     
-x.packAll();  // writes files  etc..
+x.pack();  // writes files  etc..
     
  *</code> 
  *
@@ -100,7 +98,12 @@ namespace JSDOC
                // list of files to compile...
                Gee.ArrayList<string> files;
                
-               public  string out = ""; // if no target is specified - then this will contain the result
+               
+               
+               public string activeFile = "";
+               
+               
+               public  string outstr = ""; // if no target is specified - then this will contain the result
     
                public Packer(string target, string targetDebug = "")
                {
@@ -116,7 +119,7 @@ namespace JSDOC
                        }
                }
                
-               public void loadFiles(Gee.ArrayList<string> fs)
+               public void loadFiles(string[] fs)
                {
                        foreach(var f in fs) {
                                this.files.add(f); //?? easier way?
@@ -210,7 +213,7 @@ namespace JSDOC
                        }
                       
                                var loaded_string = false;
-                               string file_contents;
+                               string file_contents = "";
                        // debug Target
                        
                        if (this.targetDebugStream !=null) {
@@ -259,7 +262,7 @@ namespace JSDOC
                                FileUtils.get_contents(file,out file_contents);
                        }
 
-                       var str = this.packFile(file_contents, file, minfile);
+                        this.packFile(file_contents, file, minfile);
                         
                      
                    }
@@ -332,8 +335,8 @@ namespace JSDOC
                                        this.targetStream.write((str + "\n").data); 
 
                            } else {
-                               this.out += "//" + file + "\n";
-                               this.out += str + "\n";
+                               this.outstr += "//" + file + "\n";
+                               this.outstr += str + "\n";
                            }
                            
                        }
@@ -343,7 +346,9 @@ namespace JSDOC
                        
                    }
                    print("Output file: " + this.target);
-                   if (this.debugTarget) print("Output debug file: " + this.debugTarget);
+                   if (this.targetDebug.length > 0) {
+                                print("Output debug file: " + this.targetDebug);
+                        }
                    
                     
                
@@ -368,12 +373,10 @@ namespace JSDOC
                        tr.sepIdents = true;
                        tr.collapseWhite = false;
                        tr.filename = fn;
-
-                       this.timerPrint("START" + fn);
-               
+ 
                        // we can load translation map here...
                
-                       var toks = tr.tokenize(new TextStream(str)); // dont merge xxx + . + yyyy etc.
+                       TokenArray toks = tr.tokenize(new TextStream(str)); // dont merge xxx + . + yyyy etc.
                
                
                
@@ -384,30 +387,30 @@ namespace JSDOC
 
                        //var ts = new TokenStream(toks);
                        //print(JSON.stringify(toks, null,4 )); Seed.quit();
-                       var ts = new Collapse(toks);
+                       var ts = new Collapse(toks.tokens);
                   // print(JSON.stringify(ts.tokens, null,4 )); Seed.quit();
                        //return;//
                        var sp = new ScopeParser(ts);
-
-                       sp.packer = this;
+ 
+                       //sp.packer = this;
                        sp.buildSymbolTree();
 
                        sp.mungeSymboltree();
-
-                       print(sp.warnings.join("\n"));
+                       sp.printWarnings();
+                       //print(sp.warnings.join("\n"));
 
                
-                       var outf = CompressWhite(new TokenStream(toks), this, this.keepWhite); // do not kill whitespace..
+                       var outf = CompressWhite(new TokenStream(toks.tokens), this, this.keepWhite); // do not kill whitespace..
                
                
                
                
-                        if (out.length > 0) {
-                               FileUtils.put_contents(minfile, outf);
+                        if (outf.length > 0) {
+                               FileUtils.set_contents(minfile, outf);
                                 
                        }
                
-                       return out;
+                       return outf;
                
                
                         
@@ -417,7 +420,7 @@ namespace JSDOC
                public string md5(string str)
                {
                
-                       return GLib.compute_checksum_for_string(GLib.ChecksumType.MD5, str);
+                       return GLib.Checksum.compute_for_string(GLib.ChecksumType.MD5, str);
                
                }