X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FTokenReader.js;h=6ee83b99a83bb4c1b517d4e2b29c299face756cc;hb=61373dc4e1077ba12162044fb3c7830164922c08;hp=21db9f0c2acba631153a9e8bd9f37e5d8137a344;hpb=160901065dfcaa0bb0449629e20c35664883db4b;p=gnome.introspection-doc-generator

diff --git a/JSDOC/TokenReader.js b/JSDOC/TokenReader.js
index 21db9f0..6ee83b9 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 || {});
@@ -31,7 +31,8 @@ TokenReader = XObject.define(
         sepIdents : false,
         /** @cfg {String} filename name of file being parsed. **/
         filename : '',
-        
+        /** @config {Boolean} ignoreBadGrammer do not throw errors if we find stuff that might break compression **/
+        ignoreBadGrammer : false,
         /**
          * tokenize a stream
          * @return {Array} of tokens
@@ -41,9 +42,6 @@ TokenReader = XObject.define(
          * tr.tokenize(ts)
          * 
          */
-            
-
-
         tokenize : function(/**JSDOC.TextStream*/stream) {
             this.line =1;
             var tokens = [];
@@ -54,9 +52,11 @@ 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) {
+                console.log(tokens);
                 if (this.read_mlcomment(stream, tokens)) continue;
                 if (this.read_slcomment(stream, tokens)) continue;
                 if (this.read_dbquote(stream, tokens))   continue;
@@ -77,6 +77,57 @@ TokenReader = XObject.define(
             return tokens;
         },
 
+        /**
+         * findPuncToken - find the id of a token (previous to current)
+         * need to back check syntax..
+         * 
+         * @arg {Array} tokens the array of tokens.
+         * @arg {String} token data (eg. '(')
+         * @arg {Number} offset where to start reading from
+         * @return {Number} position of token
+         */
+        findPuncToken : function(tokens, data, n) {
+            n = n || tokens.length -1;
+            var stack = 0;
+            while (n > -1) {
+                
+                if (!stack && tokens[n].data == data) {
+                    return n;
+                }
+                
+                if (tokens[n].data  == ')' || tokens[n].data  == '}') {
+                    stack++;
+                    n--;
+                    continue;
+                }
+                if (stack && (tokens[n].data  == '{' || tokens[n].data  == '(')) {
+                    stack--;
+                    n--;
+                    continue;
+                }
+                
+                
+                n--;
+            }
+            return -1;
+        },
+        /**
+         * lastSym - find the last token symbol
+         * need to back check syntax..
+         * 
+         * @arg {Array} tokens the array of tokens.
+         * @arg {Number} offset where to start..
+         * @return {Token} the token
+         */
+        lastSym : function(tokens, n) {
+            for (var i = n-1; i >= 0; i--) {
+                if (!(tokens[i].is("WHIT") || tokens[i].is("COMM"))) return tokens[i];
+            }
+            return null;
+        },
+        
+         
+        
         /**
             @returns {Boolean} Was the token found?
          */
@@ -93,10 +144,25 @@ TokenReader = XObject.define(
             var name;
             if ((name = Lang.keyword(found))) {
                 if (found == 'return' && tokens.lastSym().data == ')') {
-                    throw {
-                        name : "ArgumentError", 
-                        message: "\n" + this.filename + ':' + this.line + " Error - return found after )"
-                    }   
+                    //Seed.print('@' + tokens.length);
+                    var n = this.findPuncToken(tokens, ')');
+                    //Seed.print(')@' + n);
+                    n = this.findPuncToken(tokens, '(', n-1);
+                    //Seed.print('(@' + n);
+                    
+                    var lt = this.lastSym(tokens, n);
+                    print(JSON.stringify(lt));
+                    if (lt.type != 'KEYW' || ['IF', 'WHILE'].indexOf(lt.name) < -1) {
+                        if (!this.ignoreBadGrammer) {
+                            throw {
+                                name : "ArgumentError", 
+                                message: "\n" + this.filename + ':' + this.line + " Error - return found after )"
+                            }
+                        }
+                    }
+                    
+                    
+                    
                 }
                 
                 tokens.push(new Token(found, "KEYW", name, this.line));
@@ -139,10 +205,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));