Fix #6912 - issue with parsing Roo.lib.Dom

diff --git a/roojspacker/DocBuilder.vala b/roojspacker/DocBuilder.vala
index c993fe5..e7d9672 100644 (file)
--- a/roojspacker/DocBuilder.vala
+++ b/roojspacker/DocBuilder.vala
@@ -61,8 +61,8 @@ namespace JSDOC
                                 
                        var jsonAll = new Json.Object(); 
                        var ar = new Json.Array(); 
-                               for (var i = 0, l = classes.size; i < l; i++) {
-                                   var symbol = classes.get(i);    
+                               for (var i = 0, l = this.symbolSet.values().size; i < l; i++) {
+                                   var symbol = this.symbolSet.values().get(i);    
                                    //
                                    ar.add_object_element(  symbol.toJson());
 

diff --git a/roojspacker/Symbol.vala b/roojspacker/Symbol.vala
index 61c9da2..c4f358d 100644 (file)
--- a/roojspacker/Symbol.vala
+++ b/roojspacker/Symbol.vala
@@ -1015,7 +1015,7 @@ namespace JSDOC {
                        ret.set_string_member("name", this.alias);  
                        ret.set_string_member("desc", this.desc);
                        ret.set_boolean_member("isSingleton", this.comment.getTag(DocTagTitle.SINGLETON).size > 0);
-                       ret.set_boolean_member("isStatic", this.isa != "CONSTRUCTOR");
+                       ret.set_boolean_member("isStatic", this.isStatic ); // ??? -> this.isa != "CONSTRUCTOR" ? true : this.isStatic);
                        ret.set_boolean_member("isBuiltin", this.isBuiltin());
                        ret.set_boolean_member("isAbstract", this.isAbstract);
                        ret.set_boolean_member("isBuilderTop", this.isBuilderTop);                      

diff --git a/roojspacker/SymbolSet.vala b/roojspacker/SymbolSet.vala
index c9ec2ae..4082ee8 100644 (file)
--- a/roojspacker/SymbolSet.vala
+++ b/roojspacker/SymbolSet.vala
@@ -246,9 +246,12 @@ namespace JSDOC {
                 }
                 //print("looking for memberOf: " + symbol.memberOf + " FOR " + symbol.alias);
                 // add to parent's methods or properties list
+                GLib.debug("Trying to add '%s' to '%s'", symbol.alias, symbol.memberOf);
+                
                 if (symbol.memberOf.length > 0) {
                     var container = this.getSymbol(symbol.memberOf);
                     if (container == null) {
+                           GLib.debug("Could not find container for '%s'", symbol.memberOf);
                         if (SymbolSet.isBuiltin(symbol.memberOf)) {
                             container = DocParser.addBuiltin(symbol.memberOf);
                         }
@@ -272,7 +275,8 @@ namespace JSDOC {
                         }
                     }
                     
-                    if (container != null && !container.isNamespace) {
+                    if (container != null && (!container.isNamespace || container.isStatic)) {
+                           GLib.debug("Calling addMember  for '%s' onto '%s'", symbol.alias, container.alias);                    
                         container.addMember(symbol);
                         }
                 }