JSDOC/ScopeNamer.js

diff --git a/JSDOC/ScopeNamer.js b/JSDOC/ScopeNamer.js
index c17b779..8f2da72 100644 (file)
--- a/JSDOC/ScopeNamer.js
+++ b/JSDOC/ScopeNamer.js
@@ -315,17 +315,16 @@ ScopeNamer = XObject.define(
             }
         },
         
-        walkFunctionDef : function (inscope, name, args, stms, jsdoc)
+        walkFunctionDef : function (inscope, name, args, stms, jsdocTok)
         {
             print("wallkFuncDef: " + inscope);
- 
             var scope = inscope + '.' + name;
             
-            var symbol = new Symbol( scope , token.args || [] , "FUNCTION" ,  jsdoc);
-            symbol._token = this.lookTok(0);
-            ScopeNamer.addSymbol(symbol, jsdoc);
+            var symbol = new Symbol( scope , token.args || [] , "FUNCTION" ,  jsdocTok.jsdoc);
+            symbol._token = jsdocTok;
+            ScopeNamer.addSymbol(symbol, jsdocTok.jsdoc);
             var sn = new ScopeNamer(this);
-            sn.walkStatements(scope, token.items);
+            sn.walkStatements(scope, stmts);
             
         },            
         
@@ -385,11 +384,8 @@ ScopeNamer = XObject.define(
                 // x : function(....)
                 if (val[0].name == 'FUNCTION' ) {
                     
-                    var symbol = new Symbol( scope +'.'+ k , val[1].args || [] , "FUNCTION" ,  key.jsdoc);
-                    symbol._token = key;
-                    
-                    ScopeNamer.addSymbol(key, key.jsdoc);
-                    this.walkFunctionDef (scope, false, val[1].args, val[2].items, false)
+                  
+                    this.walkFunctionDef (scope, k, val[1].args, val[2].items, key.jsdoc)
 
                     
                     continue;