JSDOC/ScopeNamer.js

diff --git a/JSDOC/ScopeNamer.js b/JSDOC/ScopeNamer.js
index 1b3f64d..deecbb2 100644 (file)
--- a/JSDOC/ScopeNamer.js
+++ b/JSDOC/ScopeNamer.js
@@ -299,7 +299,10 @@ ScopeNamer = XObject.define(
                 //  'object'
                 //   a = { .... } << scope is a  $this$={a}
                 if (token.data == '{' && this.lookTok(-1).data == '=' && this.lookTok(-2).is('NAME')) {
-                    this.walkObject(scope, this.lookTok(-2).data, token.props, this.lookTok(-2).jsdoc);
+                    
+                    // could be var x = ..
+                    var jd = this.lookTok(-2).jsdoc ? this.lookTok(-2) : this.lookTok(-3); 
+                    this.walkObject(scope, this.lookTok(-2).data, token.props, jd);
                     continue;
                 }
                  
@@ -307,9 +310,7 @@ ScopeNamer = XObject.define(
                 
                 
                 
-                
-                if (token.data == '{') { 
-
+                 
                 // standard flow....
                 if (token.data == '{') { 
                     sn = new ScopeNamer(this);
@@ -340,7 +341,7 @@ ScopeNamer = XObject.define(
         
         
         
-        walkCall : function (inscope, assign, callname, items, jsdoc)
+        walkCall : function (inscope, assign, callname, items, jsdocTok)
         {
              print("wallkCall : " + inscope);
             var scope = inscope + ( assign ? ('.' + assign) : '' );