src/jsdoc/Symbol.vala

[roojspacker] / src / jsdoc / Symbol.vala

diff --git a/src/jsdoc/Symbol.vala b/src/jsdoc/Symbol.vala
index 7061bb9..cbdd246 100644 (file)
--- a/src/jsdoc/Symbol.vala
+++ b/src/jsdoc/Symbol.vala
@@ -25,6 +25,7 @@ namespace JSDOC {
                        Symbol.regex_prototype = new GLib.Regex("\\.prototype\\.?");
                }
 
+               private string private_string_name = "";
                private string private_name {
                set {
                                var n = Symbol.regex_global(value, value.length, 0, "");
@@ -36,64 +37,61 @@ namespace JSDOC {
                                        n = n.substring(0, n.length-1);
                                }
                        
-                       this.private_name = n;
+                       this.private_string_name = n;
                }
                
                }
                 
         public string name {
-               get { return this.private_name; }
+               get { return this.private_string_name; }
                }
                
       
         string defaultValue = "";
         
-        
-        private Gee.ArrayList<DocTag> private_params{
-               set  {
-                for (var i = 0; i < value.size; i++) {
-                   
-                    this.private_params.add(v.get(i));
-                }
-                //this.params = this._params;
-            }
-        }
+               private Gee.ArrayList<DocTag> private_doctag_params;
+
+               private Gee.ArrayList<DocTag> private_params{
+                       set  {
+                               for (var i = 0; i < value.size; i++) {
+                                  
+                                   this.private_doctag_params.add(v.get(i));
+                               }
+                               //this.params = this._params;
+                       }
+               }
      
-         private Gee.ArrayList<string> private_string_params{
-               set  {
-                for (var i = 0; i < value.size; i++) {
-
-                    //var ty = v[i].hasOwnProperty('type') ? v[i].type : '';
-                    this._params[i] = new DocTag(value.get(i));
-                           //"param"+((ty)?" {"+ty+"}":"")+" "+v[i].name);
-                           //"param"+((ty)?" {"+ty+"}":"")+" "+v.get(i).name);
-                    }
-                    //else {
-                    //    this._params[i] = v[i];
-                    //}
-                    this.private_params.add(v.get(i));
-                }
-                //this.params = this._params;
-            }
-        }
-         public Gee.ArrayList<DocTag> params {
-            get {
-                       return this.private_params;
-               }
-                       
-        }
-        
-        private Gee.ArrayList<DocTag>  augments ;  
-        
-        private Gee.ArrayList<DocTag>  exceptions ;
-       
-        private Gee.ArrayList<DocTag>  inherits; 
-        private Gee.ArrayList<DocTag>  methods;
+               Gee.ArrayList<string> private_string_params{
+                       set  {
+                               for (var i = 0; i < value.size; i++) {
+
+                                   //var ty = v[i].hasOwnProperty('type') ? v[i].type : '';
+                                   this.private_doctag_params.add( new DocTag(value.get(i)));
+                                          
+                                  //"param"+((ty)?" {"+ty+"}":"")+" "+v.get(i).name);
+                                   
+                               }
+                               
+                       }
+               }
+               public Gee.ArrayList<DocTag> params {
+                       get {
+                               return this.private_doctag_params;
+                       }
+               
+               }
+
+               private Gee.ArrayList<DocTag>  augments ;  
+
+               private Gee.ArrayList<DocTag>  exceptions ;
+
+               private Gee.ArrayList<DocTag>  inherits; 
+               private Gee.ArrayList<DocTag>  methods;
 
                private Gee.ArrayList<DocTag> properties;
-        private Gee.ArrayList<DocTag> requires;
-        private Gee.ArrayList<DocTag> returns;
-        private Gee.ArrayList<DocTag> see ;
+               private Gee.ArrayList<DocTag> requires;
+               private Gee.ArrayList<DocTag> returns;
+               private Gee.ArrayList<DocTag> see ;
 
          
         //childClasses : [],
@@ -218,15 +216,20 @@ namespace JSDOC {
                        this.alias = this.srcFile;
                }
 
-            this.setTags();
+            this.tagsFromComment();
             
-        },
+        }
 
-        setTags : function() {
+        void tagsFromComment() {
             // @author
             var authors = this.comment.getTag("author");
-            if (authors.length) {
-                this.author = authors.map(function($){return $.desc;}).join(", ");
+            if (authors.size) {
+                       // turns author into a string....
+                       this.author = "";
+                foreach(var a in authors) {
+                    this.author += (this.author == "") ? "": ", ";
+                    this.author += a.desc;
+                }
             }
             
             /*~t
@@ -247,7 +250,12 @@ namespace JSDOC {
             // @desc
             var descs = this.comment.getTag("desc");
             if (descs.length) {
-                this.desc = descs.map(function($){return $.desc;}).join("\n"); // multiple descriptions are concatenated into one
+                this.desc = "";
+                foreach(var d in desc) {
+                    this.desc = this.desc == "" ? "": "\n";
+                    this.desc += d.desc;
+                }
+
             }
             
             /*~t
@@ -261,7 +269,10 @@ namespace JSDOC {
                 
                 var overviews = this.comment.getTag("overview");
                 if (overviews.length) {
-                    this.desc = [this.desc].concat(overviews.map(function($){return $.desc;})).join("\n");
+                    foreach(var d in overviews) {
+                        this.desc = this.desc == "" ? "": "\n";
+                        this.desc += d.desc;
+                    }
                 }
             }
             
@@ -273,7 +284,11 @@ namespace JSDOC {
             // @since
             var sinces = this.comment.getTag("since");
             if (sinces.length) {
-                this.since = sinces.map(function($){return $.desc;}).join(", ");
+                this.since = "";
+                foreach(var d in sinces) {
+                    this.since = this.since == "" ? "": "\n";
+                    this.since += d.desc;
+                }
             }
             
             /*~t
@@ -284,7 +299,7 @@ namespace JSDOC {
             // @constant
             if (this.comment.getTag("constant").length) {
                 this.isConstant = true;
-                this.isa = 'OBJECT';
+                this.isa = "OBJECT";
             }
             
             /*~t
@@ -295,7 +310,11 @@ namespace JSDOC {
             // @version
             var versions = this.comment.getTag("version");
             if (versions.length) {
-                this.version = versions.map(function($){return $.desc;}).join(", ");
+                this.version = "";
+                 foreach(var d in versions) {
+                    this.version = this.version == "" ? "": "\n";
+                    this.version += d.desc;
+                }
             }
             
             /*~t
@@ -306,7 +325,11 @@ namespace JSDOC {
             // @deprecated
             var deprecateds = this.comment.getTag("deprecated");
             if (deprecateds.length) {
-                this.deprecated = deprecateds.map(function($){return $.desc;}).join("\n");
+                this.deprecated = "";
+                 foreach(var d in deprecateds) {
+                    this.deprecated = this.deprecated == "" ? "": "\n";
+                    this.deprecated += d.desc;
+                }
             }
             
             /*~t