var bits uses bitfield

Author: klemens-morgenstern

include/mrdox/Metadata/Var.hpp

@@ -21,9 +21,11 @@
 namespace clang {
 namespace mrdox {
 
-enum class VarFlags0 : std::uint32_t
+union VarFlags0
 {
-    storageClass        = 0b00000000'00000000'00000000'00000111
+    BitFieldFullValue raw;
+
+    BitField<0, 3, StorageClass> storageClass;
 };
 
 /** A variable.
@@ -35,7 +37,7 @@ struct VarInfo
     : SymbolInfo
     , TypeInfo // holds the type of this variable
 {
-    Bits<VarFlags0> specs;
+    VarFlags0 specs{.raw={0}};
 
     //--------------------------------------------
 

source/api/AST/ASTVisitor.cpp

@@ -1052,7 +1052,7 @@ buildVar(
         I.Loc.emplace_back(LineNumber, File, IsFileInRootDir);
     static_cast<TypeInfo&>(I) =
         getTypeInfoForType(D->getTypeSourceInfo()->getType());
-    I.specs.set<VarFlags0::storageClass>(D->getStorageClass());
+    I.specs.storageClass = D->getStorageClass();
     insertBitcode(ex_, writeBitcode(I));
     insertBitcode(ex_, writeParent(std::move(I)));
 }

source/api/AST/AnyBlock.hpp

@@ -1128,7 +1128,7 @@ class VarBlock
         switch(ID)
         {
         case VARIABLE_BITS:
-            return decodeRecord(R, Blob, I->specs);
+            return decodeRecord<1u>(R, {&I->specs.raw}, Blob);
         default:
             break;
         }

source/api/AST/BitcodeWriter.cpp

@@ -1027,7 +1027,7 @@ emitBlock(
     emitInfoPart(I);
     emitSymbolPart(I);
     emitBlock(static_cast<TypeInfo const&>(I));
-    emitRecord(VARIABLE_BITS, I.specs);
+    emitRecord({I.specs.raw}, VARIABLE_BITS);
 }
 
 //------------------------------------------------

source/api/Metadata/Reduce.cpp

@@ -200,7 +200,7 @@ void merge(VarInfo& I, VarInfo&& Other)
     if(I.Type.id == EmptySID && I.Type.Name.empty())
         I.Type = std::move(Other.Type);
     mergeSymbolInfo(I, std::move(Other));
-    I.specs.merge(std::move(Other.specs));
+    I.specs.raw.value |= Other.specs.raw.value;
 }
 
 void merge(Reference& I, Reference&& Other)

source/api/_XML/CXXTags.hpp

@@ -61,16 +61,7 @@ constexpr llvm::StringRef getBitsIDName(RecFlags0 ID)
     return "";
 }
 
-constexpr llvm::StringRef getBitsIDName(VarFlags0 ID)
-{
-    switch(ID)
-    {
-    case VarFlags0::storageClass:     return "storage-class";
-    default:
-        Assert(false);
-    }
-    return "";
-}
+
 
 constexpr llvm::StringRef getNameForValue(...)
 {
@@ -282,9 +273,10 @@ inline void write(FnFlags1 const& bits, XMLTags& tags)
     fw.write(&FnFlags1::isExplicit,        "is-explicit");
 }
 
-inline void write(Bits<VarFlags0> const& bits, XMLTags& tags)
+inline void write(VarFlags0 const& bits, XMLTags& tags)
 {
-    WriteBits(bits).write<VarFlags0::storageClass, StorageClass>(tags);
+    BitFieldWriter<VarFlags0> fw(bits, tags);
+    fw.write(&VarFlags0::storageClass, "storage-class");
 }
 
 inline void writeReturnType(TypeInfo const& I, XMLTags& tags)