JSDOC/TokenReader.js
[gnome.introspection-doc-generator] / JSDOC / TokenReader.js
index 9970186..173e67c 100644 (file)
@@ -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();
+                    var last = tokens.pop();
                     if (last.name != "WHIT") {
                         tokens.push(last);
                     }
                     
-                    
                     tokens.push(new Token(found, "WHIT", "NEWLINE", this.line));
                 }
                 return true;