X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FTokenStream.vala;h=b7ba8ab84574595e6aee561d4dd653521ccfa63d;hb=dad53f90789b90b0767d049a5c449b305d64941b;hp=10a8b98f75bd0a31a047f854b4ac73a04407ca71;hpb=e80166c6012671cf8c2956f1fa5f943669bff60e;p=gnome.introspection-doc-generator

diff --git a/JSDOC/TokenStream.vala b/JSDOC/TokenStream.vala
index 10a8b98..b7ba8ab 100644
--- a/JSDOC/TokenStream.vala
+++ b/JSDOC/TokenStream.vala
@@ -41,7 +41,7 @@ namespace JSDOC {
 		/**
 		    @type JSDOC.Token
 		*/
-		public Token? look (int n, bool considerWhitespace) 
+		public Token? look (int n, bool considerWhitespace)  // depricated... causes all sorts of problems...
 		{
 
 
@@ -80,6 +80,21 @@ namespace JSDOC {
 	       // return new Token("", "VOID", "STREAM_ERROR"); // because null isn't an object and caller always expects an object
 		    
 		}
+		// look through token stream, including white space...
+		public Token  lookAny (int n)
+		{
+
+
+		         if (this.cursor+n < 0 || this.cursor+n > (this.tokens.size -1)) {
+		            return new Token("", "VOID", "START_OF_STREAM");
+		        }
+		        return this.tokens.get(this.cursor+n);
+		    }
+		    
+  
+		}
+		
+		
 
 		public int lookFor  (string data)
 		{
@@ -236,7 +251,7 @@ namespace JSDOC {
 		    Token token;
 		    
 		    while (null != (token = this.look(1,false))) {
-				debug("BALANCE: " + token.asString());
+				debug("BALANCE: %d %s " , this.cursor,  token.asString());
 		        if (token.is(start)) {
 		      //      Seed.print("balance: START : " + depth + " " + token.data);
 		            depth++;
@@ -252,6 +267,8 @@ namespace JSDOC {
 		            
 	    			print("balance (%d): STOP: %s\n" ,  depth ,  token.data);
 		            if (depth < 1) {
+			            this.next(); // shift cursor to eat closer...
+		        		print("returning got %d\n", got.size);
 		        		return got;
 	        		}
 	        		
@@ -353,7 +370,14 @@ namespace JSDOC {
 		    }
 		    
 		}
-		
+		public void dumpAllFlat()
+		{
+		    for (var i = 0;i < this.tokens.size; i++) {
+		        
+		         print("%d: %s\n", i, this.tokens[i].asString());
+		    }
+		    
+		}
 		
 	}
 }