JSDOC/TokenReader.js

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

diff --git a/JSDOC/TokenStream.vala b/JSDOC/TokenStream.vala
index 83dd044..559141b 100644 (file)
--- 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,21 @@ 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 (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)
                {
@@ -235,8 +250,8 @@ namespace JSDOC {
                    //Seed.print("STOP:" + stop);
                    Token token;
                    
-                   while (null != (token = this.look(1,false))) {
-                               debug("BALANCE: " + token.asString());
+                   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++;
@@ -250,8 +265,10 @@ namespace JSDOC {
                        if (token.is(stop)) {
                            depth--;
                            
-                               print("balance (%d): STOP: %s\n"  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;
                                }
                                
@@ -353,7 +370,14 @@ namespace JSDOC {
                    }
                    
                }
-               
+               public void dumpAllFlat()
+               {
+                   for (var i = 0;i < this.tokens.size; i++) {
+                       
+                        print("%d: %s\n", i, this.tokens[i].asString());
+                   }
+                   
+               }
                
        }
 }