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

diff --git a/JSDOC/TokenStream.vala b/JSDOC/TokenStream.vala
index bdf7577..9f7d311 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() {
@@ -38,7 +41,47 @@ 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...
+		{
+
+
+		    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
+		    
+		}
+		// look through token stream, including white space...
+		public Token? lookAny (int n)
 		{
 
 
@@ -77,6 +120,8 @@ namespace JSDOC {
 	       // return new Token("", "VOID", "STREAM_ERROR"); // because null isn't an object and caller always expects an object
 		    
 		}
+		
+		
 
 		public int lookFor  (string data)
 		{
@@ -210,11 +255,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 +269,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 +278,7 @@ namespace JSDOC {
 		    Token token;
 		    
 		    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++;
@@ -245,10 +291,14 @@ 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.next()) {
 		    		break;
@@ -339,6 +389,23 @@ namespace JSDOC {
 		    print(outs);
 		}
 		
+		public void dumpAll(string indent)
+		{
+		    for (var i = 0;i < this.tokens.size; i++) {
+		        
+		         this.tokens[i].dump("");
+		    }
+		    
+		}
+		public void dumpAllFlat()
+		{
+		    for (var i = 0;i < this.tokens.size; i++) {
+		        
+		         print("%d: %s\n", i, this.tokens[i].asString());
+		    }
+		    
+		}
+		
 	}
 }