JSDOC/ScopeParser.vala

[gnome.introspection-doc-generator] / JSDOC / TokenStream.vala

diff --git a/JSDOC/TokenStream.vala b/JSDOC/TokenStream.vala
index 59db3a6..5c9bee8 100644 (file)
--- a/JSDOC/TokenStream.vala
+++ b/JSDOC/TokenStream.vala
@@ -12,6 +12,9 @@
 
 namespace JSDOC {
 
+       public errordomain TokenStreamError {
+            ArgumentError
+    }
        public class TokenStream : Object
        {
        
@@ -71,7 +74,7 @@ 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
                    
                }
 
@@ -91,7 +94,7 @@ namespace JSDOC {
                        
                    }
                    // should not get here!
-                   return -1;
+                  // return -1;
 
                }
 
@@ -118,7 +121,7 @@ namespace JSDOC {
                            }
                            return  new Token("", "VOID", "END_OF_STREAM");
                        }
-                       if (i > this.tokens.length) {
+                       if (i > this.tokens.size) {
                                return  new Token("", "VOID", "END_OF_STREAM");
                        }
 
@@ -134,7 +137,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;
                    
                }
 
@@ -158,11 +161,11 @@ namespace JSDOC {
 
                }
                
-           public Gee.ArrayList<Token> nextM(uint howMany) {
+           public Gee.ArrayList<Token>? nextM(int howMany) throws TokenStreamError {
                
                    //if (typeof howMany == "undefined") howMany = 1;
                    if (howMany < 2) { 
-                               throw new JSDOC.TokenStreamError("nextM called with wrong number : %d",howMany);
+                               throw new  TokenStreamError.ArgumentError("nextM called with wrong number : %d", howMany);
                    }
                    var got = new Gee.ArrayList<Token>();
 
@@ -190,7 +193,7 @@ namespace JSDOC {
                {
                    
                    while (true) {
-                       tok = this.next();
+                       var tok = this.next();
                        if (tok == null) {
                            return null;
                        }
@@ -202,21 +205,24 @@ namespace JSDOC {
                }
                
                /**
-                *    @type JSDOC.Token[]
+                *  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 void balance (string start, string stop = "") {
+               public Gee.ArrayList<Token> balance (string start, string stop = "") throws TokenStreamError 
+               {
                    
                    // accepts names or "{" etc..
                    
-                   start = Lang.punc(start)) == null ? start : Lang.punc(start);
+                   start = Lang.punc(start) == null ? start : Lang.punc(start);
                    
                    if (stop=="") {
-                               stop = Lang.matching(start);
+                               var newstop = Lang.matching(start);
+                               stop = newstop;
                        }
                        if (stop == null) {
-                               throw new JSDOC.TokenStreamError("balance called with invalid start/stop : %s",start);
+                               throw new TokenStreamError.ArgumentError("balance called with invalid start/stop : %s",start);
                        }
                    
                    var depth = 0;
@@ -224,8 +230,9 @@ namespace JSDOC {
                    var started = false;
                    //Seed.print("START:" + start);
                    //Seed.print("STOP:" + stop);
+                   Token token;
                    
-                   while ((token = this.look())) {
+                   while (null != (token = this.look(1,false))) {
                        if (token.is(start)) {
                      //      Seed.print("balance: START : " + depth + " " + token.data);
                            depth++;
@@ -233,7 +240,7 @@ namespace JSDOC {
                        }
                        
                        if (started) {
-                           got.push(token);
+                           got.add(token);
                        }
                        
                        if (token.is(stop)) {
@@ -243,51 +250,66 @@ namespace JSDOC {
                                        return got;
                                }
                        }
-                       if (!this.next()) break;
+                       if (null == this.next()) {
+                               break;
+                       }
                    }
-                   return false;
-               },
+                   return new Gee.ArrayList<Token>();
+               }
 
-               getMatchingToken : function(/**String*/start, /**String*/stop) {
+               public Token? getMatchingToken(string start, string stop) 
+               {
                    var depth = 0;
                    var cursor = this.cursor;
                    
-                   if (!start) {
-                       start = Lang.matching(stop);
+                   if (start.length < 1) {
+                           var ns = Lang.matching(stop);
+                       start = ns;
                        depth = 1;
                    }
-                   if (!stop) stop = Lang.matching(start);
+                   if (stop.length < 1) {
+                               var ns = Lang.matching(start);
+                               stop = ns;
+                       }
+                       Token token;
                    
-                   while ((token = this.tokens[cursor])) {
+                   while (null != (token = this.tokens[cursor])) {
                        if (token.is(start)) {
                            depth++;
                        }
                        
-                       if (token.is(stop) && cursor) {
+                       if (token.is(stop) && cursor != 0) {
                            depth--;
-                           if (depth == 0) return this.tokens[cursor];
+                           if (depth == 0) {
+                                       return this.tokens[cursor];
+                               }
                        }
                        cursor++;
                    }
-                   return false;
-               },
-
-               insertAhead : function(/**JSDOC.Token*/token) {
-                   this.tokens.splice(this.cursor+1, 0, token);
-               },
+                   return null;
+               }
+               /*
+               public Gee.ArrayList<Token> insertAhead(Token token) 
+               {
+                   this.tokens.splice(this.cursor+1, 0, token); // fixme...
+               }
+               */
                 
-               remaining : function() {
-                   var ret = [];
+               public Gee.ArrayList<Token> remaining() {
+                   var ret = new Gee.ArrayList<Token>();
                    while (true) {
                        var tok = this.look(1,true);
-                       if (!tok || !tok.is || tok.is('VOID')) {
+                       if (tok.is("VOID")) {
                            return ret;
                        }
-                       ret.push(this.next(1));
+                       var nt = this.next();
+                       if (nt != null) {
+                               ret.add(nt);
+                       }
                    }
-               },
+               }
                 
-
+               /*
                arrayToString : function(ar) {
                    console.log(typeof(ar));
                    var ret = [];
@@ -307,5 +329,7 @@ namespace JSDOC {
                    };
                    print(out);
                }
-});
+               */
+       }
+}