JSDOC/Collapse.vala

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

diff --git a/JSDOC/Collapse.vala b/JSDOC/Collapse.vala
index 07b9d0b..36d1e8b 100644 (file)
--- 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,47 +23,49 @@ 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) 
+               {
+                   parent(ar);;
+                   
+                   this.spaces();
+                   
+                   ar = this.collapse(this.tokens);
+                   
+                   this.tokens = ar;
+                   
+                  // console.dump(ar);
+                   
+               }
     
-        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;
-                        }
+                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;