X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FTokenReader.js;h=9fe4fe75f81da11e8e8b14ddaece4de9a5514d98;hb=55f8d00207a54cf3c1939cae097c2691cb8cf93c;hp=7f999a961c1929f8cf2f42ad43fbb17aa1cefabd;hpb=72cb2b0d68c45b39f75e6b9cf9d2218f81e37e07;p=gnome.introspection-doc-generator

diff --git a/JSDOC/TokenReader.js b/JSDOC/TokenReader.js
index 7f999a9..9fe4fe7 100644
--- a/JSDOC/TokenReader.js
+++ b/JSDOC/TokenReader.js
@@ -1,17 +1,17 @@
 //<script type="text/javascript">
 
  
-XObject = imports.XObject.XObject;
-console = imports.console.console;
+const XObject = imports.XObject.XObject;
+const console = imports.console.console;
 
 
-Token   = imports.Token.Token;
-Lang    = imports.Lang.Lang;
+const Token   = imports.Token.Token;
+const Lang    = imports.Lang.Lang;
 
 /**
 	@class Search a {@link JSDOC.TextStream} for language tokens.
 */
-TokenReader = XObject.define(
+const TokenReader = XObject.define(
     function(o) {
         
         XObject.extend(this, o || {});
@@ -52,6 +52,7 @@ TokenReader = XObject.define(
                 for (var i = tokens.length-1; i >= 0; i--) {
                     if (!(tokens[i].is("WHIT") || tokens[i].is("COMM"))) return tokens[i];
                 }
+                return true;
             }
 
             while (!stream.look().eof) {
@@ -121,6 +122,7 @@ TokenReader = XObject.define(
             for (var i = n-1; i >= 0; i--) {
                 if (!(tokens[i].is("WHIT") || tokens[i].is("COMM"))) return tokens[i];
             }
+            return null;
         },
         
          
@@ -148,7 +150,7 @@ TokenReader = XObject.define(
                     //Seed.print('(@' + n);
                     
                     var lt = this.lastSym(tokens, n);
-                   Seed.print(JSON.stringify(lt));
+                    print(JSON.stringify(lt));
                     if (lt.type != 'KEYW' || ['IF', 'WHILE'].indexOf(lt.name) < -1) {
                         if (!this.ignoreBadGrammer) {
                             throw {
@@ -202,10 +204,15 @@ TokenReader = XObject.define(
             if ((found == '}' || found == ']') && tokens.lastSym().data == ',') {
                 //print("Error - comma found before " + found);
                 //print(JSON.stringify(tokens.lastSym(), null,4));
-                throw {
-                    name : "ArgumentError", 
-                    message: "\n" + this.filename + ':' + this.line + " Error - comma found before " + found
-                }   
+                if (this.ignoreBadGrammer) {
+                    print("\n" + this.filename + ':' + this.line + " Error - comma found before " + found);
+                } else {
+                    
+                    throw {
+                        name : "ArgumentError", 
+                        message: "\n" + this.filename + ':' + this.line + " Error - comma found before " + found
+                    }
+                }
             }
             
             tokens.push(new Token(found, "PUNC", Lang.punc(found), this.line));
@@ -251,8 +258,8 @@ TokenReader = XObject.define(
             if (this.collapseWhite) {
                 found = "\n";
             }
-            if (this.keepWhite) {
-                var last = tokens.pop();
+             if (this.keepWhite) {
+                var last = tokens ? tokens.pop() : false;
                 if (last && last.name != "WHIT") {
                     tokens.push(last);
                 }