X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FTokenStream.vala;h=559141b51151534cb95362adc91f5f513b28ffba;hb=1fb557f3ddb7252bc458aa941d32f8541a36d5ed;hp=723b4a8722ab5213b3284607e77e65526a3e236a;hpb=b1389d9404e2a0a070538657a0dbc9fa07851c7f;p=gnome.introspection-doc-generator

diff --git a/JSDOC/TokenStream.vala b/JSDOC/TokenStream.vala
index 723b4a8..559141b 100644
--- a/JSDOC/TokenStream.vala
+++ b/JSDOC/TokenStream.vala
@@ -18,8 +18,8 @@ namespace JSDOC {
 	public class TokenStream : Object
 	{
 	
-		Gee.ArrayList<Token> tokens;
-		int cursor; // where are we in the stream.		
+		protected Gee.ArrayList<Token> tokens;
+		public int cursor; // where are we in the stream.		
 	
 	
 		public TokenStream(Gee.ArrayList<Token> tokens) {
@@ -28,7 +28,10 @@ namespace JSDOC {
 
 			this.rewind();
 		}
-	
+		public  Gee.ArrayList<Token> toArray()
+		{
+			return this.tokens;
+		}
 
 		
 		public void rewind() {
@@ -38,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...
 		{
 
 
@@ -58,7 +61,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");
 	    		}
 
@@ -74,9 +77,24 @@ namespace JSDOC {
 	            i += (n < 0) ? -1 : 1;
 	        }
 
-	        return new Token("", "VOID", "STREAM_ERROR"); // because null isn't an object and caller always expects an object
+	       // 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)
 		{
@@ -94,7 +112,7 @@ namespace JSDOC {
 		        
 		    }
 		    // should not get here!
-		    return -1;
+		   // return -1;
 
 		}
 
@@ -121,7 +139,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");
 	    		}
 
@@ -137,7 +155,7 @@ namespace JSDOC {
 		        i += (n < 0) ? -1 : 1;
 		    }
 		// should never get here..
-		    return  new Token("", "VOID", "END_OF_STREAM");; // because null isn't an object and caller always expects an object;
+		//    return  new Token("", "VOID", "END_OF_STREAM");; // because null isn't an object and caller always expects an object;
 		    
 		}
 
@@ -210,11 +228,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 +242,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 +250,8 @@ namespace JSDOC {
 		    //Seed.print("STOP:" + stop);
 		    Token token;
 		    
-		    while (null != (token = this.look(1,false))) {
+		    while (null != (token = this.lookAny(1))) {
+				debug("BALANCE: %d %s " , this.cursor,  token.asString());
 		        if (token.is(start)) {
 		      //      Seed.print("balance: START : " + depth + " " + token.data);
 		            depth++;
@@ -245,10 +264,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;
@@ -288,10 +311,12 @@ namespace JSDOC {
 		    }
 		    return null;
 		}
-
-		public Gee.ArrayList<Token> insertAhead(Token token) {
+		/*
+		public Gee.ArrayList<Token> insertAhead(Token token) 
+		{
 		    this.tokens.splice(this.cursor+1, 0, token); // fixme...
 		}
+		*/
 		 
 		public Gee.ArrayList<Token> remaining() {
 		    var ret = new Gee.ArrayList<Token>();
@@ -307,6 +332,14 @@ namespace JSDOC {
 		    }
 		}
 		 
+		 
+		public void printRange(int start,  int end) {
+			
+			for(var i = start; i < end +1; i++) {
+	            print(this.tokens.get(i).asString());
+			} 
+		}
+		 
 		/*
 		arrayToString : function(ar) {
 		    console.log(typeof(ar));
@@ -316,18 +349,36 @@ namespace JSDOC {
 		    })
 		    return ret.join('');
 		},
-		dump: function(start, end)
+		*/
+		public void dump(int start, int end)
 		{
-		    start = Math.max(start || 0, 0);
-		    end = Math.min(end || this.tokens.length, this.tokens.length);
-		    var out='';
+		    start = int.max(start , 0);
+		    end = int.min(end, this.tokens.size);
+		    var  outs = "";;
 		    for (var i =start;i < end; i++) {
 		        
-		        out += (this.tokens[i].outData == false) ? this.tokens[i].data : this.tokens[i].outData;
-		    };
-		    print(out);
+		        outs += (this.tokens[i].outData == "") ? this.tokens[i].data : this.tokens[i].outData;
+		    }
+		    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());
+		    }
+		    
+		}
+		
 	}
 }