X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FCollapse.js;h=07b9d0b2d53bffb20507450d0982d1efcdeabeba;hb=55f8d00207a54cf3c1939cae097c2691cb8cf93c;hp=e3dae4d86ccab7f7003407fc1a1588547a6f4677;hpb=d29d581b911370e5350ca88a2eecaab1ae3d7073;p=gnome.introspection-doc-generator

diff --git a/JSDOC/Collapse.js b/JSDOC/Collapse.js
index e3dae4d..07b9d0b 100644
--- a/JSDOC/Collapse.js
+++ b/JSDOC/Collapse.js
@@ -1,10 +1,12 @@
 //<script type="text/javscript">
-JSDOC   = imports['JSDOC.js'].JSDOC; 
-Roo     = imports['Roo.js'].Roo;
-console = imports['console.js'].console; 
+const XObject = imports.XObject.XObject;
+
+ 
+const console     = imports.console.console; 
 
 // make sure parent is loaded..
-TokenStream = imports['JSDOC/TokenStream.js'].TokenStream;
+const TokenStream = imports.TokenStream.TokenStream;
+
 /**
  * 
  * base class for parsing segments of token array..
@@ -23,222 +25,236 @@ TokenStream = imports['JSDOC/TokenStream.js'].TokenStream;
        [ ] - collapse into first element.
  * c) items = , seperation within the above..
  * 
- * 
+ * usage: x = new Collapse(token_array)
  * 
  * 
  * 
  * 
  */ 
-Collapse  = function (ar)
-{
-     
-    Collapse.superclass.constructor.call(this, ar);
-    
-    this.spaces();
-    var ar = this.collapse(this.tokens);
-    
-    this.tokens = ar;
-    
-   // console.dump(ar);
-    
-}
  
