JSDOC/Token.vala

diff --git a/JSDOC/Token.vala b/JSDOC/Token.vala
index 23b8425..4942d15 100644 (file)
--- a/JSDOC/Token.vala
+++ b/JSDOC/Token.vala
@@ -35,7 +35,7 @@ namespace JSDOC
         
         int id;
         
-        public  string data;
+        public string data;
         public string type;
         public string name;
         public int line;
@@ -45,8 +45,10 @@ namespace JSDOC
         
         public string identifier;
         
-        // this.items???
+         // used to stuff tokens together when building a tree..
+        public Gee.ArrayList<Gee.ArrayList<Token>> items;
         
+        // props??? what's this???
         
         public Token(string data, string type, string name, int line)
         {
@@ -58,6 +60,9 @@ namespace JSDOC
             this.outData = null; // used by packer/scopeparser
             this.identifier = null; // used by scope
             this.id = tokid++;
+            
+            
+            this.items = new Gee.ArrayList<Gee.ArrayList<Token>>();
         }
     
         public string asString()
@@ -79,21 +84,16 @@ namespace JSDOC
             
             var ret =  this.data ;
             
-            
-            if (this.items) {
-                var ar = [];
-                this.items.forEach(  function(ai) {
-                    
-                    var str = '';
-                    ai.forEach(  function(it) {
-                        str += it.toRaw(lvl + 1);
-                    })
-                    ar.push(str);
-                    
-                })
-                ret +=   ar.join('');
+            forach(var ai in this.items ) {
                 
+                string str = "";
+                foreach( var it in ai) {
+                    str += it.toRaw(lvl+1);
+                }
+                ret += str;
             }
+            
+            /* -- what is a prop..
             if (this.props) {
                 for (var i in this.props) {
                     ret += this.props[i].key.toRaw(lvl+1) + ' : ';
@@ -104,12 +104,12 @@ namespace JSDOC
                 }
             }
             
-            
+            */
             
             return this.prefix +   ret;
              
         },
-
+        /*
         toJS : function() {
             
             try {
@@ -120,11 +120,11 @@ namespace JSDOC
                 return "ERROR unparsable" + this.data;
             }
         },
-         
+        */
                         
 
-        is : function(what) {
-            return this.name === what || this.type === what;
+        public bool is(string what) {
+            return this.name == what || this.type == what;
         }
 });
 Token.id = 0;     
\ No newline at end of file