X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FTokenStream.vala;h=6c6f8adc087eb3b5bedfba16f74803eb2f658328;hb=35ddfbdfc0fb33aab65d6722db3948ca210ede7f;hp=885af25fd596a0bb8b044c41d1a5c5485886620c;hpb=d1a491a7db15e5b79425e7402c566cb18d9a4f9a;p=gnome.introspection-doc-generator

diff --git a/JSDOC/TokenStream.vala b/JSDOC/TokenStream.vala
index 885af25..6c6f8ad 100644
--- a/JSDOC/TokenStream.vala
+++ b/JSDOC/TokenStream.vala
@@ -28,7 +28,10 @@ namespace JSDOC {
 
 			this.rewind();
 		}
-	
+		public  Gee.ArrayList<Token> toArray()
+		{
+			return this.tokens;
+		}
 
 		
 		public void rewind() {
@@ -121,7 +124,7 @@ namespace JSDOC {
 		            }
 		            return  new Token("", "VOID", "END_OF_STREAM");
 		        }
-		        if (i > this.tokens.size) {
+		        if (i >= this.tokens.size) {
 		    		return  new Token("", "VOID", "END_OF_STREAM");
 	    		}
 
@@ -210,11 +213,11 @@ namespace JSDOC {
 		 * @param start {String}  token name or data (eg. '{'
 		 * @param stop {String} (Optional) token name or data (eg. '}'
 		 */
-		public Gee.ArrayList<Token> balance (string start, string stop = "") throws TokenStreamError 
+		public Gee.ArrayList<Token> balance (string start, string in_stop = "") throws TokenStreamError 
 		{
 		    
 		    // accepts names or "{" etc..
-		    
+		    var stop = in_stop;
 		    start = Lang.punc(start) == null ? start : Lang.punc(start);
 		    
 		    if (stop=="") {
@@ -224,7 +227,7 @@ namespace JSDOC {
 			if (stop == null) {
 				throw new TokenStreamError.ArgumentError("balance called with invalid start/stop : %s",start);
 			}
-		    
+		    debug("START=%s, STOP=%s \n", start,stop);
 		    var depth = 0;
 		    var got = new Gee.ArrayList<Token>();
 		    var started = false;
@@ -233,6 +236,7 @@ namespace JSDOC {
 		    Token token;
 		    
 		    while (null != (token = this.look(1,false))) {
+				debug("BALANCE: " + token.asString());
 		        if (token.is(start)) {
 		      //      Seed.print("balance: START : " + depth + " " + token.data);
 		            depth++;
@@ -339,6 +343,16 @@ namespace JSDOC {
 		    print(outs);
 		}
 		
+		public void dumpAll(string indent)
+		{
+		    for (var i = 0;i < this.tokens.size; i++) {
+		        
+		         this.tokens[i].dump("");
+		    }
+		    
+		}
+		
+		
 	}
 }