X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FPacker.vala;h=822e0736b5036f9aa362a940274fa8fc6a0b011f;hb=5952f0a864405366d4da4951db2c01f207b82b35;hp=472932ae56176aa2f1931775b3be0107795f5c0a;hpb=093afb1b9821d771426786fb9b58527c6c2e8bfc;p=gnome.introspection-doc-generator diff --git a/JSDOC/Packer.vala b/JSDOC/Packer.vala index 472932a..822e073 100644 --- 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.. * * @@ -56,7 +54,9 @@ x.packAll(); // writes files etc.. */ namespace JSDOC { - + public errordomain PackerError { + ArgumentError + } public class Packer : Object { @@ -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,19 +96,29 @@ namespace JSDOC * usefull for debugging compressed files. */ - public bool keepWhite = true; + public bool keepWhite = false; // list of files to compile... Gee.ArrayList files; - public string out = ""; // if no target is specified - then this will contain the result + /** + * @cfg debug -- pretty obvious. + */ + + public string activeFile = ""; + + + public string outstr = ""; // if no target is specified - then this will contain the result public Packer(string target, string targetDebug = "") { this.target = target; this.targetDebug = targetDebug; - + this.files = new Gee.ArrayList(); + + new Lang_Class(); ///initilizaze lang.. + } public void loadSourceIndexes(Gee.ArrayList indexes) @@ -114,18 +128,24 @@ namespace JSDOC } } - public void loadFiles(Gee.ArrayList fs) + public void loadFiles(string[] fs) { foreach(var f in fs) { + GLib.debug("add File: %s", f); this.files.add(f); //?? easier way? } } - + public void loadFile(string f) + { + GLib.debug("add File: %s", f); + this.files.add(f); + GLib.debug("FILE LEN: %d", this.files.size); + } public void pack() { if (this.files.size < 1) { - throw new Packer.ArgumentError("No Files loaded before pack() called"); + throw new PackerError.ArgumentError("No Files loaded before pack() called"); } if (this.target.length > 0 ) { this.targetStream = File.new_for_path(this.target).replace(null, false,FileCreateFlags.NONE); @@ -175,10 +195,10 @@ namespace JSDOC // should we prefix? =- or should this be done elsewhere? var add = f.replace(".", "/") + ".js"; - if (_this.files.contains(add)) { + if (this.files.contains(add)) { continue; } - _this.files.add( add ); + this.files.add( add ); } } @@ -190,29 +210,31 @@ namespace JSDOC //this.transOrigFile= bpath + '/../lang.en.js'; // needs better naming... //File.write(this.transfile, ""); if (this.target.length > 0) { - this.targetStream.write(""); + this.targetStream.write("".data); } - if (this.debugTarget > 0) { - this.targetDebugStream.write(""); + if (this.targetDebugStream != null) { + this.targetDebugStream.write("".data); } + + foreach(var file in this.files) { 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; } var loaded_string = false; - string file_contents; + string file_contents = ""; // debug Target if (this.targetDebugStream !=null) { FileUtils.get_contents(file,out file_contents); - this.targetDebugStream.write(file_contents); + this.targetDebugStream.write(file_contents.data); loaded_string = false; } // it's a good idea to check with 0 compression to see if the code can parse!! @@ -222,14 +244,14 @@ namespace JSDOC - var minfile = this.tmpDir + '/' + file.replace("/", '.'); + var minfile = this.tmpDir + "/" + file.replace("/", "."); // let's see if we have a min file already? // 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(); @@ -246,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); @@ -255,80 +277,34 @@ namespace JSDOC FileUtils.get_contents(file,out file_contents); } - var str = this.packFile(file_contents, file, minfile); + this.packFile(file_contents, file, minfile); } + + print("MERGING SOURCE\n"); - - // 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.length; i++) { + for(var i=0; i < this.files.size; i++) { var file = this.files[i]; - var minfile = this.tmpDir + '/' + file.replace('/', '.'); + var minfile = this.tmpDir + "/" + file.replace("/", "."); - if (!File.exists(minfile)) { + if ( !FileUtils.test(minfile, FileTest.EXISTS)) { + print("skipping source %s - does not exist\n", minfile); continue; } - var str = File.read(minfile); - print("using MIN FILE "+ minfile); - if (str.length) { + string str; + FileUtils.get_contents(minfile, out str); + print("using MIN FILE %s\n", minfile); + if (str.length > 0) { if (this.targetStream != null) { - this.targetStream.write("//" + file + "\n"); - this.targetStream.write(str + "\n"); + this.targetStream.write(("// " + file + "\n").data); + this.targetStream.write((str + "\n").data); } else { - this.out += "//" + file + "\n"; - this.out += str + "\n"; + this.outstr += "//" + file + "\n"; + this.outstr += str + "\n"; } } @@ -337,9 +313,16 @@ namespace JSDOC } } - print("Output file: " + this.target); - if (this.debugTarget) print("Output debug file: " + this.debugTarget); - + if (this.target.length > 0 ) { + print("Output file: " + this.target); + } + if (this.targetDebug.length > 0) { + print("Output debug file: %s\n" , this.targetDebug); + } + + if (this.outstr.length > 0 ) { + print(this.outstr); + } @@ -363,12 +346,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. @@ -379,30 +360,34 @@ 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); + + //ts.dumpAll(""); print("Done collaps"); Process.exit(1); + // 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(); + sp.printWarnings(); + //print(sp.warnings.join("\n")); - print(sp.warnings.join("\n")); - - - var outf = CompressWhite(new TokenStream(toks), this, this.keepWhite); // do not kill whitespace.. - + var outf = CompressWhite(new TokenStream(ts.toArray()), this, this.keepWhite); // do not kill whitespace.. + + print("RESULT: \n %s\n", outf); - if (out.length > 0) { - FileUtils.put_contents(minfile, outf); + if (outf.length > 0) { + FileUtils.set_contents(minfile, outf); - } + } + - return out; + return outf; @@ -412,7 +397,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); }