0.14.x: Fix TypeParameter.base

diff --git a/src/driver/0.14.x/symbolresolver.vala b/src/driver/0.14.x/symbolresolver.vala
index bd3163fc040ef00f87a86604d087efe6b92abe1c..63034375a4f1d663b6a3ef23ff16bbcfc1a5d4a4 100644 (file)
--- a/src/driver/0.14.x/symbolresolver.vala
+++ b/src/driver/0.14.x/symbolresolver.vala
@@ -83,6 +83,8 @@ public class Valadoc.Drivers.SymbolResolver : Visitor {
                        }
                } else if (vtyperef is Vala.DelegateType) {
                        reference.data_type = resolve (((Vala.DelegateType) vtyperef).delegate_symbol);
+               } else if (vtyperef is Vala.GenericType) {
+                       reference.data_type = resolve (((Vala.GenericType) vtyperef).type_parameter);
                } else if (vtyperef.data_type != null) {
                        reference.data_type = resolve (vtyperef.data_type);
                }

diff --git a/src/driver/0.14.x/treebuilder.vala b/src/driver/0.14.x/treebuilder.vala
index d9cdfa6eb585265b1c6f999d35979cc7855e27f9..c35de4c82da2d8d783a3b86858a7fc58abc8865e 100644 (file)
--- a/src/driver/0.14.x/treebuilder.vala
+++ b/src/driver/0.14.x/treebuilder.vala
@@ -166,8 +166,8 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
                        type_ref.data_type = create_pointer ((Vala.PointerType) vtyperef,  type_ref, caller);
                } else if (vtyperef is Vala.ArrayType) {
                        type_ref.data_type = create_array ((Vala.ArrayType) vtyperef,  type_ref, caller);
-               } else if (vtyperef is Vala.GenericType) {
-                       type_ref.data_type = new TypeParameter (caller, caller.get_source_file (), ((Vala.GenericType) vtyperef).type_parameter.name, vtyperef);
+               //} else if (vtyperef is Vala.GenericType) {
+               //      type_ref.data_type = new TypeParameter (caller, caller.get_source_file (), ((Vala.GenericType) vtyperef).type_parameter.name, vtyperef);
                }
 
                // type parameters:
@@ -1321,6 +1321,7 @@ public class Valadoc.Drivers.TreeBuilder : Vala.CodeVisitor {
                SourceFile? file = get_source_file (element);
 
                Symbol node = new TypeParameter (parent, file, element.name, element);
+               symbol_map.set (element, node);
                parent.add_child (node);
 
                process_children (node, element);