JSDOC/Packer.js

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

diff --git a/JSDOC/Packer.js b/JSDOC/Packer.js
index f6c7695..c640e53 100644 (file)
--- a/JSDOC/Packer.js
+++ b/JSDOC/Packer.js
@@ -2,6 +2,7 @@
 XObject         = imports.XObject.XObject;
 File            = imports.File.File;
 
+TextStream      = imports['JSDOC/TextStream.js'].TextStream;
 TokenReader     = imports['JSDOC/TokenReader.js'].TokenReader;
 ScopeParser     = imports['JSDOC/ScopeParser.js'].ScopeParser;
 TokenStream     = imports['JSDOC/TokenStream.js'].TokenStream;
@@ -73,6 +74,7 @@ Packer = function(cfg)
         throw "No Files";
     }
     
+    
     this.timer =  new Date() * 1;
     this.packAll();
     
@@ -125,13 +127,13 @@ Packer.prototype = {
             var file = this.files[i];
             
             print("reading " +file );
-            if (!File.exists(file)) {
-                print("SKIP (does not exist) " + file);
+            if (!File.isFile(file)) {
+                print("SKIP (is not a file) " + file);
                 continue;
             }
            
             if (this.debugTarget) {
-                File.append(this.debugTarget, File.read(files[i]));
+                File.append(this.debugTarget, File.read(file));
             }
             // it's a good idea to check with 0 compression to see if the code can parse!!
             
@@ -140,14 +142,14 @@ Packer.prototype = {
             
        
             
-            var minfile = this.tmpDir + '/' +files.replace(/\//g, '.');
+            var minfile = this.tmpDir + '/' +file.replace(/\//g, '.');
             
             
             // let's see if we have a min file already?
             // this might happen if tmpDir is set .. 
             if (true && File.exists(minfile)) {
                 var mt = File.mtime(minfile);
-                var ot = File.mtime(files);
+                var ot = File.mtime(file);
                 print("compare : " + mt + "=>" + ot);
                 if (mt >= ot) {
                     continue;
@@ -170,11 +172,10 @@ Packer.prototype = {
             if (File.exists(minfile)) {
                 File.remove(minfile);
             }
-            var str = File.read(files);
-            var str = this.pack(str, files, minfile);
+            var str = File.read(file);
+            var str = this.pack(str, file, minfile);
             if (str.length) {
                 File.write(minfile, str);
-                this.tmpFiles.push(minfile);
             }
             
              
@@ -228,9 +229,9 @@ Packer.prototype = {
         
         print("MERGING SOURCE");
         
-        for(var i=0; i < files.length; i++)  {
-            
-            var minfile = bpath + '/' + this.files.replace(/\//g, '.');
+        for(var i=0; i < this.files.length; i++)  {
+            var file = this.files[i];
+            var minfile = this.tmpDir + '/' + file.replace(/\//g, '.');
             
             
             if (!File.exists(minfile)) {
@@ -294,7 +295,7 @@ Packer.prototype = {
         sp.mungeSymboltree();
         this.timerPrint("Munged Sym tree");
         print(sp.warnings.join("\n"));
-        var out = JSDOC.CompressWhite(sp.ts, this);
+        var out = CompressWhite(sp.ts, this);
         this.timerPrint("Compressed");
         return out;
         
@@ -364,14 +365,16 @@ Packer.prototype = {
     {
         //print("STRING HANDLER");
        // callback when outputing compressed file, 
+       var data = tok.outData !== false ? tok.outData : tok.data;
         if (!this.translateJSON) {
          //   print("TURNED OFF");
-            return tok.outData;
+            return data;
         }
         if (tok.name == SINGLE_QUOTE) {
-            return tok.outData;
+            return data;
         }
-        var sval = tok.data.substring(1,tok.data.length-1);
+        
+        var sval = data.substring(1,data.length-1);
         // we do not clean up... quoting here!??!!?!?!?!?