JSDOC/TokenStream.vala

diff --git a/JSDOC/TokenStream.vala b/JSDOC/TokenStream.vala
index bee4922..51942dd 100644 (file)
--- a/JSDOC/TokenStream.vala
+++ b/JSDOC/TokenStream.vala
@@ -100,7 +100,7 @@ namespace JSDOC {
             * look ahead (or back) x number of tokens (which are not comment or whitespace)
             * ?? used any more?
             */
-           public Token? lookTok (int n) {
+           public Token lookTok (int n) {
 
 
                
@@ -116,12 +116,14 @@ namespace JSDOC {
                            continue;
                            
                        }
-                       return   new Token("", "VOID", "END_OF_STREAM");
+                       return  new Token("", "VOID", "END_OF_STREAM");
                    }
-                   else if (i > this.tokens.length) return  new Token("", "VOID", "END_OF_STREAM");
+                   if (i > this.tokens.length) {
+                               return  new Token("", "VOID", "END_OF_STREAM");
+                       }
 
-                   if (i != this.cursor && (this.tokens[i] === undefined || this.tokens[i].is("WHIT") || this.tokens[i].is("COMM"))) {
-                       if (n < 0) i--; else i++;
+                   if (i != this.cursor && ( this.tokens.get(i).is("WHIT") || this.tokens.get(i).is("COMM"))) {
+                       i += (n < 0) ? -1 : 1;
                        continue;
                    }