X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FTokenStream.vala;h=b9291a7649feb63953e2d246ab1eed79ca29c708;hp=a6608734eb18340edba1f52e9138ed7ba19f252e;hb=32210f938b140061c5af2ab70d6b0c009b723653;hpb=0f383acfe82571d2317900a6200098d34264d2c2

diff --git a/JSDOC/TokenStream.vala b/JSDOC/TokenStream.vala
index a660873..b9291a7 100644
--- a/JSDOC/TokenStream.vala
+++ b/JSDOC/TokenStream.vala
@@ -1,14 +1,3 @@
-//<script type="text/javscript">
-
-
-const XObject = imports.XObject.XObject;
- 
-
-
-const console = imports.console.console;
-const Token   = imports.Token.Token;
-const Lang    = imports.Lang.Lang;
-
 
 /**
  * @class TokenStream
@@ -19,265 +8,347 @@ const Lang    = imports.Lang.Lang;
  * lookT => lookTok
  * 
  */
+
+
+namespace JSDOC {
+
+	public errordomain TokenStreamError {
+            ArgumentError
+    }
+	public class TokenStream : Object
+	{
+	
+		protected Gee.ArrayList<Token> tokens;
+		public int cursor; // where are we in the stream.		
+	
 	
- 
-const TokenStream = XObject.define(
+		public TokenStream(Gee.ArrayList<Token> tokens) {
+		 
+			this.tokens = tokens;
+
+			this.rewind();
+		}
+	
+
+		
+		public void rewind() {
+		    this.cursor = -1;
+		}
 
-    /**
-     * @constructor
-     * 
-     * 
-     */
+		/**
+		    @type JSDOC.Token
+		*/
+		public Token? look (int n, bool considerWhitespace) 
+		{
 
-    function(tokens) {
-     
-        
-        this.tokens = (tokens || []);
-       // Seed.print(this.tokens.length);
-        this.rewind();
-    },
-    Object,
-    {
-        cursor : -1, // where are we in the stream.
-        
-        rewind : function() {
-            this.cursor = -1;
-        },
 
-        /**
-            @type JSDOC.Token
-        */
-        look : function(/**Number*/n, /**Boolean*/considerWhitespace) {
-            if (typeof n == "undefined") n = 0;
+		    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);
+		    }
+		    
 
-            if (considerWhitespace == true) {
-                if (this.cursor+n < 0 || this.cursor+n > (this.tokens.length -1)) {
-                    return new Token("", "VOID", "START_OF_STREAM");
-                }
-                return this.tokens[this.cursor+n];
-            }
-            else {
-                var count = 0;
-                var i = this.cursor;
+	        var count = 0;
+	        var i = this.cursor;
 
-                while (true) {
-                    if (i < 0) return new Token("", "VOID", "START_OF_STREAM");
-                    else if (i > this.tokens.length) return new Token("", "VOID", "END_OF_STREAM");
+	        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[i] === undefined || this.tokens[i].is("WHIT"))) {
-                        if (n < 0) i--; else i++;
-                        continue;
-                    }
-                    
-                    if (count == Math.abs(n)) {
-                        return this.tokens[i];
-                    }
-                    count++;
-                    (n < 0)? i-- : i++;
-                }
+	            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
-            }
-        },
+	       // return new Token("", "VOID", "STREAM_ERROR"); // because null isn't an object and caller always expects an object
+		    
+		}
 
