X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FToken.vala;h=a3ba98b93aedfc0a691c9b7de794e3a16f94e0d6;hp=a31bbfa5b66e9c8e1ce2cf2f88fe8b073763c191;hb=HEAD;hpb=63e687b599885f19ead968364b93972f040c523d

diff --git a/JSDOC/Token.vala b/JSDOC/Token.vala
index a31bbfa..a3ba98b 100644
--- a/JSDOC/Token.vala
+++ b/JSDOC/Token.vala
@@ -31,9 +31,23 @@ 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;
+        public int id;
         
         public string data;
         public string type;
@@ -43,12 +57,12 @@ namespace JSDOC
         
         public string outData;
         
-        public string identifier;
+        public Identifier identifier;
         
          // used to stuff tokens together when building a tree..
-        public Gee.ArrayList<Token> items;
+        public Gee.ArrayList<Gee.ArrayList<Token>> items;
         // for a object definition, key -> array of tokens..
-	    public Gee.HashMap<string,Gee.ArrayList<Token>> props;
+	    public Gee.HashMap<string,TokenKeyMap> props;
         
         // props??? what's this???
         
@@ -59,28 +73,58 @@ namespace JSDOC
             this.name = name;
             this.line = line;
             this.prefix = "";    
-            this.outData = null; // used by packer/scopeparser
+            this.outData = ""; // used by packer/scopeparser
             this.identifier = null; // used by scope
             this.id = Token_id++;
             
             
-            this.items = new Gee.ArrayList<Gee.ArrayList<Token>()>;
-            this.props = new Gee.HashMap<string,Gee.ArrayList<Token>>();
+            this.items = new Gee.ArrayList<Gee.ArrayList<Token>>();
+            this.props = new Gee.HashMap<string,TokenKeyMap>();
         }
     
         public string asString()
         {
-            return "line:%d, type %s, name %s, data : %s , outData: %s".printf(
+            return "line:%d, id %d, type %s, data : %s,  name %s, , outData: %s".printf(
                     this.line,
+                    this.id,
                     this.type,
-                    this.name,
                     this.data,
+                    this.name,
                     this.outData == null ? "" : this.outData
             );
             
         }
         
         
+        public void dump(string indent)
+		{
+	        print("%s%s\n",indent, this.asString());
+	        if (this.items.size > 0) {
+		        
+				for (var i = 0;i < this.items.size; i++) {
+			        print("%s --ITEMS[%d] [ \n",indent,i);
+					for (var j = 0;j < this.items[i].size; j++) {
+						this.items[i][j].dump(indent + "  ");
+					}
+				}
+			}
+			if (this.props.size > 0) {
+				var m = this.props.map_iterator();
+				while(m.next()) {
+			        print("%s --KEY %s ::  \n",indent,m.get_key());
+			        var vals = m.get_value().vals;
+		   			for (var i = 0;i < vals.size; i++) {
+
+						vals[i].dump(indent + "  ");
+					}
+				}
+			
+			
+			}
+			
+		}
+        
+        
         public string toRaw(int lvl = 0)
         {