JSDOC/Symbol.js

[gnome.introspection-doc-generator] / JSDOC / Symbol.js

diff --git a/JSDOC/Symbol.js b/JSDOC/Symbol.js
index fabcea9..08890d8 100644 (file)
--- a/JSDOC/Symbol.js
+++ b/JSDOC/Symbol.js
@@ -26,17 +26,17 @@ Symbol = XObject.define(
         $args : [], // original arguments used when constructing.
         addOn : "",
         alias : "",
-        augments : false, // Doctag
+        augments : [], // Doctag[]
         author : "",
         classDesc : "",
         comment : {},
         deprecated : "",
         desc : "",
-        events : [],
+        //events : false,
         example : "",
-        exceptions : [],
-        inherits : [],
-        inheritsFrom : [],
+        exceptions : [],  // Doctag[]
+        inherits : [],  // Doctag[]
+        //inheritsFrom : [],
         isa : "OBJECT", // OBJECT//FUNCTION
         isEvent : false,
         isConstant : false,
@@ -46,7 +46,7 @@ Symbol = XObject.define(
         isPrivate : false,
         isStatic : false,
         memberOf : "",
-        methods : [],
+        methods : [], // Symbol[]
         _name : "",
         _params : [],
         properties : [],
@@ -66,13 +66,14 @@ Symbol = XObject.define(
         toObject : function()
         {
             
-            function array2object(a , m)
+            function array2object(a)
             {
-                m = m || false;
+                
                 var r = [];
                 a.forEach(function(e) {
-                    r.push(m ? e : e.toObject());
-                })
+                    r.push(e.toObject());
+                });
+                return r;
             }
             
             var ret = { };
@@ -87,11 +88,16 @@ Symbol = XObject.define(
                         switch(i) {
                             //arrays..
                             case 'params' : 
+                            case 'augments' :                             
+                            case 'exceptions' :  
+                            case 'inherits' :
+                            case 'methods' :
                                 ret[i] = array2object(this[i],true); 
                                 continue;
                                 
                             //objects..
-                            case 'augments' : 
+                            
+                            case 'comment' :
                                 print(JSON.stringify(this[i]));
                                 ret[i] = this[i].toObject();
                                 continue;
@@ -110,7 +116,7 @@ Symbol = XObject.define(
                         Seed.quit();
                    }
             }
-            
+            return ret;
             
         },
         
@@ -120,10 +126,10 @@ Symbol = XObject.define(
             this.params = [];
             this.$args = [];
             
-            this.events = [];
+            //this.events = [];
             this.exceptions = [];
             this.inherits = [];
-            this.inheritsFrom = [];
+            //this.inheritsFrom = [];
             this.isa = "OBJECT"; // OBJECT//FUNCTION
             this.methods = [];
             this._params = [];