config1.builder

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

diff --git a/JSDOC/Token.vala b/JSDOC/Token.vala
index 0bf409f..309ac4e 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,11 @@ 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>();
+            this.props = new Gee.HashMap<string,Gee.ArrayList<Token>>();
         }
     
         public string asString()
@@ -85,11 +88,11 @@ namespace JSDOC
             var ret =  this.data ;
             
             foreach(var ai in this.items ) {
-                
+                // supposed to iterate properties???
                 string str = "";
-                foreach( var it in ai) {
-                    str += it.toRaw(lvl+1);
-                }
+                //foreach( var it in ai) {
+                 //   str += it.toRaw(lvl+1);
+               // }
                 ret += str;
             }