JSDOC/Token.vala

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

diff --git a/JSDOC/Token.vala b/JSDOC/Token.vala
index cbcbc37..681f1c6 100644 (file)
--- a/JSDOC/Token.vala
+++ b/JSDOC/Token.vala
@@ -39,18 +39,20 @@ namespace JSDOC
         public string type;
         public string name;
         public int line;
-        public string prefix;
+        public string prefix; // white space prefix... (when outputing with WS)
         
         public string outData;
         
         public string identifier;
         
          // used to stuff tokens together when building a tree..
-        public Gee.ArrayList<Gee.ArrayList<Token>> items;
+        public Gee.ArrayList<Token> items;
+        // for a object definition, key -> array of tokens..
+           public Gee.HashMap<string,Gee.ArrayList<Token>> props;
         
         // props??? what's this???
         
-        public Token(string data, string type, string name, int line)
+        public Token(string data, string type, string name, int line = -1)
         {
             this.data = data;
             this.type = type;
@@ -59,10 +61,10 @@ namespace JSDOC
             this.prefix = "";    
             this.outData = null; // used by packer/scopeparser
             this.identifier = null; // used by scope
-            this.id = tokid++;
+            this.id = Token_id++;
             
             
-            this.items = new Gee.ArrayList<Gee.ArrayList<Token>>();
+            this.items = new Gee.ArrayList<Token>();
         }
     
         public string asString()
@@ -73,18 +75,18 @@ namespace JSDOC
                     this.name,
                     this.data,
                     this.outData == null ? "" : this.outData
-            )
+            );
             
         }
         
         
-        public string toRaw : function(int lvl = 0)
+        public string toRaw(int lvl = 0)
         {
             
             
             var ret =  this.data ;
             
-            forach(var ai in this.items ) {
+            foreach(var ai in this.items ) {
                 
                 string str = "";
                 foreach( var it in ai) {
@@ -108,7 +110,7 @@ namespace JSDOC
             
             return this.prefix +   ret;
              
-        },
+        }
         /*
         toJS : function() {
             
@@ -126,5 +128,6 @@ namespace JSDOC
         public bool is(string what) {
             return this.name == what || this.type == what;
         }
-});
+    }
+}
   
\ No newline at end of file