JSDOC/Template.js

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

diff --git a/JSDOC/TokenStream.js b/JSDOC/TokenStream.js
index 687d059..b5385a6 100644 (file)
--- a/JSDOC/TokenStream.js
+++ b/JSDOC/TokenStream.js
@@ -34,7 +34,9 @@ TokenStream = Object.define(
             if (typeof n == "undefined") n = 0;
 
             if (considerWhitespace == true) {
-                if (this.cursor+n < 0 || this.cursor+n > this.tokens.length) return {};
+                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 {
@@ -92,14 +94,14 @@ TokenStream = Object.define(
             var i = this.cursor;
 
             while (true) {
-                print(i);
+               // print(i);
                 if (i < 0) {
                     if (n > -1) {
                         i = 0; continue;
                     }
-                    return false;
+                    return   new Token("", "VOID", "END_OF_STREAM");
                 }
-                else if (i > this.tokens.length) return false;
+                else 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++;
@@ -112,7 +114,7 @@ TokenStream = Object.define(
                 count++;
                 (n < 0)? i-- : i++;
             }
-
+        // should never get here..
             return false; // because null isn't an object and caller always expects an object;
             
         },