refactor: remove BitField/BitFlag

Author: sdkrystian

include/mrdocs/ADT/BitField.hpp

@@ -18,23 +18,11 @@
 #include <mrdocs/Metadata/Info.hpp>
 #include <mrdocs/Metadata/Source.hpp>
 #include <mrdocs/Metadata/Type.hpp>
-#include <mrdocs/ADT/BitField.hpp>
 #include <utility>
 
 namespace clang {
 namespace mrdocs {
 
-union FieldFlags
-{
-    BitFieldFullValue raw{.value=0u};
-
-    // KRYSTIAN FIXME: nodiscard cannot be applied to fields; this should
-    // instead be isMaybeUnused. we should also store the spelling
-    BitFlag<0> isMaybeUnused;
-    BitFlag<1> isDeprecated;
-    BitFlag<2> hasNoUniqueAddress;
-};
-
 /** Info for fields (i.e. non-static data members)
 
     Non-static data members cannot be redeclared.
@@ -50,9 +38,6 @@ struct FieldInfo
     */
     ExprInfo Default;
 
-    // attributes (maybe_unused, no_unique_address, deprecated)
-    FieldFlags specs;
-
     /** Whether the field is declared mutable */
     bool IsMutable = false;
 
@@ -62,6 +47,14 @@ struct FieldInfo
     /** 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;
+
     //--------------------------------------------
 
     explicit FieldInfo(SymbolID ID) noexcept

include/mrdocs/Metadata/Field.hpp

@@ -14,7 +14,6 @@
 #define MRDOCS_API_METADATA_FUNCTION_HPP
 
 #include <mrdocs/Platform.hpp>
-#include <mrdocs/ADT/BitField.hpp>
 #include <mrdocs/Metadata/Field.hpp>
 #include <mrdocs/Metadata/Source.hpp>
 #include <mrdocs/Metadata/Symbols.hpp>
@@ -68,45 +67,6 @@ enum class FunctionClass
 
 MRDOCS_DECL dom::String toString(FunctionClass kind) noexcept;
 
-/** Bit constants used with function specifiers.
-*/
-union FnFlags0
-{
-    BitFieldFullValue raw;
-
-    BitFlag < 0> isVariadic;
-    BitFlag < 1> isVirtual;
-    BitFlag < 2> isVirtualAsWritten;
-    BitFlag < 3> isPure;
-    BitFlag < 4> isDefaulted;
-    BitFlag < 5> isExplicitlyDefaulted;
-    BitFlag < 6> isDeleted;
-    BitFlag < 7> isDeletedAsWritten;
-    BitFlag < 8> isNoReturn;
-    BitFlag < 9> hasOverrideAttr;
-    BitFlag <10> hasTrailingReturn;
-    BitFlag <11> isConst;
-    BitFlag <12> isVolatile;
-    BitField<13> isFinal;
-
-    BitField<14, 2, ConstexprKind> constexprKind;
-    BitField<16, 4, NoexceptKind> exceptionSpec;
-    BitField<20, 6, OperatorKind> overloadedOperator;
-    BitField<26, 3, StorageClassKind> storageClass;
-    BitField<29, 2, ReferenceKind> refQualifier;
-};
-
-/** Bit field used with function specifiers.
-*/
-union FnFlags1
-{
-    BitFieldFullValue raw;
-
-    BitFlag<0> isNodiscard;
-
-    BitFlag<4> isExplicitObjectMemberFunction;
-};
-
 // KRYSTIAN TODO: attributes (nodiscard, deprecated, and carries_dependency)
 // KRYSTIAN TODO: flag to indicate whether this is a function parameter pack
 /** Represents a single function parameter */
@@ -152,15 +112,34 @@ struct FunctionInfo
     // the class of function this is
     FunctionClass Class = FunctionClass::Normal;
 
-    FnFlags0 specs0{.raw{0}};
-    FnFlags1 specs1{.raw{0}};
-
     NoexceptInfo Noexcept;
 
     ExplicitInfo Explicit;
 
     ExprInfo Requires;
 
+    bool IsVariadic = false;
+    bool IsVirtual = false;
+    bool IsVirtualAsWritten = false;
+    bool IsPure = false;
+    bool IsDefaulted = false;
+    bool IsExplicitlyDefaulted = false;
+    bool IsDeleted = false;
+    bool IsDeletedAsWritten = false;
+    bool IsNoReturn = false;
+    bool HasOverrideAttr = false;
+    bool HasTrailingReturn = false;
+    bool IsConst = false;
+    bool IsVolatile = false;
+    bool IsFinal = false;
+    bool IsNodiscard = false;
+    bool IsExplicitObjectMemberFunction = false;
+
+    ConstexprKind Constexpr = ConstexprKind::None;
+    OperatorKind OverloadedOperator = OperatorKind::None;
+    StorageClassKind StorageClass = StorageClassKind::None;
+    ReferenceKind RefQualifier = ReferenceKind::None;
+
     //--------------------------------------------
 
     explicit FunctionInfo(SymbolID ID) noexcept

include/mrdocs/Metadata/Function.hpp

@@ -13,29 +13,21 @@
 #define MRDOCS_API_METADATA_NAMESPACE_HPP
 
 #include <mrdocs/Platform.hpp>
-#include <mrdocs/ADT/BitField.hpp>
 #include <mrdocs/Metadata/Info.hpp>
 #include <mrdocs/Metadata/Scope.hpp>
 #include <vector>
 
 namespace clang {
 namespace mrdocs {
 
-union NamespaceFlags
-{
-    BitFieldFullValue raw{.value=0u};
-
-    BitFlag<0> isInline;
-    BitFlag<1> isAnonymous;
-};
-
 /** Describes a namespace.
 */
 struct NamespaceInfo
     : InfoCommonBase<InfoKind::Namespace>
     , ScopeInfo
 {
-    NamespaceFlags specs;
+    bool IsInline = false;
+    bool IsAnonymous = false;
 
     /** Namespaces nominated by using-directives.
     */

include/mrdocs/Metadata/Namespace.hpp

@@ -13,7 +13,6 @@
 #define MRDOCS_API_METADATA_RECORD_HPP
 
 #include <mrdocs/Platform.hpp>
-#include <mrdocs/ADT/BitField.hpp>
 #include <mrdocs/Metadata/Info.hpp>
 #include <mrdocs/Metadata/Scope.hpp>
 #include <mrdocs/Metadata/Source.hpp>
@@ -27,16 +26,6 @@
 namespace clang {
 namespace mrdocs {
 
-/** Bit constants used with Record metadata
-*/
-union RecFlags0
-{
-    BitFieldFullValue raw{.value=0u};
-
-    BitFlag<0> isFinal;
-    BitFlag<1> isFinalDestructor;
-};
-
 /** Metadata for a direct base.
 */
 struct BaseInfo
@@ -88,7 +77,8 @@ struct RecordInfo
     // KRYSTIAN FIXME: this does not account for alias-declarations
     bool IsTypeDef = false;
 
-    RecFlags0 specs;
+    bool IsFinal = false;
+    bool IsFinalDestructor = false;
 
     /** List of immediate bases.
     */

include/mrdocs/Metadata/Record.hpp

@@ -13,7 +13,6 @@
 #define MRDOCS_API_METADATA_VARIABLE_HPP
 
 #include <mrdocs/Platform.hpp>
-#include <mrdocs/ADT/BitField.hpp>
 #include <mrdocs/Metadata/Expression.hpp>
 #include <mrdocs/Metadata/Source.hpp>
 #include <mrdocs/Metadata/Template.hpp>
@@ -23,16 +22,6 @@
 namespace clang {
 namespace mrdocs {
 
-union VariableFlags0
-{
-    BitFieldFullValue raw;
-
-    BitField<0, 3, StorageClassKind> storageClass;
-    BitField<3, 2, ConstexprKind> constexprKind;
-    BitFlag<5> isConstinit;
-    BitFlag<6> isThreadLocal;
-};
-
 /** A variable.
 
     This includes variables at namespace
@@ -47,10 +36,16 @@ struct VariableInfo
 
     std::unique_ptr<TemplateInfo> Template;
 
-    VariableFlags0 specs{.raw={0}};
-
     ExprInfo Initializer;
 
+    StorageClassKind StorageClass = StorageClassKind::None;
+
+    ConstexprKind Constexpr = ConstexprKind::None;
+
+    bool IsConstinit = false;
+
+    bool IsThreadLocal = false;
+
     //--------------------------------------------
 
     explicit VariableInfo(SymbolID ID) noexcept

include/mrdocs/Metadata/Variable.hpp

@@ -73,12 +73,6 @@ struct StaticDataMember;
 
 struct OverloadSet;
 
-template<unsigned char Offset,
-         unsigned char Size,
-         typename T>
-struct BitField;
-using BitFieldFullValue = BitField<0, 32, std::uint32_t>;
-
 } // mrdocs
 } // clang