JSDOC/ScopeNamer.js

[app.jsdoc] / JSDOC / ScopeNamer.js

diff --git a/JSDOC/ScopeNamer.js b/JSDOC/ScopeNamer.js
index cb587c5..56759a7 100644 (file)
--- a/JSDOC/ScopeNamer.js
+++ b/JSDOC/ScopeNamer.js
@@ -8,7 +8,7 @@ Symbol = imports.Symbol.Symbol;
 /**
  * @class ScopeNamer
  * @extends Collapse
- * @namespace JSDOC
+ * @scope JSDOC
  * The point of this class is to iterate through the Collapsed tree
  * and add the property 'scopedName' to the tokens.
  *
@@ -88,18 +88,24 @@ ScopeNamer = XObject.define(
         this.args = this.args ? this.args.slice(0)  : [];
         Symbol.srcFile = this.filename;
         this.createJSDOC = true;
-        
+        this.global = '_global_';
        // console.dump(ar);
         
     }, 
     imports.JSDOC.Collapse.Collapse, 
     {
+        
+        global : false,
         /**
          * Call debugging
          * add/remove ';' after return to configure at present..
          * @param {String} str String to output
          */
-        debugCall : function(str)  { return ; print(str); }, 
+        debugCall : function(str)  {
+            
+            if (this.filename.match(/Scope\.js/)) return print(str);
+            return;
+        }, 
         
         collapseTop : true,
         
@@ -132,9 +138,21 @@ ScopeNamer = XObject.define(
             this.debugCall("walkStatements :" + scope ) ;            
             var _this = this;
             var res = false;
-            
-            var stop
+            var isGlobal = scope == '_global_';
+           
             statements.some(function(st ) {
+                // handle change of scope..
+                if (isGlobal &&
+                        st[0].jsdoc &&
+                        st[0].jsdoc.getTag('scope').length
+                   ) {
+                    //print(st[0].jsdoc.getTag('scope'));
+                    scope = st[0].jsdoc.getTag('scope');
+                    // might be an array..
+                    if (typeof(scope) != 'String') {
+                        scope = scope[0].desc;
+                    }
+                }
                 
                 
                 res = _this.walkStatement(scope, st);
@@ -149,7 +167,7 @@ ScopeNamer = XObject.define(
         {
             this.tokens = stmt;
             this.rewind();
-            this.debugCall("walkStatement :" + scope + '@' + this.tokens[0].line );
+            this.debugCall("walkStatement :" + JSON.stringify(scope)+ '@' + this.tokens[0].line );
              
             var name;
             var sn;
@@ -170,6 +188,8 @@ ScopeNamer = XObject.define(
                 print("GOT ignore?");
                 return true;
             }
+           
+            
             while (null != (token = this.next())) {
                 
                 //'function' 
@@ -229,7 +249,23 @@ ScopeNamer = XObject.define(
                     // only register names of objects if 
                     var name = this.lookTok(-2).data;
                     name = !isGlobal && isVar ? false : name;
+                    
                     name = !isGlobal && name && !name.match(/^this\./) ? false : name;
+                    if (!isGlobal && name && name.match(/^this\./) ) { 
+                        // see if scope ends in prototype..
+                        print("SCOPE:" + JSON.stringify(scope));
+                        if (
+                            (scope.split('.').pop() == 'prototype') &&
+                            (name.split('.').length == 2)
+                        ){
+                            name = name.split('.').pop();
+                        } else {
+                            name = false;
+                        }
+                        
+                    }  else {
+                        name = false;
+                    }
                     //print(JSON.stringify(token,null,4));
                     this.walkObject(scope, name, token.props, jd);
                     continue;
@@ -256,7 +292,7 @@ ScopeNamer = XObject.define(
         
         walkFunctionDef : function (inscope, name, args, stmts, jsdocTok)
         {
-            this.debugCall("wallkFuncDef: " + inscope + '@' + this.look(0).line );
+            this.debugCall("wallkFuncDef: " + inscope + '#' + name + '@' + this.look(0).line );
             var scope = name.length ? (inscope + '.' + name) : inscope;
             if (name.length) { 
                 var symbol = new Symbol( scope , args || [] , "FUNCTION" ,  jsdocTok.jsdoc);
@@ -287,7 +323,12 @@ ScopeNamer = XObject.define(
                 case 'XObject.extend':
                 case 'Roo.apply':
                     //print(JSON.stringify(items,null,4));
-                    scope = items[0][0].data;
+                    // SHOULD WE ADD SCOPE HERE???
+                    var topscope = scope.split('.').pop();
+                    
+                    scope = (topscope == items[0][0].data) ?
+                        items[0][0].data :
+                        scope + '.' + items[0][0].data;
                     // 2nd arg is a object def
                     if (items[1][0].data != '{') {
                         return;
@@ -320,10 +361,12 @@ ScopeNamer = XObject.define(
                     
                     this.addSymbol(symbol, jsdocTok.jsdoc);
                     var sn = new ScopeNamer(this);
+                    //print(JSON.stringify(items, null,4));
+                    // ctr statements.
+                    sn.walkStatements(scope + '.prototype', items[0][2].items);
                     
                     
-                    sn.walkStatements(scope, items[0][2].items);
-                    sn.walkObject(scope + '.prototype', false, items[2].props );
+                    sn.walkObject(scope + '.prototype', false, items[2][0].props );
                     return;
                 
                 
@@ -397,9 +440,16 @@ ScopeNamer = XObject.define(
             // if a symbol alias is documented more than once the last one with the user docs wins
             
             // dumpe some invalid symbols..
-            if (symbol.alias.split(/[#.]/).length > 2) {
+            var ptype_ar = symbol.alias.split(/#/);
+            if (ptype_ar.length > 2) {
+                // multiple #
+                return;
+            }
+            if (ptype_ar.length > 1 && ptype_ar[1].split(/\./).length > 1) {
+                // multiple . after #
                 return;
             }
+            
             ScopeNamer.prototype.debugCall("addSymbol : " + symbol.alias );       
             
             if (ScopeNamer.symbols.hasSymbol(symbol.alias)) {