-        lookFor : function (data)
-        {
-            // non tree version..
-            var i = this.cursor < 0 ? 0 : this.cursor ;
-            
-            while (true) {
-                if (i >= this.tokens.length) return -1;
-                if (this.tokens[i].data == data) {
-                    return i;
-                }
-                i++;
-                
-            }
-            // should not get here!
-            return -1;
+		public int lookFor  (string data)
+		{
+		    // non tree version..
+		    var i = this.cursor < 0 ? 0 : this.cursor ;
+		    
+		    while (true) {
+		        if (i >= this.tokens.size) {
+		    		return -1;
+	    		}
+		        if (this.tokens.get(i).data == data) {
+		            return i;
+		        }
+		        i++;
+		        
+		    }
+		    // should not get here!
+		   // return -1;
 
-        },
+		}
 
 
-        /**
-         * look ahead (or back) x number of tokens (which are not comment or whitespace)
-         * ?? used any more?
-         */
-        lookTok : function(/**Number*/n) {
-            if (typeof n == "undefined") n = 1;
+		/**
+		 * look ahead (or back) x number of tokens (which are not comment or whitespace)
+		 * ?? used any more?
+		 */
+		public Token lookTok (int n) {
 
-            
-            var count = 0;
-            var i = this.cursor;
 
-            while (true) {
-               // print(i);
-                if (i < 0) {
-                    if (n > -1) {
-                        i = 0; 
-                        count++;
-                        continue;
-                        
-                    }
-                    return   new Token("", "VOID", "END_OF_STREAM");
-                }
-                else if (i > this.tokens.length) return  new Token("", "VOID", "END_OF_STREAM");
+		    
+		    var count = 0;
+		    var i = this.cursor;
 
-                if (i != this.cursor && (this.tokens[i] === undefined || this.tokens[i].is("WHIT") || this.tokens[i].is("COMM"))) {
-                    if (n < 0) i--; else i++;
-                    continue;
-                }
-                
-                if (count == Math.abs(n)) {
-                    return this.tokens[i];
-                }
-                count++;
-                (n < 0)? i-- : i++;
-            }
-        // should never get here..
-            return false; // because null isn't an object and caller always expects an object;
-            
-        },
+		    while (true) {
+		       // print(i);
+		        if (i < 0) {
+		            if (n > -1) {
+		                i = 0; 
+		                count++;
+		                continue;
+		                
+		            }
+		            return  new Token("", "VOID", "END_OF_STREAM");
+		        }
+		        if (i >= this.tokens.size) {
+		    		return  new Token("", "VOID", "END_OF_STREAM");
+	    		}
 
-        /**
-         *  @return {Token|null}
-         * next token (with white space)
-         */
-            
-           
-        next : function(/**Number*/howMany) {
-            if (typeof howMany == "undefined") howMany = 1;
-            if (howMany < 1) return null;
-            var got = [];
+		        if (i != this.cursor && ( this.tokens.get(i).is("WHIT") || this.tokens.get(i).is("COMM"))) {
+		            i += (n < 0) ? -1 : 1;
+		            continue;
+		        }
+		        
+		        if (count == n) {
+		            return this.tokens.get(i);
+		        }
+		        count++;
+		        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;
+		    
+		}
 
-            for (var i = 1; i <= howMany; i++) {
-                if (this.cursor+i >= this.tokens.length) {
-                    return null;
-                }
-                got.push(this.tokens[this.cursor+i]);
-            }
-            this.cursor += howMany;
+		/**
+		 *  @return {Token|null}
+		 * next token (with white space)
+		 */
+		    
+		   
+		public Token? next() {
+		
+		
+		    //if (typeof howMany == "undefined") howMany = 1;
+		    // if (howMany < 1) { return  null;     		}
+		    
+		    if (this.cursor+1 >= this.tokens.size) {
+		        return null;
+	        }
+		    this.cursor++;
+		    return this.tokens.get(this.cursor);
 
-            if (howMany == 1) {
-                return got[0];
-            }
-            else return got;
-        },
-        // what about comments after 'function'...
-        // is this used ???
-        nextTok  : function() {
-            return this.nextNonSpace();
-        },
-        nextNonSpace : function ()
-        {
-            
-            while (true) {
-                tok = this.next(1);
-                if (!tok) {
-                    return false;
-                }
-                if (tok.is('WHIT') ||  tok.is('COMM')) {
-                    continue;
-                }
-                return tok;
-            }
-        },
-        /**
-         *    @type JSDOC.Token[]
-         * @param start {String}  token name or data (eg. '{'
-         * @param stop {String} (Optional) token name or data (eg. '}'
-         */
-        balance : function(/**String*/start, /**String*/stop) {
-            
-            
-            start = typeof(Lang.punc(start)) == 'undefined' ? start : Lang.punc(start);
-            
-            if (!stop) stop = Lang.matching(start);
-            
-            var depth = 0;
-            var got = [];
-            var started = false;
-            //Seed.print("START:" + start);
-            //Seed.print("STOP:" + stop);
-            while ((token = this.look())) {
-                if (token.is(start)) {
-              //      Seed.print("balance: START : " + depth + " " + token.data);
-                    depth++;
-                    started = true;
-                }
-                
-                if (started) {
-                    got.push(token);
-                }
-                
-                if (token.is(stop)) {
-                    depth--;
-                //    Seed.print("balance: STOP: "  + depth + " " + token.data);
-                    if (depth < 1) return got;
-                }
-                if (!this.next()) break;
-            }
-            return false;
-        },
+		}
+		
+ 	    public Gee.ArrayList<Token>? nextM(int howMany) throws TokenStreamError {
+		
+		    //if (typeof howMany == "undefined") howMany = 1;
+		    if (howMany < 2) { 
+				throw new  TokenStreamError.ArgumentError("nextM called with wrong number : %d", howMany);
+		    }
+		    var got = new Gee.ArrayList<Token>();
 
-        getMatchingToken : function(/**String*/start, /**String*/stop) {
-            var depth = 0;
-            var cursor = this.cursor;
-            
-            if (!start) {
-                start = Lang.matching(stop);
-                depth = 1;
-            }
-            if (!stop) stop = Lang.matching(start);
-            
-            while ((token = this.tokens[cursor])) {
-                if (token.is(start)) {
-                    depth++;
-                }
-                
-                if (token.is(stop) && cursor) {
-                    depth--;
-                    if (depth == 0) return this.tokens[cursor];
-                }
-                cursor++;
-            }
-            return false;
-        },
+		    for (var i = 1; i <= howMany; i++) {
+		        if (this.cursor+i >= this.tokens.size) {
+		            return null;
+		        }
+		        got.add(this.tokens.get(this.cursor+i));
+		    }
+		    this.cursor += howMany;
+		    
+			return got;
+		}
+		
+		
+		
+		
+		// what about comments after 'function'...
+		// is this used ???
+		public Token? nextTok() {
+		    return this.nextNonSpace();
+		}
+		
+		public Token? nextNonSpace ()
+		{
+		    
+		    while (true) {
+		        var tok = this.next();
+		        if (tok == null) {
+		            return null;
+		        }
+		        if (tok.is("WHIT") ||  tok.is("COMM")) {
+		            continue;
+		        }
+		        return tok;
+		    }
+		}
+		
+		/**
+		 *  balance 
+		 * -- returns all the tokens betweeen and including stop token eg.. from {... to  }
+		 * @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 in_stop = "") throws TokenStreamError 
+		{
+		    
+		    // accepts names or "{" etc..
+		    var stop = in_stop;
+		    start = Lang.punc(start) == null ? start : Lang.punc(start);
+		    
+		    if (stop=="") {
+				var newstop = Lang.matching(start);
+				stop = newstop;
+			}
+			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;
+		    //Seed.print("START:" + start);
+		    //Seed.print("STOP:" + stop);
+		    Token token;
+		    
+		    while (null != (token = this.look(1,false))) {
+		        if (token.is(start)) {
+		      //      Seed.print("balance: START : " + depth + " " + token.data);
+		            depth++;
+		            started = true;
+		        }
+		        
+		        if (started) {
+		            got.add(token);
+		        }
+		        
+		        if (token.is(stop)) {
+		            depth--;
+		        //    Seed.print("balance: STOP: "  + depth + " " + token.data);
+		            if (depth < 1) {
+		        		return got;
+	        		}
+		        }
+		        if (null == this.next()) {
+		    		break;
+	    		}
+		    }
+		    return new Gee.ArrayList<Token>();
+		}
 
-        insertAhead : function(/**JSDOC.Token*/token) {
-            this.tokens.splice(this.cursor+1, 0, token);
-        },
-         
-        remaining : function() {
-            var ret = [];
-            while (true) {
-                var tok = this.look(1,true);
-                if (!tok || !tok.is || tok.is('VOID')) {
-                    return ret;
-                }
-                ret.push(this.next(1));
-            }
-        },
-         
+		public Token? getMatchingToken(string start, string stop) 
+		{
+		    var depth = 0;
+		    var cursor = this.cursor;
+		    
+		    if (start.length < 1) {
+			    var ns = Lang.matching(stop);
+		        start = ns;
+		        depth = 1;
+		    }
+		    if (stop.length < 1) {
+				var ns = Lang.matching(start);
+				stop = ns;
+			}
+			Token token;
+		    
+		    while (null != (token = this.tokens[cursor])) {
+		        if (token.is(start)) {
+		            depth++;
+		        }
+		        
+		        if (token.is(stop) && cursor != 0) {
+		            depth--;
+		            if (depth == 0) {
+		        		return this.tokens[cursor];
+	        		}
+		        }
+		        cursor++;
+		    }
+		    return null;
+		}
+		/*
+		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>();
+		    while (true) {
+		        var tok = this.look(1,true);
+		        if (tok.is("VOID")) {
+		            return ret;
+		        }
+		        var nt = this.next();
+		        if (nt != null) {
+			        ret.add(nt);
+		        }
+		    }
+		}
+		 
+		 
+		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));
+		    var ret = [];
+		    ar.forEach(function(e) {
+		        ret.push(e.data);
+		    })
+		    return ret.join('');
+		},
+		*/
+		public void dump(int start, int end)
+		{
+		    start = int.max(start , 0);
+		    end = int.min(end, this.tokens.size);
+		    var  outs = "";;
+		    for (var i =start;i < end; i++) {
+		        
+		        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("");
+		    }
+		    
+		}
+		
+		
+	}
+}
 
-        arrayToString : function(ar) {
-            console.log(typeof(ar));
-            var ret = [];
-            ar.forEach(function(e) {
-                ret.push(e.data);
-            })
-            return ret.join('');
-        },
-        dump: function(start, end)
-        {
-            start = Math.max(start || 0, 0);
-            end = Math.min(end || this.tokens.length, this.tokens.length);
-            var out='';
-            for (var i =start;i < end; i++) {
-                
-                out += (this.tokens[i].outData == false) ? this.tokens[i].data : this.tokens[i].outData;
-            };
-            print(out);
-        }
-});
-