X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FCollapse.js;h=3c9ec9e225385599d9de4f5b395e2a7d896b7886;hp=9730949eb5906caf5bc4ffca1184f141f987fef4;hb=df686e1160c3532fc88a2cd80bd4978690bee02c;hpb=bab4423818d16c53d8853fe5fc313d1694bd8bb1

diff --git a/JSDOC/Collapse.js b/JSDOC/Collapse.js
index 9730949..3c9ec9e 100644
--- a/JSDOC/Collapse.js
+++ b/JSDOC/Collapse.js
@@ -1,11 +1,12 @@
 //<script type="text/javscript">
-XObject = imports.XObject.XObject;
+const XObject = imports.XObject.XObject;
 
  
-console     = imports.console.console; 
+const console     = imports.console.console; 
 
 // make sure parent is loaded..
-TokenStream = imports.TokenStream.TokenStream;
+const TokenStream = imports.TokenStream.TokenStream;
+
 /**
  * 
  * base class for parsing segments of token array..
@@ -31,14 +32,13 @@ TokenStream = imports.TokenStream.TokenStream;
  * 
  */ 
  
-Collapse = XObject.define(
+const Collapse = XObject.define(
     function (ar)
     {
-         
         Collapse.superclass.constructor.call(this, ar);
         
         this.spaces();
-        var ar = this.collapse(this.tokens);
+        ar = this.collapse(this.tokens);
         
         this.tokens = ar;
         
@@ -113,9 +113,9 @@ Collapse = XObject.define(
                                 st.next(1);
                                 var add = st.balance(tok.data);
                                 if (!add) {
-                                    console.dump(tok);
-                                    console.dump(start + '...' + st.cursor);
-                                    console.dump(st.tokens);
+                                    //console.dump(tok);
+                                    //console.dump(start + '...' + st.cursor);
+                                    //console.dump(st.tokens);
                                  
                                 }
                                 if (add) {
@@ -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 = [];
@@ -240,6 +246,7 @@ Collapse = XObject.define(
                 }
             }
              // last.. - if g.val.length is 0 then it's a trailing ','...
+             // we should really throw a syntax error in that case..
             if (k.length && g.val.length) {
                 ret[k] = g;
             }
@@ -250,4 +257,4 @@ Collapse = XObject.define(
 
     
     
-});
\ No newline at end of file
+});