X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FTokenStream.vala;h=d1f0f9b15b70548a0b51026eda07d554d4d36863;hb=9b3662de58f362ee6afc1d3fb343e8d4d2b3ad7a;hp=655a5c653d9fb3c34a0b9f71d2e0a01172e1a72e;hpb=e3f5c4580ac05d64c5211ce74f062d384200a8d1;p=gnome.introspection-doc-generator

diff --git a/JSDOC/TokenStream.vala b/JSDOC/TokenStream.vala
index 655a5c6..d1f0f9b 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() {
@@ -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;
@@ -232,7 +235,8 @@ namespace JSDOC {
 		    //Seed.print("STOP:" + stop);
 		    Token token;
 		    
-		    while (null != (token = this.look(1,false))) {
+		    while (null != (token = this.lookTok(1))) {
+				debug("BALANCE: " + token.asString());
 		        if (token.is(start)) {
 		      //      Seed.print("balance: START : " + depth + " " + token.data);
 		            depth++;
@@ -341,11 +345,11 @@ namespace JSDOC {
 		
 		public void dumpAll(string indent)
 		{
-		    for (var i = 0;i < this.tokens.length; i++) {
+		    for (var i = 0;i < this.tokens.size; i++) {
 		        
-		        print("%s%s\n",indent, this.tokens[i].asString());
+		         this.tokens[i].dump("");
 		    }
-		    print(outs);
+		    
 		}