Attribute improvements

docs/modules/ROOT/pages/generators.adoc

@@ -189,6 +189,10 @@ The `Symbol` object represents a symbol extracted from the source code.The symbo
 | `Any`
 | The documentation for the symbol.
 
+| `attributes`
+| `string[]`
+| The attributes of the symbol.
+
 |===
 
 Handlebars generators extend each symbol with the following fields:
@@ -326,13 +330,9 @@ When the symbol kind is `function`, the symbol object has the following addition
 | `bool`
 | Whether the function is deleted as written.
 
-| `isNoReturn`
+| `isOverride`
 | `bool`
-| Whether the function is noreturn.
-
-| `hasOverrideAttr`
-| `bool`
-| Whether the function has the override attribute.
+| Whether the function is override.
 
 | `hasTrailingReturn`
 | `bool`
@@ -350,10 +350,6 @@ When the symbol kind is `function`, the symbol object has the following addition
 | `bool`
 | Whether the function is final.
 
-| `isNodiscard`
-| `bool`
-| Whether the function is nodiscard.
-
 | `isExplicitObjectMemberFunction`
 | `bool`
 | Whether the function is an explicit object member function.
@@ -401,10 +397,6 @@ When the symbol kind is `function`, the symbol object has the following addition
 | `requires`
 | `string`
 | The `requires` expression of the function.
-
-| `attributes`
-| `string[]`
-| The attributes of the function.
 |===
 
 When the symbol kind is `typedef`, the symbol object has the following additional properties:
@@ -461,10 +453,6 @@ When the symbol kind is `variable`, the symbol object has the following addition
 | `initializer`
 | `string`
 | The initializer of the variable.
-
-| `attributes`
-| `string[]`
-| The attributes of the variable.
 |===
 
 When the symbol kind is `field` (i.e. non-static data members), the symbol object has the following additional properties:
@@ -480,14 +468,6 @@ When the symbol kind is `field` (i.e. non-static data members), the symbol objec
 | `string`
 | The default value of the field.
 
-| `isMaybeUnused`
-| `bool`
-| Whether the field is maybe unused.
-
-| `isDeprecated`
-| `bool`
-| Whether the field is deprecated.
-
 | `isVariant`
 | `bool`
 | Whether the field is a variant.
@@ -500,17 +480,9 @@ When the symbol kind is `field` (i.e. non-static data members), the symbol objec
 | `bool`
 | Whether the field is a bitfield.
 
-| `hasNoUniqueAddress`
-| `string`
-| Whether the field has the `[[no_unique_address]]` attribute.
-
 | `bitfieldWidth`
 | `string`
 | The width of the bitfield.
-
-| `attributes`
-| `string[]`
-| The attributes of the field.
 |===
 
 When the symbol kind is `friend`, the symbol object has the following additional properties:

include/mrdocs/Metadata/Info.hpp

@@ -14,6 +14,7 @@
 
 #include <mrdocs/Platform.hpp>
 #include <mrdocs/Dom.hpp>
+#include <mrdocs/Dom/LazyArray.hpp>
 #include <mrdocs/Dom/LazyObject.hpp>
 #include <mrdocs/Metadata/ExtractionMode.hpp>
 #include <mrdocs/Metadata/Javadoc.hpp>
@@ -112,6 +113,10 @@ struct MRDOCS_VISIBLE Info
      */
     std::optional<Javadoc> javadoc;
 
+    /** The attributes appertaining to this declaration.
+    */
+    std::vector<AttributeKind> Attributes;
+
     //--------------------------------------------
 
     ~Info() override = default;
@@ -298,6 +303,8 @@ tag_invoke(
     {
         io.map("doc", *I.javadoc);
     }
+
+    io.map("attributes", dom::LazyArray(I.Attributes));
     io.map("loc", dynamic_cast<SourceInfo const&>(I));
 }
 

include/mrdocs/Metadata/Info/Field.hpp

@@ -48,16 +48,6 @@ struct FieldInfo final
     /** The width of the bitfield */
     ConstantExprInfo<std::uint64_t> BitfieldWidth;
 
-    // KRYSTIAN FIXME: nodiscard cannot be applied to fields; this should
-    // instead be IsMaybeUnused. we should also store the spelling
-    bool IsMaybeUnused = false;
-
-    bool IsDeprecated = false;
-
-    bool HasNoUniqueAddress = false;
-
-    std::vector<std::string> Attributes;
-
     //--------------------------------------------
 
     explicit FieldInfo(SymbolID ID) noexcept
