JSDOC/TokenReader.vala

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

diff --git a/JSDOC/TokenReader.vala b/JSDOC/TokenReader.vala
index 8bf3716..5922d11 100644 (file)
--- a/JSDOC/TokenReader.vala
+++ b/JSDOC/TokenReader.vala
@@ -90,12 +90,9 @@ namespace JSDOC {
             var tokens = new TokenArray();
            
             bool eof;
-            while (true) {
+            while (!stream.lookEOF()) {
+                
                 
-                stream.look(0, out eof) 
-                if (eof) {
-                    break;
-                }
                 if (this.read_mlcomment(stream, tokens)) continue;
                 if (this.read_slcomment(stream, tokens)) continue;
                 if (this.read_dbquote(stream, tokens))   continue;
@@ -127,7 +124,8 @@ namespace JSDOC {
          * @arg {Number} offset where to start reading from
          * @return {Number} position of token
          */
-        public int findPuncToken(TokenArray tokens, string data, int n) {
+        public int findPuncToken(TokenArray tokens, string data, int n)
+        {
             n = n || tokens.length -1;
             var stack = 0;
             while (n > -1) {
@@ -162,7 +160,9 @@ namespace JSDOC {
          */
         public Token lastSym(TokenArray tokens, int n) {
             for (var i = n-1; i >= 0; i--) {
-                if (!(tokens[i].is("WHIT") || tokens[i].is("COMM"))) return tokens[i];
+                if (!(tokens.get(i).is("WHIT") || tokens.get(i).is("COMM"))) {
+                    return tokens.get(i);
+                }
             }
             return null;
         },
@@ -172,7 +172,7 @@ namespace JSDOC {
         /**
             @returns {Boolean} Was the token found?
          */
-        read_word : function(/**JSDOC.TokenStream*/stream, tokens) {
+        public bool read_word (TokenStream stream, TokenArray tokens) {
             var found = "";
             while (!stream.look().eof && Lang.isWordChar(stream.look())) {
                 found += stream.next();