JSDOC/ScopeNamer.js

[app.jsdoc] / JSDOC / ScopeNamer.js

diff --git a/JSDOC/ScopeNamer.js b/JSDOC/ScopeNamer.js
index f82421a..308b5bb 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,20 +88,23 @@ 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)  {
-            if (!this.filename.match(/BuildDocs\.js/)) return;
-            return   print(str);
+            
+            if (this.filename.match(/Scope\.js/)) return print(str);
+            return;
         }, 
         
         collapseTop : true,
@@ -118,7 +121,7 @@ ScopeNamer = XObject.define(
             //print (this.statements);
             //print (JSON.stringify(this.statements, null,2));
            
-            this.walkStatements('_global_', this.statements)
+            this.walkStatements(this.global, this.statements)
             
                 
                 
@@ -143,7 +146,13 @@ ScopeNamer = XObject.define(
                         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;
+                        this.global = scope;
+                    }
                 }
                 
                 
@@ -159,7 +168,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;
@@ -241,7 +250,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;
@@ -268,7 +293,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);
@@ -299,7 +324,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;
@@ -411,9 +441,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)) {