JSDOC/Collapse.vala

[gnome.introspection-doc-generator] / JSDOC / Collapse.vala

diff --git a/JSDOC/Collapse.vala b/JSDOC/Collapse.vala
index 9767dc5..f06c58b 100644 (file)
--- a/JSDOC/Collapse.vala
+++ b/JSDOC/Collapse.vala
@@ -42,8 +42,11 @@ namespace JSDOC {
                   // console.dump(ar);
                    
                }
+               
+               // put spaces into prefix of tokens..
     
-        void spaces () {
+        void spaces () 
+        {
             var ar = new Gee.ArrayList<Token>()
             var pref =  new Gee.ArrayList<Token>();
             
@@ -56,30 +59,33 @@ namespace JSDOC {
                     continue;
                 }
                 tok.prefix = '';
-                if (pref.length) {
-                    pref.forEach( function(e) {
-                        if (!e) {
-                            return;
-                        }
+                if (pref.size > 0) {
+                       foreach(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(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;
                 }