@@ -86,17 +76,13 @@ tag_invoke(
     {
         io.map("default", I.Default.Written);
     }
-    io.map("isMaybeUnused", I.IsMaybeUnused);
-    io.map("isDeprecated", I.IsDeprecated);
     io.map("isVariant", I.IsVariant);
     io.map("isMutable", I.IsMutable);
     io.map("isBitfield", I.IsBitfield);
-    io.map("hasNoUniqueAddress", I.HasNoUniqueAddress);
     if (I.IsBitfield)
     {
         io.map("bitfieldWidth", I.BitfieldWidth.Written);
     }
-    io.map("attributes", dom::LazyArray(I.Attributes));
 }
 
 /** Map the FieldInfo to a @ref dom::Value object.

include/mrdocs/Metadata/Info/Function.hpp

@@ -165,10 +165,7 @@ struct FunctionInfo final
     bool IsExplicitlyDefaulted = false;
     bool IsDeleted = false;
     bool IsDeletedAsWritten = false;
-    bool IsNoReturn = false;
-    bool HasOverrideAttr = false;
     bool HasTrailingReturn = false;
-    bool IsNodiscard = false;
     bool IsExplicitObjectMemberFunction = false;
     ConstexprKind Constexpr = ConstexprKind::None;
     OperatorKind OverloadedOperator = OperatorKind::None;
@@ -183,6 +180,7 @@ struct FunctionInfo final
     bool IsConst = false;
     bool IsVolatile = false;
     bool IsFinal = false;
+    bool IsOverride = false;
     ReferenceKind RefQualifier = ReferenceKind::None;
     ExplicitInfo Explicit;
 
@@ -220,13 +218,11 @@ tag_invoke(
     io.map("isExplicitlyDefaulted", I.IsExplicitlyDefaulted);
     io.map("isDeleted", I.IsDeleted);
     io.map("isDeletedAsWritten", I.IsDeletedAsWritten);
-    io.map("isNoReturn", I.IsNoReturn);
-    io.map("hasOverrideAttr", I.HasOverrideAttr);
     io.map("hasTrailingReturn", I.HasTrailingReturn);
     io.map("isConst", I.IsConst);
     io.map("isVolatile", I.IsVolatile);
     io.map("isFinal", I.IsFinal);
-    io.map("isNodiscard", I.IsNodiscard);
+    io.map("isOverride", I.IsOverride);
     io.map("isExplicitObjectMemberFunction", I.IsExplicitObjectMemberFunction);
     if (I.Constexpr != ConstexprKind::None)
     {
@@ -251,7 +247,6 @@ tag_invoke(
     {
         io.map("requires", I.Requires.Written);
     }
-    io.map("attributes", dom::LazyArray(I.Attributes));
 }
 
 /** Map the FunctionInfo to a @ref dom::Value object.

include/mrdocs/Metadata/Info/Variable.hpp

@@ -17,7 +17,6 @@
 #include <mrdocs/Metadata/Template.hpp>
 #include <mrdocs/Metadata/Info.hpp>
 #include <mrdocs/Metadata/Type.hpp>
-#include <mrdocs/Dom/LazyArray.hpp>
 #include <mrdocs/ADT/Polymorphic.hpp>
 
 namespace clang::mrdocs {
@@ -89,7 +88,6 @@ tag_invoke(
     {
         io.map("initializer", I.Initializer.Written);
     }
-    io.map("attributes", dom::LazyArray(I.Attributes));
 }
 
 /** Map the VariableInfo to a @ref dom::Value object.

include/mrdocs/Metadata/Specifiers.hpp

@@ -36,6 +36,17 @@ enum class AccessKind
     Private,
 };
 
+/** Attribute kinds.
+*/
+enum class AttributeKind
+{
+    Deprecated,
+    MaybeUnused,
+    Nodiscard,
+    Noreturn,
+    NoUniqueAddress
+};
+
 /** `constexpr`/`consteval` specifier kinds
 
     [dcl.spec.general] p2: At most one of the `constexpr`, `consteval`,
@@ -209,6 +220,7 @@ enum class StorageClassKind
 };
 
 MRDOCS_DECL dom::String toString(AccessKind kind) noexcept;
+MRDOCS_DECL dom::String toString(AttributeKind kind) noexcept;
 MRDOCS_DECL dom::String toString(ConstexprKind kind) noexcept;
 MRDOCS_DECL dom::String toString(ExplicitKind kind) noexcept;
 MRDOCS_DECL dom::String toString(NoexceptKind kind) noexcept;
@@ -278,6 +290,18 @@ tag_invoke(
     v = toString(kind);
 }
 
+/** Return the AttributeKind as a @ref dom::Value string.
+ */
+inline
+void
+tag_invoke(
+    dom::ValueFromTag,
+    dom::Value& v,
+    AttributeKind kind)
+{
+    v = toString(kind);
+}
+
 /** Return the ConstexprKind as a @ref dom::Value string.
  */
 inline

