JSDOC/Token.vala

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

diff --git a/JSDOC/Token.vala b/JSDOC/Token.vala
index 3e544ce..41c19d7 100644 (file)
--- a/JSDOC/Token.vala
+++ b/JSDOC/Token.vala
@@ -31,6 +31,20 @@ namespace JSDOC
 {
     int Token_id = 1;
 
+
+       public class TokenKeyMap : Object {
+               public Token key;
+               public Gee.ArrayList<Token> vals;
+               
+               public TokenKeyMap()
+               {
+                       this.key = new Token("","VOID", "VOID"); 
+                       this.vals = new  Gee.ArrayList<Token>();
+               }
+               
+               
+       }
+
     public class Token : Object {
         
         int id;
@@ -43,10 +57,12 @@ namespace JSDOC
         
         public string outData;
         
-        public string identifier;
+        public Token? identifier;
         
          // used to stuff tokens together when building a tree..
         public Gee.ArrayList<Gee.ArrayList<Token>> items;
+        // for a object definition, key -> array of tokens..
+           public Gee.HashMap<string,TokenKeyMap> props;
         
         // props??? what's this???
         
@@ -63,6 +79,7 @@ namespace JSDOC
             
             
             this.items = new Gee.ArrayList<Gee.ArrayList<Token>>();
+            this.props = new Gee.HashMap<string,TokenKeyMap>();
         }
     
         public string asString()
@@ -85,11 +102,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;
             }