JSDOC/Token.vala

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

diff --git a/JSDOC/Token.vala b/JSDOC/Token.vala
index 0aee6d7..4cd1f60 100644 (file)
--- a/JSDOC/Token.vala
+++ b/JSDOC/Token.vala
@@ -39,14 +39,15 @@ 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;
+           public Gee.HashMap<string,Gee.ArrayList<Token>> items;
         
         // props??? what's this???
         
@@ -59,10 +60,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()