X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FCollapse.vala;h=2f883f3687ac20ca95dde372087457909c2a99a1;hb=5952f0a864405366d4da4951db2c01f207b82b35;hp=07b9d0b2d53bffb20507450d0982d1efcdeabeba;hpb=a1e6c7edfe43310769e230822734a2bbb191576e;p=gnome.introspection-doc-generator

diff --git a/JSDOC/Collapse.vala b/JSDOC/Collapse.vala
index 07b9d0b..2f883f3 100644
--- a/JSDOC/Collapse.vala
+++ b/JSDOC/Collapse.vala
@@ -1,11 +1,3 @@
-//<script type="text/javscript">
-const XObject = imports.XObject.XObject;
-
- 
-const console     = imports.console.console; 
-
-// make sure parent is loaded..
-const TokenStream = imports.TokenStream.TokenStream;
 
 /**
  * 
@@ -31,64 +23,78 @@ const TokenStream = imports.TokenStream.TokenStream;
  * 
  * 
  */ 
- 
-const Collapse = XObject.define(
-    function (ar)
-    {
-        Collapse.superclass.constructor.call(this, ar);
-        
-        this.spaces();
-        ar = this.collapse(this.tokens);
-        
-        this.tokens = ar;
-        
-       // console.dump(ar);
-        
-    }, 
-    TokenStream, 
-    {
+
+namespace JSDOC {
+
+	public class  Collapse : TokenStream  {
+
+
+
+
+		public Collapse(Gee.ArrayList<Token> tokens) 
+		{
+		    base(tokens);
+		    
+		    this.spaces();
+		    
+		    var ar = this.collapse(this.tokens);
+		    
+		    this.tokens = ar;
+		    
+		   // console.dump(ar);
+		    
+		}
+		
+		// put spaces into prefix of tokens..
     
-        spaces : function () {
-            var ar = [];
-            var pref = [];
+        void spaces () 
+        {
+            var ar = new Gee.ArrayList<Token>();
+            var pref =  new Gee.ArrayList<Token>();
             
-            var tok;
+			
             
-            for (var i = 0; i < this.tokens.length; i ++) {
-                tok = this.tokens[i];
+            for (var i = 0; i < this.tokens.size; i ++) {
+                var tok = this.tokens[i];
                 if (tok.is("COMM") || tok.is("WHIT")) {
-                    pref.push(tok);
+                    pref.add(tok);
                     continue;
                 }
-                tok.prefix = '';
-                if (pref.length) {
-                    pref.forEach( function(e) {
-                        if (!e) {
-                            return;
-                        }
+                tok.prefix = "";
+                if (pref.size > 0) {
+            		foreach(var e in pref) {
                         tok.prefix += e.data;
-                    })
+                    }
+                    pref =  new Gee.ArrayList<Token>(); // reset pref..
                 }
                 
-                ar.push(tok);
-                pref=  [];
+                ar.add(tok);
+                
+
                 
             }
             this.tokens = ar;
             
-        },
-        collapse : function(ar) {
+        }
+        
+        
+        
+        Gee.ArrayList<Token>  collapse(Gee.ArrayList<Token>  ar) 
+        {
             
-            var st = new  TokenStream(ar);
-            var ret = [];
+            var st = new TokenStream(ar);
+            var ret = new Gee.ArrayList<Token>();
             
             while (true) {
                 var  tok = st.look(1,true);
-                if (!tok || !tok.is) {
+                if (tok == null) {
                   //  Seed.print(TokenStream.toString(ret));
                     return ret;
                 }
                 // console.log(tok.data);
+                
+                debug("COL: %s", tok.asString());
+                
                 switch(tok.type) {
                     case "VOID": 
                         return ret; //EOF
@@ -100,7 +106,10 @@ const Collapse = XObject.define(
                     case "STRN":
                     case "NUMB":
                     case "REGX":
-                        ret.push(st.next(1));
+                		var nn = st.next();
+                		if (nn != null) { 
+	                        ret.add(nn);
+                        }
                         continue;
                         
                     case "PUNC":
@@ -110,41 +119,48 @@ const Collapse = XObject.define(
                             case "(":
                                 
                                 var start = st.cursor;
-                                st.next(1);
+                                //st.next(); << no need to shift, balance will start at first character..
+                                
                                 var add = st.balance(tok.data);
-                                if (!add) {
-                                    console.dump(tok);
-                                    console.dump(start + '...' + st.cursor);
-                                    console.dump(st.tokens);
+                                
+                                debug("BALANCE returned %d items\n", add.size);
+                                
+                                
+                               // if (!add) {
+                                    //console.dump(tok);
+                                    //console.dump(start + '...' + st.cursor);
+                                    //console.dump(st.tokens);
                                  
-                                }
-                                if (add) {
-                                    add.shift();
+                                //}
+                                if (add.size > 0) {
+                               		add.remove_at(0);  // remove the first element... (as it's the 
                                 }
                                 //Seed.print("ADD");
                                 //Seed.print(JSON.stringify(add, null,4));
                                 
                                 
                                 
-                                var toks = add ? this.collapse(add) : [];
-                                tok.items = false;
-                                tok.props = false;
-                                
+                                var toks = add.size > 0 ? this.collapse(add) : add;
                                 
+                                tok.items = new Gee.ArrayList<Gee.ArrayList<Token>>(); //?? needed?
+                                tok.props = new Gee.HashMap<string,TokenKeyMap>();
+                                 
                                 
-                                if (tok.data != '{') {
+                                if (tok.data != "{") {
                                     // paramters or array elements..
-                                    tok.items = this.toItems(toks, [',']);
+                                    tok.items = this.toItems(toks, ",");
                                 } else {
                                     // check for types.. it could be a list of statements.. or object
+                                    // format "{" "xXXX" ":" << looks for the ':'.. seems to work.. not sure if it's foolproof...
                                     
                                     var ost = new  TokenStream(toks);
                                     //console.dump(ost.look(2,true) );
-                                    if (ost.look(2,true) && ost.look(2,true).data == ":") {
+                                    if (ost.look(2,true) != null && ost.look(2,true).data == ":") {
+                                		// object properties...
                                         tok.props = this.toProps(toks);
                                     } else {
                                         // list of statemetns..
-                                        tok.items = this.toItems(toks,[ ';', '{'] );;
+                                        tok.items = this.toItems(toks, ";{");;
                                     }
                                     
                                     
@@ -158,18 +174,18 @@ const Collapse = XObject.define(
                                 
                                 //Seed.print(" ADD : " + add.length  +  " ITEMS: " + tok.items.length);
                                 
-                                ret.push(tok);
+                                ret.add(tok);
                                 
                                 continue;
                    
                             default:
-                                ret.push(st.next(1));
+                                ret.add(st.next());
                                 continue;
                         }
-                        Seed.print("OOPS");
+                       print("OOPS");
                         continue;
                     default : 
-                        Seed.print("OOPS" + tok.type);
+                       print("OOPS" + tok.type);
                         continue;
                 }
             }
@@ -183,63 +199,65 @@ const Collapse = XObject.define(
             
             
             
-        },
-        toItems : function(ar,sep)
+        }
+        // array of arrays of tokens
+        Gee.ArrayList<Gee.ArrayList<Token>>  toItems(Gee.ArrayList<Token>  ar, string sep)
         {
-            var ret = [];
-            var g = [];
+            var ret = new Gee.ArrayList<Gee.ArrayList<Token>>() ;
+            var g =  new Gee.ArrayList<Token>() ;
               
-            for (var i = 0; i < ar.length; i ++) {
-                if (sep.indexOf(ar[i].data) < 0) {
-                    g.push(ar[i]);
+            for (var i = 0; i < ar.size; i ++) {
+                if (sep.index_of(ar.get(i).data) < 0) {
+                    g.add(ar.get(i));
                     continue;
                 }
                 // var a=..., b =...
-                if ((ar[i].data != ';') && g.length && (g[0].name == "VAR")) {;
-                    g.push(ar[i]);
+                if ((ar.get(i).data != ";") && g.size> 0  && (g[0].name == "VAR")) {;
+                    g.add(ar.get(i));
                     continue;
                 }
                 
-                g.push(ar[i]);
-                ret.push(g);
-                g = [];
+                g.add(ar.get(i));
+                ret.add(g);
+                g =  new Gee.ArrayList<Token>() ;
                 
             }
             // last..
-            if (g.length) {
-                ret.push(g);
+            if (g.size > 0) {
+                ret.add(g);
             }
             return ret;
             
-        },
-        toProps : function(ar)
+        }
+        
+        Gee.HashMap<string,TokenKeyMap> toProps (Gee.ArrayList<Token> ar)
         {
             
-            var ret = { }
+            var ret = new Gee.HashMap<string,TokenKeyMap>();
                
-            var g = { key : '', val: [] }
+            var g = new TokenKeyMap();
                
             
-            var k = '';
+            var k = "";
             var state = 0;
-            for (var i = 0; i < ar.length; i ++) {
+            for (var i = 0; i < ar.size; i ++) {
                 
                 switch(state) {
                     case 0:
-                        k = ar[i].data;
-                        g.key = ar[i];
+                        k = ar.get(i).data;
+                        g.key = ar.get(i);
                         state = 1;
                         continue;
                     case 1:
                         state =2; // should be ':'
                         continue;
                     case 2:
-                        g.val.push(ar[i]);
-                        if (ar[i].data != ',') {
+                        g.vals.add( ar.get(i));
+                        if ( ar.get(i).data != ",") {
                             continue;
                         }
-                        ret[k] = g;
-                        g = { key : '', val: [] }
+                        ret.set(k, g);
+                        g = new TokenKeyMap();
                         state = 0;
                         continue;
                    
@@ -247,14 +265,14 @@ const 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;
+            if (k.length > 0 && g.vals.size > 0) {
+                ret.set(k, g);
             }
             return ret;
             
             
         }
 
+	}   
     
-    
-});
+}