X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JSDOC%2FSymbol.js;h=7385547cb342ccdf68c7a7246ca3c4d878bb2a90;hb=3c287c0bc7f97e6b840f52522b4f4f72f0551669;hp=fe29b2a0869dcd065a839762218e4210a88d9d0e;hpb=a22b4bb903a627df9f14fe886e723d0e50133456;p=gnome.introspection-doc-generator

diff --git a/JSDOC/Symbol.js b/JSDOC/Symbol.js
index fe29b2a..7385547 100644
--- a/JSDOC/Symbol.js
+++ b/JSDOC/Symbol.js
@@ -49,10 +49,10 @@ Symbol = XObject.define(
         methods : [], // Symbol[]
         _name : "",
         _params : [], //Doctag[]
-        properties : [],
-        requires : [],
-        returns : [],
-        see : [],
+        properties : [], //Doctag[]
+        requires : [],  //Doctag[]
+        returns : [], //Doctag[]
+        see : [], //Doctag[]
         since : "",
         srcFile : {},
         type : "",
@@ -63,20 +63,11 @@ Symbol = XObject.define(
         
             
         
-        toObject : function()
+        toJSON : function()
         {
             
-            function array2object(a)
-            {
-                
-                var r = [];
-                a.forEach(function(e) {
-                    r.push(e.toObject());
-                });
-                return r;
-            }
-            
-            var ret = { };
+           
+            var ret = { '*object' : 'Symbol' };
             for (var i in this) {
                 if (Symbol.hide.indexOf(i) > -1) {
                     continue;
@@ -93,16 +84,20 @@ Symbol = XObject.define(
                             case 'inherits' :
                             case 'methods' :
                             case '_params': 
-                                ret[i] = array2object(this[i],true); 
-                                continue;
-                                
-                            //objects..
-                            
+                            case 'properties': 
+                            case 'requires':
+                            case 'returns':
+                            case 'see':
+                            case 'cfgs': // key val of doctags..
                             case 'comment' :
-                                print(JSON.stringify(this[i]));
-                                ret[i] = this[i].toObject();
+                                ret[i] = this[i]
+                                continue; 
+                            
+                            //skip
+                            case 'inheritsFrom':
+                            case 'childClasses':
                                 continue;
-                                
+            
                             default:
                                 print("object? :" + i);
                                 Seed.quit();
@@ -111,9 +106,12 @@ Symbol = XObject.define(
                         
                     case 'string':
                     case 'number':
+                    case 'boolean':
                         ret[i] = this[i]; continue;
                     default:
+                        
                         print("unknown type:" + typeof(this[i]));
+                        print(JSON.stringify(this));
                         Seed.quit();
                    }
             }
@@ -130,7 +128,7 @@ Symbol = XObject.define(
             //this.events = [];
             this.exceptions = [];
             this.inherits = [];
-            //this.inheritsFrom = [];
+            //
             this.isa = "OBJECT"; // OBJECT//FUNCTION
             this.methods = [];
             this._params = [];
@@ -139,8 +137,12 @@ Symbol = XObject.define(
             this.returns = [];
             this.see = [];
             this.srcFile = {};
-            this.childClasses = [];
+            
+            
             this.cfgs = {};
+            // derived later?
+            this.inheritsFrom = [];
+            this.childClasses = [];
             
             this.comment = new DocComment();
             this.comment.isUserComment =  false;
@@ -356,6 +358,7 @@ Symbol = XObject.define(
             // @class
             var classes = this.comment.getTag("class");
             if (classes.length) {
+                //print(JSON.stringify(this,null,4));
                 this.isa = "CONSTRUCTOR";
                 this.classDesc = classes[0].desc; // desc can't apply to the constructor as there is none.
                 if (!this.classDesc) {
@@ -451,6 +454,7 @@ Symbol = XObject.define(
                 // @static
             if (this.comment.getTag("singleton").length) {
                 this.isStatic = true;
+                //print('------------- got singleton ---------------' + this.isa);
                 //if (this.isa == "CONSTRUCTOR") {
                 //	this.isNamespace = true;
                 //}
@@ -663,6 +667,11 @@ Symbol = XObject.define(
             if (memberOfs.length) {
                 this.memberOf = memberOfs[0].desc;
                 this.memberOf = this.memberOf.replace(/\.prototype\.?/g, "#");
+                this.name = this.name.split('.').pop();
+                this.name = this.name.split('#').pop();
+                this.name = this.memberOf + this.name;
+                this._name = this.name
+                this.alias = this.name;
             }
 
             /*~t
@@ -820,4 +829,4 @@ Symbol.fromDump = function(t)
         ns[i] = t[i];
     }
     return ns;
-}
\ No newline at end of file
+}