share/mrdocs/addons/generator/common/partials/symbol/attributes.hbs

@@ -0,0 +1,2 @@
+{{!-- Renders the symbol attributes. --}}
+{{ str "[[" }}{{join ", " attributes}}{{ str "]]" }}

share/mrdocs/addons/generator/common/partials/symbol/signature/concept.hbs

@@ -1,3 +1,3 @@
 {{>template/head template}}
 
-concept {{>symbol/name symbol}} = {{constraint}};
+concept {{>symbol/name symbol}}{{#if attributes}} {{>symbol/attributes symbol}}{{/if}} = {{constraint}};

share/mrdocs/addons/generator/common/partials/symbol/signature/enum.hbs

@@ -1,2 +1,2 @@
-enum {{#if isScoped}}class {{/if}}{{>symbol/name .~}}
+enum{{#if isScoped}} class{{/if}}{{#if attributes}} {{>symbol/attributes symbol}}{{/if}} {{>symbol/name .~}}
 {{#if type}} : {{>type/declarator type}}{{/if}};

share/mrdocs/addons/generator/common/partials/symbol/signature/field.hbs

@@ -1,5 +1,5 @@
-{{#if attributes}}{{ str "[[" }}{{join ", " attributes}}{{ str "]]" }}
-{{/if}}
+{{#if attributes}}{{>symbol/attributes symbol}}
+{{/if~}}
 {{#if isMutable}}mutable
 {{/if~}}
 {{>type/declarator-prefix type}} {{>symbol/name symbol~}}

share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs

@@ -2,7 +2,7 @@
 {{/if~}}
 {{#if isFriend}}friend
 {{/if~}}
-{{#if attributes}}{{#unless isFriend}}{{ str "[[" }}{{join ", " attributes}}{{ str "]]" }}
+{{#if attributes}}{{#unless isFriend}}{{>symbol/attributes symbol}}
 {{/unless}}{{/if~}}
 {{#if constexprKind}}{{constexprKind}}
 {{/if~}}
@@ -28,7 +28,7 @@
 {{#if requires}}
 
 requires {{requires}}{{/if~}}
-{{#if hasOverrideAttr}} override{{/if~}}
+{{#if isOverride}} override{{/if~}}
 {{#if isFinal}} final{{/if~}}
 {{#if isPure}} = 0{{/if~}}
 {{#if isDeleted}} = delete{{/if~}}

share/mrdocs/addons/generator/common/partials/symbol/signature/record.hbs

@@ -1,6 +1,6 @@
 {{#if template}}{{>template/head template}}
 {{/if~}}
-{{#if isFriend}}friend {{/if}}{{tag}} {{>symbol/name symbol link=(select link link template.primary)~}}
+{{#if isFriend}}friend {{/if}}{{tag}}{{#if attributes}} {{>symbol/attributes symbol}}{{/if}} {{>symbol/name symbol link=(select link link template.primary)~}}
 {{#unless bases~}}
 {{else if isFriend~}}
 {{else}}

share/mrdocs/addons/generator/common/partials/symbol/signature/typedef.hbs

@@ -1,7 +1,9 @@
 {{#if isUsing~}}
     {{#if template}}{{>template/head template}}
     {{/if~}}
-    using {{name}} = {{>type/declarator type}}
+    using {{name}}{{#if attributes}} {{>symbol/attributes symbol}}{{/if}} = {{>type/declarator type}}
 {{~else~}}
+    {{#if attributes}}{{>symbol/attributes symbol}}
+    {{/if~}}
     typedef {{>type/declarator type decl-name=name}}
 {{~/if}};

share/mrdocs/addons/generator/common/partials/symbol/signature/variable.hbs

@@ -1,5 +1,7 @@
 {{#if template}}{{>template/head template}}
 {{/if~}}
+{{#if attributes}}{{>symbol/attributes symbol}}
+{{/if~}}
 {{#if isInline}}inline {{/if~}}
 {{#if isConstexpr}}constexpr {{/if~}}
 {{#if storageClass}}{{storageClass}}