split tranche access to separate vector

cppalliance · May 14, 2023 · f17057b · f17057b
1 parent 7c21e67
commit f17057b
Show file tree

Hide file tree

Showing 10 changed files with 183 additions and 132 deletions.
diff --git a/include/mrdox/Corpus.hpp b/include/mrdox/Corpus.hpp
@@ -108,12 +108,12 @@ class MRDOX_VISIBLE
         MRDOX_DECL virtual bool visit(EnumInfo const&);
         MRDOX_DECL virtual bool visit(VarInfo const&);
 
-        MRDOX_DECL virtual bool visit(DataMember const&);
-        MRDOX_DECL virtual bool visit(MemberEnum const&);
-        MRDOX_DECL virtual bool visit(MemberFunction const&);
-        MRDOX_DECL virtual bool visit(MemberRecord const&);
-        MRDOX_DECL virtual bool visit(MemberType const&);
-        MRDOX_DECL virtual bool visit(StaticDataMember const&);
+        MRDOX_DECL virtual bool visit(DataMember const&, Access);
+        MRDOX_DECL virtual bool visit(MemberEnum const&, Access);
+        MRDOX_DECL virtual bool visit(MemberFunction const&, Access);
+        MRDOX_DECL virtual bool visit(MemberRecord const&, Access);
+        MRDOX_DECL virtual bool visit(MemberType const&, Access);
+        MRDOX_DECL virtual bool visit(StaticDataMember const&, Access);
     };
 
     /** Traverse the symbol, list, or its children.

diff --git a/include/mrdox/Metadata/Function.hpp b/include/mrdox/Metadata/Function.hpp
@@ -35,29 +35,28 @@ 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;
-    BitField<11, 2, ConstexprSpecKind> constexprKind;
-    BitField<13, 4, ExceptionSpecificationType> exceptionSpecType;
-    BitField<17, 6, OverloadedOperatorKind> overloadedOperator;
-    BitField<23, 3, StorageClass> storageClass;
-    BitFlag<26> isConst;
-    BitFlag<27> isVolatile;
-    BitField<28, 2, RefQualifierKind> refQualifier;
+    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, ConstexprSpecKind> constexprKind;
+    BitField<16, 4, ExceptionSpecificationType> exceptionSpecType;
+    BitField<20, 6, OverloadedOperatorKind> overloadedOperator;
+    BitField<26, 3, StorageClass> storageClass;
+    BitField<29, 2, RefQualifierKind> refQualifier;
 };
 
-
-
 /** Bit field used with function specifiers.
 */
 union FnFlags1

diff --git a/include/mrdox/Metadata/Members.hpp b/include/mrdox/Metadata/Members.hpp
@@ -28,42 +28,36 @@ struct DataMember
 {
     MemberTypeInfo const* I;
     RecordInfo const* From;
-    Access access;
 };
 
 struct MemberEnum
 {
     EnumInfo const* I;
     RecordInfo const* From;
-    Access access;
 };
 
 struct MemberFunction
 {
     FunctionInfo const* I;
     RecordInfo const* From;
-    Access access;
 };
 
 struct MemberRecord
 {
     RecordInfo const* I;
     RecordInfo const* From;
-    Access access;
 };
 
 struct MemberType
 {
     TypedefInfo const* I;
     RecordInfo const* From;
-    Access access;
 };
 
 struct StaticDataMember
 {
     VarInfo const* I;
     RecordInfo const* From;
-    Access access;
 };
 
 } // mrdox

diff --git a/source/lib/api/AST/ASTVisitor.cpp b/source/lib/api/AST/ASTVisitor.cpp
@@ -796,6 +796,7 @@ constructFunction(
         I.specs0.isConst = D->isConst();
         I.specs0.isVolatile = D->isVolatile();
         I.specs0.refQualifier = D->getRefQualifier();
+        I.specs0.isFinal = D->template hasAttr<FinalAttr>();
         //D->isCopyAssignmentOperator()
         //D->isMoveAssignmentOperator()
         //D->isOverloadedOperator();
@@ -947,8 +948,25 @@ buildRecord(
         }
     }
 
+    AccessSpecifier access;
+    if(auto CT = D->getDescribedClassTemplate())
+    {
+        access = CT->getAccess();
+    }
+    else if(auto MSI = D->getMemberSpecializationInfo())
+    {
+        access = MSI->getInstantiatedFrom()->getAccess();
+    }
+    else if(auto* CTSD = dyn_cast<ClassTemplateSpecializationDecl>(D))
+    {
+        access = CTSD->getSpecializedTemplate()->getAccess();
+    }
+    else
+    {
+        access = D->getAccess();
+    }
     insertBitcode(ex_, writeBitcode(I));
-    insertBitcode(ex_, writeParent(std::move(I), D->getAccess()));
+    insertBitcode(ex_, writeParent(std::move(I), access));
 }
 
 void

diff --git a/source/lib/api/Corpus.cpp b/source/lib/api/Corpus.cpp
@@ -112,39 +112,34 @@ bool Corpus::Visitor::visit(VarInfo const&)
 
 //---
 
-bool Corpus::Visitor::visit(DataMember const&)
+bool Corpus::Visitor::visit(DataMember const&, Access)
 {
     return true;
 }
 
-bool Corpus::Visitor::visit(MemberEnum const& I)
+bool Corpus::Visitor::visit(MemberEnum const& I, Access)
 {
-    return visit(*I.I);
-//    return true;
+    return true;
 }
 
-bool Corpus::Visitor::visit(MemberFunction const& I)
+bool Corpus::Visitor::visit(MemberFunction const& I, Access)
 {
-    return visit(*I.I);
-//    return true;
+    return true;
 }
 
-bool Corpus::Visitor::visit(MemberRecord const& I)
+bool Corpus::Visitor::visit(MemberRecord const& I, Access)
 {
-    return visit(*I.I);
-//    return true;
+    return true;
 }
 
-bool Corpus::Visitor::visit(MemberType const& I)
+bool Corpus::Visitor::visit(MemberType const& I, Access)
 {
-    return visit(*I.I);
-//    return true;
+    return true;
 }
 
-bool Corpus::Visitor::visit(StaticDataMember const& I)
+bool Corpus::Visitor::visit(StaticDataMember const& I, Access)
 {
-    return visit(*I.I);
-//    return true;
+    return true;
 }
 
 
@@ -211,30 +206,30 @@ traverse(
     for(auto const& t : I.Children_.Records)
         if(! f.visit(MemberRecord{
             &get<RecordInfo>(t.id),
-                &I, t.access}))
+                &I}, t.access))
             return false;
     for(auto const& t : I.Children_.Functions)
         if(! f.visit(MemberFunction{
             &get<FunctionInfo>(t.id),
-                &I, t.access}))
+                &I}, t.access))
             return false;
     for(auto const& t : I.Children_.Types)
         if(! f.visit(MemberType{
             &get<TypedefInfo>(t.id),
-                &I, t.access}))
+                &I}, t.access))
             return false;
     for(auto const& t : I.Children_.Enums)
         if(! f.visit(MemberEnum{
             &get<EnumInfo>(t.id),
-                &I, t.access}))
+                &I}, t.access))
             return false;
     for(auto const& t : I.Children_.Vars)
         if(! f.visit(StaticDataMember{
             &get<VarInfo>(t.id),
-                &I, t.access}))
+                &I}, t.access))
             return false;
     for(auto const& t : I.Members)
-        if(! f.visit(DataMember{&t, &I, t.access}))
+        if(! f.visit(DataMember{&t, &I}, t.access))
             return false;
     return true;
 }