X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FTokenReader.js;h=173e67c6a38c69d545c13276c473b0131877737b;hb=235202579e42da12c853e19b81e241cf1b145146;hp=b6181a9c4dc78af5a0188d40c43d6d1ae6e6870a;hpb=95e92611bfdb2a01c354d215a59fde01316c5f43;p=gnome.introspection-doc-generator

diff --git a/JSDOC/TokenReader.js b/JSDOC/TokenReader.js
index b6181a9..173e67c 100644
--- a/JSDOC/TokenReader.js
+++ b/JSDOC/TokenReader.js
@@ -92,12 +92,13 @@ TokenReader = XObject.define(
                 }
                 var n = found.split('.');
                 var p = false;
+                var _this = this;
                 n.forEach(function(nm) {
                     if (p) {
-                        tokens.push(new Token('.', "PUNC", "DOT", this.line));
+                        tokens.push(new Token('.', "PUNC", "DOT", _this.line));
                     }
                     p=true;
-                    tokens.push(new Token(nm, "NAME", "NAME", this.line));
+                    tokens.push(new Token(nm, "NAME", "NAME", _this.line));
                 });
                 return true;
                 
@@ -153,7 +154,7 @@ TokenReader = XObject.define(
                 this.line++;
                 found += stream.next();
             }
-            
+              this.line++;
             if (found === "") {
                 return false;
             }
@@ -162,12 +163,11 @@ TokenReader = XObject.define(
                     found = "\n";
                 }
                 if (this.keepWhite) {
-                    var last = tokens.shift();
-                    if (!last.is("WHIT")) {
+                    var last = tokens.pop();
+                    if (last.name != "WHIT") {
                         tokens.push(last);
                     }
                     
-                    
                     tokens.push(new Token(found, "WHIT", "NEWLINE", this.line));
                 }
                 return true;