JSDOC/Walker2.js

[gnome.introspection-doc-generator] / JSDOC / Walker2.js

diff --git a/JSDOC/Walker2.js b/JSDOC/Walker2.js
index 43134a5..fd7f7b3 100644 (file)
--- a/JSDOC/Walker2.js
+++ b/JSDOC/Walker2.js
@@ -225,13 +225,13 @@ Walker2 = XObject.define(
                  if (token.name == 'VAR' &&
                  
                         this.ts.lookTok(1).type == 'NAME' &&
-                        this.ts.lookTok(2).data == '-' &&
+                        this.ts.lookTok(2).data == '=' &&
                         this.ts.lookTok(3).type == 'NAME'  &&
                         this.ts.lookTok(4).data == ';'  
                         
                  
                  ) {
-                    //print("SET ALIAS:" + this.ts.lookTok(1).data +'=' + this.ts.lookTok(3).data);
+                    print("SET ALIAS:" + this.ts.lookTok(1).data +'=' + this.ts.lookTok(3).data);
                      
                     aliases[this.ts.lookTok(1).data] = this.ts.lookTok(3).data;
                     
@@ -656,17 +656,22 @@ Walker2 = XObject.define(
                     if (
                             (this.ts.lookTok(-1).data == '=') &&
                             (this.ts.lookTok(-2).type == 'NAME') &&
-                            (this.ts.lookTok(-3).nane != 'VAR')  
+                            (this.ts.lookTok(-3).name != 'VAR')  
                         ) {
                             
                             scopeName = this.ts.look(-2).data;
+                            print(scopeName);
                             scopeName = fixAlias(scopeName);
-                            var fnScope = new Scope(this.braceNesting, scope, token.n, 
-                                '$this$='+scopeName + '|'+scopeName
-                            );
-                            this.indexedScopes[this.ts.cursor] = fnScope;
-                            scope = fnScope;
-                            this.scopesIn(fnScope);
+                            
+                            print(this.scopes.length);
+                            //var fnScope = new Scope(this.braceNesting, scope, token.n, 
+                            //    '$this$='+scopeName + '|'+scopeName
+                            //);
+                            
+                            //this.indexedScopes[this.ts.cursor] = fnScope;
+                            //scope = fnScope;
+                            // push the same scope onto the stack..
+                            this.scopesIn(this.scopes[this.scopes.length-1]);
                             
                               
                             locBraceNest++;
@@ -740,7 +745,7 @@ Walker2 = XObject.define(
          
         addSymbol: function(lastIdent, appendIt, atype )
         {
-            print("Walker.addSymbol : " + lastIdent);
+            //print("Walker.addSymbol : " + lastIdent);
            // print("Walker.curdoc: " + JSON.stringify(this.currentDoc, null,4));
             
             /*if (!this.currentDoc.tags.length) {
@@ -794,7 +799,7 @@ Walker2 = XObject.define(
                 
                 
                 var s = s.join('|').split('|');
-                //print("FULLSCOPE: " + s);
+                print("FULLSCOPE: " + s);
              //  print("Walker:ADDSymbol: " + s.join('|') );
                 var _t = '';
                  _s = '';
@@ -848,12 +853,13 @@ Walker2 = XObject.define(
                         //print("Symbol:" + _s);
                     //print(this.currentDoc.src);
                         
-                        throw {
-                            name: "ArgumentError", 
-                            message: "Trying to append symbol '" + _s + "', but no doc available\n" +
-                                this.ts.lookTok(0).toString()
-                        };
-
+                        //throw {
+                        //    name: "ArgumentError", 
+                        //    message: "Trying to append symbol '" + _s + "', but no doc available\n" +
+                        //        this.ts.lookTok(0).toString()
+                        //};
+                        this.currentDoc = false;
+                        return;
                      
                     }