X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FCollapse.js;h=af58a917b1f4064d118c9621dfdffc84452df5a3;hb=75e06430ca5dcb9ec1aca8d4f9cc209fc37bcd0c;hp=ad0c90067ee1a70fb76b34dcd746561c2231ec4b;hpb=f9de87edee3e39e0118ad732cafbea6d5b728598;p=gnome.introspection-doc-generator

diff --git a/JSDOC/Collapse.js b/JSDOC/Collapse.js
index ad0c900..af58a91 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;
         
@@ -88,9 +88,11 @@ Collapse = XObject.define(
                   //  Seed.print(TokenStream.toString(ret));
                     return ret;
                 }
-               // console.log(tok.data);
+                // console.log(tok.data);
                 switch(tok.type) {
-                   
+                    case "VOID": 
+                        return ret; //EOF
+                        
                         
                     case "KEYW": 
                     case "TOKN":
@@ -109,23 +111,27 @@ Collapse = XObject.define(
                                 
                                 var start = st.cursor;
                                 st.next(1);
-                                var add = st.balance(tok.name);
+                                var add = st.balance(tok.data);
                                 if (!add) {
-                                    console.dump(tok);
-                                    console.dump(start + '...' + st.cursor);
-                                    console.dump(st.tokens);
+                                    Seed.print(tok);
+                                    Seed.print(start + '...' + st.cursor);
+                                    Seed.print(st.tokens);
                                  
                                 }
                                 if (add) {
                                     add.shift();
                                 }
-                                //Seed.print(TokenStream.toString(aa));
+                                //Seed.print("ADD");
+                                //Seed.print(JSON.stringify(add, null,4));
+                                
                                 
                                 
                                 var toks = add ? this.collapse(add) : [];
                                 tok.items = false;
                                 tok.props = false;
                                 
+                                
+                                
                                 if (tok.data != '{') {
                                     // paramters or array elements..
                                     tok.items = this.toItems(toks, [',']);
@@ -163,7 +169,7 @@ Collapse = XObject.define(
                         Seed.print("OOPS");
                         continue;
                     default : 
-                        Seed.print("OOPS" + token.type);
+                        Seed.print("OOPS" + tok.type);
                         continue;
                 }
             }
@@ -188,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 = [];
@@ -233,8 +245,9 @@ Collapse = XObject.define(
                    
                 }
             }
-             // last..
-            if (k.length) {
+             // 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;
             }
             return ret;
@@ -244,4 +257,4 @@ Collapse = XObject.define(
 
     
     
-});
\ No newline at end of file
+});