X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FScopeParser.js;h=45943b4a8087695f0602d44a1cc58ed8f7d5c8c7;hb=e56710032e15cc902472306c6fb27c83fbe45b6b;hp=955e7ed2b5fdfa0dcb3a2133c71ee4efc0811b4f;hpb=d2bce8cb44af0ea493948c38292a5ae1d4afa8f3;p=gnome.introspection-doc-generator

diff --git a/JSDOC/ScopeParser.js b/JSDOC/ScopeParser.js
index 955e7ed..45943b4 100644
--- a/JSDOC/ScopeParser.js
+++ b/JSDOC/ScopeParser.js
@@ -426,7 +426,7 @@ ScopeParser.prototype = {
                 
                 case "STRN.DOUBLE_QUOTE": // used for object lit detection..
                 case "STRN.SINGLE_QUOTE":
-                    print('SCOPE-STRING:' + token.toString());
+                  //  print('SCOPE-STRING:' + token.toString());
                     //println("<i>"+token.data+"</i>");
 
                     if (this.ts.lookTok(-1).data == '{' && this.ts.lookTok(1).data == ':') {
@@ -456,27 +456,12 @@ ScopeParser.prototype = {
                     break;
                 
                 case "NAME.NAME":
-                    print('SCOPE-NAME:' + token.toString());
+                    //print('SCOPE-NAME:' + token.toString());
                     //print("DEAL WITH NAME:");
                     // got identifier..
                     
                     // look for  { ** : <- indicates obj literal.. ** this could occur with numbers ..
-                    if ((this.ts.lookTok(-1).data == "{") && (this.ts.lookTok(1).data == ":")) {
-                        isObjectLitAr.pop();
-                        isObjectLitAr.push(true);
-                        //print(">>>>>> OBJLIT REPUSH(true)");
-                        //println("<i>"+token.data+"</i>");
-                        break;
-                    }
-                   // print("DEAL WITH obj lit:");
-                    isInObjectLitAr = isObjectLitAr[isObjectLitAr.length-1];
-                    
-                    if (isInObjectLitAr && (this.ts.lookTok(1).data == ":") && (this.ts.lookTok(-1).data == ",")) {
-                        // skip, it's an object lit key..
-                        //println("<i>"+token.data+"</i>");
-                        break;
-                    }
-                    
+                     
                     
                     // skip anyting with "." before it..!!
                      
@@ -488,6 +473,9 @@ ScopeParser.prototype = {
                     //print("SYMBOL: " + token.toString());
                     
                     symbol = token.data;
+                    if (symbol == 'this') {
+                        break;
+                    }
                     if (this.mode == 'PASS2_SYMBOL_TREE') {
                         
                         //println("GOT IDENT: -2 : " + this.ts.lookT(-2).toString() + " <BR> ..... -1 :  " +  this.ts.lookT(-1).toString() + " <BR> "); 
@@ -523,7 +511,7 @@ ScopeParser.prototype = {
                     if (token.type != 'KEYW') {
                         break;
                     }
-                    print('SCOPE-KEYW:' + token.toString());
+                    //print('SCOPE-KEYW:' + token.toString());
                    // print("Check eval:");
                 
                     symbol = token.data;
@@ -568,7 +556,7 @@ ScopeParser.prototype = {
             //if (this.ts.nextT()) break;
             
         }
-        print("<<< EXIT SCOPE");
+        //print("<<< EXIT SCOPE");
         //print("<<<<<<<EXIT SCOPE ERR?" +this.scopes.length);
     },
 
@@ -653,7 +641,7 @@ ScopeParser.prototype = {
                                     // key value..
                                     
                                     this.ts = new TokenStream(token.props[prop].val);
-                                    this.parseScope(currentScope);
+                                    this.parseScope(false);
                                     
                                 }
                                 this.ts = curTS;
@@ -723,7 +711,9 @@ ScopeParser.prototype = {
                         //skip '.'
                         break;
                     }
-                    
+                    if (symbol == 'this') {
+                        break;
+                       }
                     
                     if (this.mode == 'PASS2_SYMBOL_TREE') {
 
@@ -741,7 +731,7 @@ ScopeParser.prototype = {
                                 //print("Found an undeclared symbol: " + symbol + ' (line:' + token.line + ')');
                                 //throw "OOPS";
                             } else {
-                                print("undeclared:" + token.toString())
+                                //print("undeclared:" + token.toString())
                             }