chore: RecordInfo member refs are just symbol IDs

include/mrdox/Corpus.hpp

@@ -105,13 +105,6 @@ class MRDOX_VISIBLE
         MRDOX_DECL virtual bool visit(VarInfo const&);
         MRDOX_DECL virtual bool visit(FieldInfo const&);
         MRDOX_DECL virtual bool visit(SpecializationInfo const&);
-
-        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(DataMember const&, Access);
-        MRDOX_DECL virtual bool visit(StaticDataMember const&, Access);
     };
 
     /** Traverse the symbol, list, or its children.

include/mrdox/Metadata/Info.hpp

@@ -37,6 +37,17 @@ struct MRDOX_VISIBLE
     */
     InfoKind Kind;
 
+    /** Declaration access.
+
+        Class members use:
+        @li `AccessKind::Public`,
+        @li `AccessKind::Protected`, and
+        @li `AccessKind::Private`.
+
+        Namespace members use `AccessKind::None`.
+    */
+    AccessKind Access = AccessKind::None;
+
     /** The unqualified name.
     */
     std::string Name;

include/mrdox/Metadata/Interface.hpp

@@ -22,6 +22,42 @@
 namespace clang {
 namespace mrdox {
 
+struct DataMember
+{
+    FieldInfo const* I;
+    RecordInfo const* From;
+};
+
+struct MemberEnum
+{
+    EnumInfo const* I;
+    RecordInfo const* From;
+};
+
+struct MemberFunction
+{
+    FunctionInfo const* I;
+    RecordInfo const* From;
+};
+
+struct MemberRecord
+{
+    RecordInfo const* I;
+    RecordInfo const* From;
+};
+
+struct MemberType
+{
+    TypedefInfo const* I;
+    RecordInfo const* From;
+};
+
+struct StaticDataMember
+{
+    VarInfo const* I;
+    RecordInfo const* From;
+};
+
 /** The aggregated interface for a given struct, class, or union.
 */
 class Interface

include/mrdox/Metadata/Record.hpp

@@ -30,45 +30,6 @@
 namespace clang {
 namespace mrdox {
 
-/** Access specifier.
-
-    Public is set to zero since it is the most
-    frequently occurring access, and it is
-    elided by the bitstream encoder because it
-    has an all-zero bit pattern. This improves
-    compression in the bitstream.
-
-    @note It is by design that there is no
-    constant to represent "none."
-*/
-enum class Access
-{
-    Public = 0,
-    Protected,
-    Private
-};
-
-/** A reference to a symbol, and an access specifier.
-
-    This is used in records to refer to nested
-    elements with access control.
-*/
-struct MemberRef
-{
-    SymbolID id;
-    Access access;
-
-    constexpr MemberRef() = default;
-
-    constexpr MemberRef(
-        const SymbolID& id_,
-        Access access_)
-    : id(id_)
-    , access(access_)
-    {
-    }
-};
-
 /** Bit constants used with Record metadata
 */
 union RecFlags0
@@ -85,13 +46,13 @@ struct BaseInfo
 {
     SymbolID id;
     std::string Name;
-    Access access;
+    AccessKind access;
     bool IsVirtual;
 
     BaseInfo(
         SymbolID const& id_ = SymbolID::zero,
         std::string_view Name_ = "",
-        Access access_ = Access::Public,
+        AccessKind access_ = AccessKind::Public,
         bool IsVirtual_ = false)
         : id(id_)
         , Name(Name_)
@@ -101,19 +62,6 @@ struct BaseInfo
     }
 };
 
-/** Members of a class, struct, or union.
-*/
-struct RecordScope
-{
-    std::vector<MemberRef> Records;
-    std::vector<MemberRef> Functions;
-    std::vector<MemberRef> Enums;
-    std::vector<MemberRef> Types;
-    std::vector<MemberRef> Fields;
-    std::vector<MemberRef> Vars;
-    std::vector<SymbolID> Specializations;
-};
-
 enum class RecordKeyKind
 {
     Struct,
@@ -155,7 +103,11 @@ struct RecordInfo
 
     /** Record members
     */
-    RecordScope Members;
+    std::vector<SymbolID> Members;
+
+    /** Record member specializations
+    */
+    std::vector<SymbolID> Specializations;
 
     //--------------------------------------------
 
@@ -175,42 +127,6 @@ struct RecordInfo
     }
 };
 
-struct DataMember
-{
-    FieldInfo const* I;
-    RecordInfo const* From;
-};
-
-struct MemberEnum
-{
-    EnumInfo const* I;
-    RecordInfo const* From;
-};
-
-struct MemberFunction
-{
-    FunctionInfo const* I;
-    RecordInfo const* From;
-};
-
-struct MemberRecord
-{
-    RecordInfo const* I;
-    RecordInfo const* From;
-};
-
-struct MemberType
-{
-    TypedefInfo const* I;
-    RecordInfo const* From;
-};
-
-struct StaticDataMember
-{
-    VarInfo const* I;
-    RecordInfo const* From;
-};
-
 } // mrdox
 } // clang
 

