JSDOC/Packer.js

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

diff --git a/JSDOC/Packer.js b/JSDOC/Packer.js
index 80a26ec..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;
@@ -126,8 +127,8 @@ 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;
             }
            
@@ -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!??!!?!?!?!?