-Roo.extend(Collapse, TokenStream, {
-    
-    spaces : function () {
-        var ar = [];
-        var pref = [];
+const Collapse = XObject.define(
+    function (ar)
+    {
+        Collapse.superclass.constructor.call(this, ar);
         
-        var tok;
+        this.spaces();
+        ar = this.collapse(this.tokens);
         
-        for (var i = 0; i < this.tokens.length; i ++) {
-            tok = this.tokens[i];
-            if (tok.is("COMM") || tok.is("WHIT")) {
-                pref.push(tok);
-                continue;
-            }
-            tok.prefix = '';
-            if (pref.length) {
-                Roo.each(pref, function(e) {
-                    if (!e) {
-                        return;
-                    }
-                    tok.prefix += e.data;
-                })
-            }
-            
-            ar.push(tok);
-            pref=  [];
-            
-        }
         this.tokens = ar;
         
-    },
-    collapse : function(ar) {
+       // console.dump(ar);
         
-        var st = new  TokenStream(ar);
-        var ret = [];
-        
-        while (true) {
-            var  tok = st.look(1,true);
-            if (!tok || !tok.is) {
-              //  Seed.print(TokenStream.toString(ret));
-                return ret;
-            }
-           // console.log(tok.data);
-            switch(tok.type) {
-               
-                    
-                case "KEYW": 
-                case "TOKN":
-                case "NAME":
-                case "STRN":
-                case "NUMB":
-                case "REGX":
-                    ret.push(st.next(1));
+    }, 
+    TokenStream, 
+    {
+    
+        spaces : function () {
+            var ar = [];
+            var pref = [];
+            
+            var tok;
+            
+            for (var i = 0; i < this.tokens.length; i ++) {
+                tok = this.tokens[i];
+                if (tok.is("COMM") || tok.is("WHIT")) {
+                    pref.push(tok);
                     continue;
-                    
-                case "PUNC":
-                    switch (tok.data) {
-                        case "[":
-                        case "{":
-                        case "(":
-                            
-                            var start = st.cursor;
-                            st.next(1);
-                            var add = st.balance(tok.name);
-                            if (!add) {
-                                console.dump(tok);
-                                console.dump(start + '...' + st.cursor);
-                                console.dump(st.tokens);
-                             
-                            }
-                            if (add) {
-                                add.shift();
-                            }
-                            //Seed.print(TokenStream.toString(aa));
-                            
-                            
-                            var toks = add ? this.collapse(add) : [];
-                            tok.items = false;
-                            tok.props = false;
-                            
-                            if (tok.data != '{') {
-                                // paramters or array elements..
-                                tok.items = this.toItems(toks, [',']);
-                            } else {
-                                // check for types.. it could be a list of statements.. or object
+                }
+                tok.prefix = '';
+                if (pref.length) {
+                    pref.forEach( function(e) {
+                        if (!e) {
+                            return;
+                        }
+                        tok.prefix += e.data;
+                    })
+                }
+                
+                ar.push(tok);
+                pref=  [];
+                
+            }
+            this.tokens = ar;
+            
+        },
+        collapse : function(ar) {
+            
+            var st = new  TokenStream(ar);
+            var ret = [];
+            
+            while (true) {
+                var  tok = st.look(1,true);
+                if (!tok || !tok.is) {
+                  //  Seed.print(TokenStream.toString(ret));
+                    return ret;
+                }
+                // console.log(tok.data);
+                switch(tok.type) {
+                    case "VOID": 
+                        return ret; //EOF
+                        
+                        
+                    case "KEYW": 
+                    case "TOKN":
+                    case "NAME":
+                    case "STRN":
+                    case "NUMB":
+                    case "REGX":
+                        ret.push(st.next(1));
+                        continue;
+                        
+                    case "PUNC":
+                        switch (tok.data) {
+                            case "[":
+                            case "{":
+                            case "(":
+                                
+                                var start = st.cursor;
+                                st.next(1);
+                                var add = st.balance(tok.data);
+                                if (!add) {
+                                    console.dump(tok);
+                                    console.dump(start + '...' + st.cursor);
+                                    console.dump(st.tokens);
+                                 
+                                }
+                                if (add) {
+                                    add.shift();
+                                }
+                                //Seed.print("ADD");
+                                //Seed.print(JSON.stringify(add, null,4));
+                                
+                                
+                                
+                                var toks = add ? this.collapse(add) : [];
+                                tok.items = false;
+                                tok.props = false;
+                                
                                 
-                                var ost = new  TokenStream(toks);
-                                //console.dump(ost.look(2,true) );
-                                if (ost.look(2,true) && ost.look(2,true).data == ":") {
-                                    tok.props = this.toProps(toks);
+                                
+                                if (tok.data != '{') {
+                                    // paramters or array elements..
+                                    tok.items = this.toItems(toks, [',']);
                                 } else {
-                                    // list of statemetns..
-                                    tok.items = this.toItems(toks,[ ';', '{'] );;
+                                    // check for types.. it could be a list of statements.. or object
+                                    
+                                    var ost = new  TokenStream(toks);
+                                    //console.dump(ost.look(2,true) );
+                                    if (ost.look(2,true) && ost.look(2,true).data == ":") {
+                                        tok.props = this.toProps(toks);
+                                    } else {
+                                        // list of statemetns..
+                                        tok.items = this.toItems(toks,[ ';', '{'] );;
+                                    }
+                                    
+                                    
                                 }
+                                 
                                 
                                 
-                            }
-                             
-                            
-                            
-                            
-                            
-                            
-                            
-                            //Seed.print(" ADD : " + add.length  +  " ITEMS: " + tok.items.length);
-                            
-                            ret.push(tok);
-                            
-                            continue;
-               
-                        default:
-                            ret.push(st.next(1));
-                            continue;
-                    }
-                    Seed.print("OOPS");
-                    continue;
-                default : 
-                    Seed.print("OOPS");
-                    continue;
+                                
+                                
+                                
+                                
+                                //Seed.print(" ADD : " + add.length  +  " ITEMS: " + tok.items.length);
+                                
+                                ret.push(tok);
+                                
+                                continue;
+                   
+                            default:
+                                ret.push(st.next(1));
+                                continue;
+                        }
+                        Seed.print("OOPS");
+                        continue;
+                    default : 
+                        Seed.print("OOPS" + tok.type);
+                        continue;
+                }
             }
-        }
+                
+                
             
             
-        
-        
-        
-        
-        
-        
-        
-        
-    },
-    toItems : function(ar,sep)
-    {
-        var ret = [];
-        var g = [];
-          
-        for (var i = 0; i < ar.length; i ++) {
-            if (sep.indexOf(ar[i].data) < 0) {
-                g.push(ar[i]);
-                continue;
-            }
-            g.push(ar[i]);
-            ret.push(g);
-            g = [];
             
-        }
-        // last..
-        if (g.length) {
-            ret.push(g);
-        }
-        return ret;
-        
-    },
-    toProps : function(ar)
-    {
-        
-        var ret = { }
-           
-        var g = { key : '', val: [] }
-           
-        
-        var k = '';
-        var state = 0;
-        for (var i = 0; i < ar.length; i ++) {
-            
-            switch(state) {
-                case 0:
-                    k = ar[i].data;
-                    g.key = ar[i];
-                    state = 1;
-                    continue;
-                case 1:
-                    state =2; // should be ':'
+            
+            
+            
+            
+            
+        },
+        toItems : function(ar,sep)
+        {
+            var ret = [];
+            var g = [];
+              
+            for (var i = 0; i < ar.length; i ++) {
+                if (sep.indexOf(ar[i].data) < 0) {
+                    g.push(ar[i]);
                     continue;
-                case 2:
-                    g.val.push(ar[i]);
-                    if (ar[i].data != ',') {
-                        continue;
-                    }
-                    ret[k] = g;
-                    g = { key : '', val: [] }
-                    state = 0;
+                }
+                // 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 = [];
+                
+            }
+            // last..
+            if (g.length) {
+                ret.push(g);
+            }
+            return ret;
+            
+        },
+        toProps : function(ar)
+        {
+            
+            var ret = { }
+               
+            var g = { key : '', val: [] }
                
+            
+            var k = '';
+            var state = 0;
+            for (var i = 0; i < ar.length; i ++) {
+                
+                switch(state) {
+                    case 0:
+                        k = ar[i].data;
+                        g.key = ar[i];
+                        state = 1;
+                        continue;
+                    case 1:
+                        state =2; // should be ':'
+                        continue;
+                    case 2:
+                        g.val.push(ar[i]);
+                        if (ar[i].data != ',') {
+                            continue;
+                        }
+                        ret[k] = g;
+                        g = { key : '', val: [] }
+                        state = 0;
+                        continue;
+                   
+                }
             }
+             // 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;
+            
+            
         }
-         // last..
-        if (k.length) {
-            ret[k] = g;
-        }
-        return ret;
-        
-        
-    }
 
     
     
-});
\ No newline at end of file
+});