X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FTokenStream.vala;h=9f7d3110128fc13659dad3777c1b6b9f57a67515;hb=933358405c947904a19df4df39a95c675b6ded8d;hp=ad1baf2d29bef0cfa62b99e8ccc6099b1295cba0;hpb=2bccde6712b387b53f3c2df5917a5ac418a2a453;p=gnome.introspection-doc-generator

diff --git a/JSDOC/TokenStream.vala b/JSDOC/TokenStream.vala
index ad1baf2..9f7d311 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,48 @@ 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 (considerWhitespace == true) {
+		    
+		        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);
+		    }
+		    
+
+	        var count = 0;
+	        var i = this.cursor;
+
+	        while (true) {
+	            if (i < 0) {
+	        		return new Token("", "VOID", "START_OF_STREAM");
+	    		}
+	            if (i >= this.tokens.size) {
+	        		return new Token("", "VOID", "END_OF_STREAM");
+	    		}
+
+	            if (i != this.cursor && this.tokens.get(i).is("WHIT")) {
+	        		i += (n < 0) ? -1 : 1;
+	                continue;
+	            }
+	            
+	            if (count == n) {
+	                return this.tokens.get(i);
+	            }
+	            count++;
+	            i += (n < 0) ? -1 : 1;
+	        }
+
+	       // return new Token("", "VOID", "STREAM_ERROR"); // because null isn't an object and caller always expects an object
+		    
+		}
+		
+		
 
 		public int lookFor  (string data)
 		{
@@ -235,8 +277,8 @@ namespace JSDOC {
 		    //Seed.print("STOP:" + stop);
 		    Token token;
 		    
-		    while (null != (token = this.lookTok(1))) {
-				debug("BALANCE: " + token.asString());
+		    while (null != (token = this.look(1,false))) {
+				debug("BALANCE: %d %s " , this.cursor,  token.asString());
 		        if (token.is(start)) {
 		      //      Seed.print("balance: START : " + depth + " " + token.data);
 		            depth++;
@@ -249,12 +291,16 @@ namespace JSDOC {
 		        
 		        if (token.is(stop)) {
 		            depth--;
-		        //    Seed.print("balance: STOP: "  + depth + " " + token.data);
+		            
+	    			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;
 	        		}
+	        		
 		        }
-		        if (null == this.nextTok()) {
+		        if (null == this.next()) {
 		    		break;
 	    		}
 		    }
@@ -351,7 +397,14 @@ namespace JSDOC {
 		    }
 		    
 		}
-		
+		public void dumpAllFlat()
+		{
+		    for (var i = 0;i < this.tokens.size; i++) {
+		        
+		         print("%d: %s\n", i, this.tokens[i].asString());
+		    }
+		    
+		}
 		
 	}
 }