feat: recursive TypeInfo structure

closes #209, closes #343

addons/generator/asciidoc/partials/declarator-after.adoc.hbs

@@ -0,0 +1,26 @@
+{{#if (eq kind "lvalue-reference")~}}
+    {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))~}}){{~/if~}}
+    {{~>declarator-after pointee-type~}}
+{{~else if (eq kind "rvalue-reference")~}}
+    {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))~}}){{~/if~}}
+    {{~>declarator-after pointee-type~}}
+{{~else if (eq kind "pointer")~}}
+    {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))~}}){{~/if~}}
+    {{~>declarator-after pointee-type~}}
+{{~else if (eq kind "member-pointer")~}}
+    {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))~}}){{~/if~}}
+    {{~>declarator-after pointee-type~}}
+{{~else if (eq kind "pack")~}}
+    {{~>declarator-after pattern-type~}}
+{{~else if (eq kind "array")~}}
+    [{{bounds-value}}]
+    {{~>declarator-after element-type~}}
+{{~else if (eq kind "function")~}}
+    ({{~#each param-types~}}
+        {{~>declarator decl-name="" decl-name-targs=""~}}{{~#unless @last}}, {{/unless~}}
+    {{~/each~}})
+    {{~#if cv-qualifiers}} {{cv-qualifiers}}{{/if~}}
+    {{~#if (eq ref-qualifier "lvalue")}} &{{else if (eq ref-qualifier "rvalue")}} &&{{/if~}}
+    {{~#if exception-spec}} {{exception-spec}}{{~/if~}}
+    {{~>declarator-after return-type~}}
+{{/if}}

addons/generator/asciidoc/partials/declarator-before.adoc.hbs

@@ -0,0 +1,34 @@
+{{#if (eq kind "builtin")~}}
+    {{#if cv-qualifiers}}{{cv-qualifiers}} {{/if~}}
+    {{name~}}
+{{~else if (eq kind "tag")~}}
+    {{#if cv-qualifiers}}{{cv-qualifiers}} {{/if~}}
+    {{#if parent-type~}}{{>declarator parent-type decl-name="" decl-name-targs=""}}::{{/if~}}
+    {{#if id}}xref:{{id}}[{{name~}}]{{else}}{{name~}}{{/if}}
+{{~else if (eq kind "specialization")~}}
+    {{#if cv-qualifiers}}{{cv-qualifiers}} {{/if~}}
+    {{#if parent-type~}}{{>declarator parent-type decl-name="" decl-name-targs=""}}::{{/if~}}
+    {{#if id}}xref:{{id}}[{{name~}}]{{else}}{{name~}}{{/if}}
+    {{~>template-args args=template-args~}}
+{{~else if (eq kind "lvalue-reference")~}}
+    {{~>declarator-before pointee-type~}}
+    {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))~}}({{~/if~}}&
+{{~else if (eq kind "rvalue-reference")~}}
+    {{~>declarator-before pointee-type~}}
+    {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))~}}({{~/if~}}&&
+{{~else if (eq kind "pointer")~}}
+    {{~>declarator-before pointee-type~}}
+    {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))~}}({{~/if~}}*
+    {{~#if cv-qualifiers}} {{cv-qualifiers}}{{/if~}}
+{{~else if (eq kind "member-pointer")~}}
+    {{~>declarator-before pointee-type~}}
+    {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))~}}({{~/if~}}
+    {{#if parent-type~}}{{>declarator parent-type decl-name="" decl-name-targs=""}}::*{{/if~}}
+    {{#if cv-qualifiers}} {{cv-qualifiers}}{{/if~}}
+{{~else if (eq kind "pack")~}}
+    {{~>declarator-before pattern-type~}}...
+{{~else if (eq kind "array")~}}
+    {{~>declarator-before element-type~}}
+{{~else if (eq kind "function")~}}
+    {{~>declarator-before return-type~}}
+{{/if}}

addons/generator/asciidoc/partials/declarator.adoc.hbs

@@ -0,0 +1,5 @@
+{{>declarator-before~}}
+{{~#if decl-name}} {{decl-name~}}
+{{~#if decl-name-targs~}}{{>template-args args=decl-name-targs}}{{~/if~}}
+{{~/if~}}
+{{~>declarator-after~}}

addons/generator/asciidoc/partials/function-sig.adoc.hbs

@@ -1,22 +1,27 @@
 [source,cpp,subs=+macros]
 ----
-{{#if (eq storageClass "static")}}
-static
-{{/if}}
-{{>type-name return}}
+{{#if template}}{{>template-head template}}{{/if~}}
+{{#if (eq storageClass "static")}}static
+{{/if~}}
+{{>declarator-before return}}
 
-{{#if params}}
-{{name}}(
+{{name~}}
+{{#if (eq template.kind "explicit")~}}
+    {{~>template-args args=template.args~}}
+{{~/if~}}
+
+{{~#if params}}
+(
 {{#each params}}
-    {{>type-name type~}}
-    {{#if name}} {{name}}{{/if}}
+    {{>declarator type decl-name=name~}}
     {{~#if @last}}){{else}},
     {{/if}}
 {{~/each}}
 {{~else~}}
-{{name}}()
+()
 {{~/if~}}
 {{#if (eq exceptionSpec "noexcept")}} noexcept{{/if~}}
+{{~>declarator-after return~}}
 {{#if isDeleted}} = delete{{/if~}}
 ;
 ----

addons/generator/asciidoc/partials/record-member.adoc.hbs

@@ -1,8 +1,8 @@
 {{#if (eq kind "function")}}
 {{#if (eq storageClass "static")}}static {{/if~}}
-{{>type-name return}} {{name}}(
+{{>declarator return decl-name=""}} {{name}}(
 {{~#each params}}
-{{>type-name type}}
+{{>declarator type decl-name=""}}
 {{#if name}} {{name}}{{/if}}
 {{~#unless @last}}, {{/unless}}
 {{~/each}})

addons/generator/asciidoc/partials/record.adoc.hbs

@@ -11,7 +11,9 @@
 {{#if symbol.template}}
 {{>template-head symbol.template}}
 {{symbol.tag}} {{symbol.name~}}
-{{>template-args symbol.template}}
+{{#if (neq symbol.template.kind "primary")~}}
+{{>template-args args=symbol.template.args}}
+{{/if}}
 {{else}}
 {{symbol.tag}} {{symbol.name~}}
 {{/if}}
@@ -22,7 +24,7 @@
     {{#if @first}}:{{else}},{{/if}}
     {{~#unless (eq access ../symbol.defaultAccess)}} {{access}}{{/unless}}
     {{~#if isVirtual}} virtual{{/if}}
-    {{~null}} {{type.name}}
+    {{~null}} {{>declarator type decl-name=""}}
     {{~#if @last}};{{/if}}
 {{/each}}
 {{/unless}}

addons/generator/asciidoc/partials/template-args.adoc.hbs

@@ -1,6 +1,4 @@
-{{#if (neq kind "primary")~}}<
-{{~#each args~}}
+<{{~#each args~}}
     {{value}}
     {{~#if (not @last)}}, {{/if}}
-{{~/each~}}
->{{/if}}
+{{~/each~}}>

addons/generator/asciidoc/partials/template-head.adoc.hbs

@@ -1,13 +1,17 @@
+{{#if params~}}
 template<
 {{#each params}}
     {{#if (eq kind "type")}}
-    {{>type-tparam~}}
+    {{>tparam-type~}}
     {{else if (eq kind "non-type")}}
-    {{>nontype-tparam~}}
+    {{>tparam-nontype~}}
     {{else if (eq kind "template")}}
-    {{>template-tparam~}}
+    {{>tparam-template~}}
     {{/if}}
     {{~#unless @last}},
     {{else}}
     {{/unless}}
 {{/each}}>
+{{else~}}
+template<>
+{{/if}}

addons/generator/asciidoc/partials/nontype-tparam.adoc.hbs → addons/generator/asciidoc/partials/tparam-nontype.adoc.hbs

@@ -1,4 +1,4 @@
-{{>type-name type}}
+{{>declarator type decl-name=""}}
 {{~#if is-pack}}...{{/if}}
 {{~#if name}} {{name}}{{/if}}
 {{~#if default}} = {{default}}{{/if~}}

addons/generator/asciidoc/partials/type-tparam.adoc.hbs → addons/generator/asciidoc/partials/tparam-type.adoc.hbs

@@ -1,4 +1,4 @@
 typename
 {{~#if is-pack}}...{{/if}}
 {{~#if name}} {{name}}{{/if}}
-{{~#if default}} = {{>type-name default}}{{~/if~}}
+{{~#if default}} = {{>declarator default decl-name=""}}{{~/if~}}

addons/generator/asciidoc/partials/typedef.adoc.hbs

@@ -1 +1,27 @@
 {{!-- typedef --}}
+[#{{symbol.id}}]
+== {{symbol.name}}
+
+{{symbol.doc.brief}}
+
+=== Synopsis
+
+[source,cpp,subs=+macros]
+----
+{{#if symbol.isUsing~}}
+    {{~#if symbol.template}}{{>template-head symbol.template}}{{/if~}}
+    using {{symbol.name}} = {{>declarator symbol.type}}
+{{~else~}}
+    typedef {{>declarator symbol.type decl-name=symbol.name}}
+{{~/if}}
+;
+----
+
+{{>source symbol.loc}}
+
+{{#if symbol.doc.description}}
+=== Description
+
+{{symbol.doc.description}}
+
+{{/if}}

addons/generator/asciidoc/partials/variable.adoc.hbs

@@ -8,13 +8,12 @@
 
 [source,cpp,subs=+macros]
 ----
-{{#if symbol.template}}
-{{>template-head symbol.template}}
-{{symbol.type.name}} {{symbol.name~}}
-{{>template-args symbol.template}}
-{{else}}
-{{symbol.type.name}} {{symbol.name~}}
-{{/if}}
+{{#if symbol.template}}{{>template-head symbol.template}}{{/if~}}
+{{#if (or (eq symbol.template.kind "explicit") (eq symbol.template.kind "partial"))~}}
+    {{~>declarator symbol.type decl-name=symbol.name decl-name-targs=symbol.template.args~}}
+{{~else~}}
+    {{~>declarator symbol.type decl-name=symbol.name decl-name-targs=""~}}
+{{~/if}}
 ;
 ----
 

include/mrdox/Metadata/Enum.hpp

@@ -70,7 +70,7 @@ struct EnumInfo
     // Set to nonempty to the type when this is an explicitly typed enum. For
     //   enum Foo : short { ... };
     // this will be "short".
-    std::optional<TypeInfo> BaseType;
+    std::unique_ptr<TypeInfo> BaseType;
 
     // Enumeration members.
     std::vector<EnumValueInfo> Members;

include/mrdox/Metadata/Field.hpp

@@ -43,7 +43,7 @@ struct FieldInfo
     , SourceInfo
 {
     /** Type of the field */
-    TypeInfo Type;
+    std::unique_ptr<TypeInfo> Type;
 
     /** The default member initializer, if any.
     */

include/mrdox/Metadata/Function.hpp

@@ -93,7 +93,7 @@ union FnFlags1
 struct Param
 {
     /** The type of this parameter */
-    TypeInfo Type;
+    std::unique_ptr<TypeInfo> Type;
 
     /** The parameter name.
 
@@ -107,7 +107,7 @@ struct Param
     Param() = default;
 
     Param(
-        TypeInfo&& type,
+        std::unique_ptr<TypeInfo>&& type,
         std::string&& name,
         std::string&& def_arg)
         : Type(std::move(type))
@@ -125,7 +125,7 @@ struct FunctionInfo
 {
     friend class ASTVisitor;
 
-    TypeInfo ReturnType;   // Info about the return type of this function.
+    std::unique_ptr<TypeInfo> ReturnType; // Info about the return type of this function.
     std::vector<Param> Params; // List of parameters.
 
     // When present, this function is a template or specialization.

include/mrdox/Metadata/Info.hpp

@@ -90,7 +90,7 @@ struct MRDOX_VISIBLE
     //--------------------------------------------
 
     virtual ~Info() = default;
-    Info(Info const &Other) = delete;
+    Info(Info const& Other) = delete;
     Info(Info&& Other) = default;
 
     explicit

include/mrdox/Metadata/Record.hpp

@@ -44,14 +44,14 @@ union RecFlags0
 */
 struct BaseInfo
 {
-    TypeInfo Type;
+    std::unique_ptr<TypeInfo> Type;
     AccessKind Access = AccessKind::Public;
     bool IsVirtual = false;
 
     BaseInfo() = default;
 
     BaseInfo(
-        TypeInfo&& type,
+        std::unique_ptr<TypeInfo>&& type,
         AccessKind access,
         bool is_virtual)
         : Type(std::move(type))

include/mrdox/Metadata/Template.hpp

@@ -44,13 +44,13 @@ struct TParam;
 struct TypeTParam
 {
     /** Default type for the type template parameter */
-    std::optional<TypeInfo> Default;
+    std::unique_ptr<TypeInfo> Default;
 };
 
 struct NonTypeTParam
 {
     /** Type of the non-type template parameter */
-    TypeInfo Type;
+    std::unique_ptr<TypeInfo> Type;
     // Non-type template parameter default value (if any)
     Optional<std::string> Default;
 };
@@ -118,22 +118,13 @@ struct TParam
     TParam(
         TParam&& other) noexcept;
 
-    MRDOX_DECL
-    TParam(
-        const TParam& other);
-
     MRDOX_DECL
     TParam(
         std::string&& name,
         bool is_pack);
 
     MRDOX_DECL ~TParam();
 
-    MRDOX_DECL
-    TParam&
-    operator=(
-        const TParam& other);
-
     MRDOX_DECL
     TParam&
     operator=(
@@ -234,13 +225,6 @@ struct TemplateInfo
     */
     OptionalSymbolID Primary;
 
-#if 0
-    /** Stores information for explicit specializations of members
-        of implicitly instantiated class template specializations
-    */
-    std::vector<SpecializationInfo> Specializations;
-#endif
-
     // KRYSTIAN NOTE: using the presence of args/params
     // to determine the specialization kind *should* work.
     // emphasis on should.