sync

diff --git a/JSDOC/Collapse.js b/JSDOC/Collapse.js
index 62b3a73..71a89fd 100644 (file)
--- a/JSDOC/Collapse.js
+++ b/JSDOC/Collapse.js
@@ -194,6 +194,12 @@ Collapse = XObject.define(
                     g.push(ar[i]);
                     continue;
                 }
+                // var a=..., b =...
+                if ((ar[i].data != ';') && g.length && (g[0].name == "VAR")) {;
+                    g.push(ar[i]);
+                    continue;
+                }
+                
                 g.push(ar[i]);
                 ret.push(g);
                 g = [];

diff --git a/JSDOC/Packer.js b/JSDOC/Packer.js
index f7a3246..22a3757 100644 (file)
--- a/JSDOC/Packer.js
+++ b/JSDOC/Packer.js
@@ -94,7 +94,7 @@ Packer = function(cfg)
         var outname = this.module ? this.module : GLib.path_get_basename(dirname);
         this.target = dirname + '/compiled/' + outname + '-' + version + '.js';
          if (File.exists(this.target)) {
-            print("Target file already exists");
+            print("Target file already exists: " + this.target);
             Seed.quit();
         }
         this.prefix = dirname +'/';
@@ -338,6 +338,8 @@ Packer.prototype = {
             }
             
         }
+        print("Output file: " + this.target);
+        if (this.debugTarget) print("Output debug file: " + this.debugTarget);
         
          
     
@@ -360,7 +362,8 @@ Packer.prototype = {
             keepWhite : true,  
             keepComments : true, 
             sepIdents : true,
-            collapseWhite : false
+            collapseWhite : false,
+            filename : fn
         });
         this.timerPrint("START" + fn);
         
@@ -396,6 +399,7 @@ Packer.prototype = {
         
         var out = CompressWhite(new TokenStream(toks), this, this.keepWhite); // do not kill whitespace..
         
+        
         this.timerPrint("Compressed");
         return out;
         

diff --git a/JSDOC/TokenStream.js b/JSDOC/TokenStream.js
index 7b3328f..aee0b5a 100644 (file)
--- a/JSDOC/TokenStream.js
+++ b/JSDOC/TokenStream.js
@@ -114,7 +114,10 @@ TokenStream = XObject.define(
                // print(i);
                 if (i < 0) {
                     if (n > -1) {
-                        i = 0; continue;
+                        i = 0; 
+                        count++;
+                        continue;
+                        
                     }
                     return   new Token("", "VOID", "END_OF_STREAM");
                 }