X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FTokenStream.vala;h=b9291a7649feb63953e2d246ab1eed79ca29c708;hb=55f8d00207a54cf3c1939cae097c2691cb8cf93c;hp=9678fe6389bf4beb92fa816a7cbe0edc92ee8813;hpb=bf6d0a6d10c678a66790c9df8d9f04b8ade3bb5e;p=gnome.introspection-doc-generator

diff --git a/JSDOC/TokenStream.vala b/JSDOC/TokenStream.vala
index 9678fe6..b9291a7 100644
--- a/JSDOC/TokenStream.vala
+++ b/JSDOC/TokenStream.vala
@@ -58,7 +58,7 @@ namespace JSDOC {
 	            if (i < 0) {
 	        		return new Token("", "VOID", "START_OF_STREAM");
 	    		}
-	            if (i > this.tokens.size) {
+	            if (i >= this.tokens.size) {
 	        		return new Token("", "VOID", "END_OF_STREAM");
 	    		}
 
@@ -121,7 +121,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 +210,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 +224,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;
@@ -339,6 +339,16 @@ namespace JSDOC {
 		    print(outs);
 		}
 		
+		public void dumpAll(string indent)
+		{
+		    for (var i = 0;i < this.tokens.size; i++) {
+		        
+		         this.tokens[i].dump("");
+		    }
+		    
+		}
+		
+		
 	}
 }