include/mrdox/Metadata/Symbols.hpp

@@ -109,7 +109,7 @@ using OptionalSymbolID = Optional<SymbolID>;
 */
 enum class InfoKind
 {
-    Namespace,
+    Namespace = 0,
     Record,
     Function,
     Enum,
@@ -119,6 +119,25 @@ enum class InfoKind
     Specialization
 };
 
+/** Access specifier.
+
+    Public is set to zero since it is the most
+    frequently occurring access, and it is
+    elided by the bitstream encoder because it
+    has an all-zero bit pattern. This improves
+    compression in the bitstream.
+
+    None is used for namespace members and friend;
+    such declarations have no access.
+*/
+enum class AccessKind
+{
+    Public = 0,
+    Protected,
+    Private,
+    None
+};
+
 /** Return the result of comparing s0 to s1.
 
     This function returns true if the string

include/mrdox/MetadataFwd.hpp

@@ -25,7 +25,7 @@ class Corpus;
 
 class Interface;
 
-enum class Access;
+enum class AccessKind;
 enum class FunctionKind;
 
 struct BaseInfo;
@@ -36,10 +36,8 @@ struct FunctionInfo;
 struct Info;
 struct Javadoc;
 struct Location;
-struct MemberRef;
 struct NamespaceInfo;
 struct RecordInfo;
-struct RecordScope;
 struct Param;
 struct SpecializationInfo;
 struct SpecializedMember;

source/-XML/XMLTags.hpp

@@ -106,26 +106,29 @@ struct Attribute
     }
 
     Attribute(
-        Access access)
+        AccessKind access)
         : name("access")
         , value(
             [access]
             {
                 switch(access)
                 {
-                case Access::Public: return std::string("public");
-                case Access::Protected: return std::string("protected");
-                case Access::Private: return std::string("private");
+                case AccessKind::None:
+                    return std::string();
+                case AccessKind::Public: return std::string("public");
+                case AccessKind::Protected: return std::string("protected");
+                case AccessKind::Private: return std::string("private");
                 default:
                     llvm_unreachable("unknown Access");
                 }
             }())
-        , pred(true)
+        , pred(access == AccessKind::Private || access == AccessKind::Protected)
     {
     }
 
+    #if 0
     Attribute(
-        Access const* access)
+        AccessKind const* access)
         : name("access")
         , value(
             [access]
@@ -134,16 +137,17 @@ struct Attribute
                     return std::string();
                 switch(*access)
                 {
-                case Access::Public: return std::string("public");
-                case Access::Protected: return std::string("protected");
-                case Access::Private: return std::string("private");
+                case AccessKind::Public: return std::string("public");
+                case AccessKind::Protected: return std::string("protected");
+                case AccessKind::Private: return std::string("private");
                 default:
                     llvm_unreachable("unknown Access");
                 }
             }())
-        , pred(access != nullptr && *access != Access::Public)
+        , pred(access != nullptr && *access != AccessKind::Public)
     {
     }
+    #endif
 
     Attribute(
         std::optional<TypeInfo> const& opt)