rename RefWithAccess to MemberRef

Author: sdkrystian

include/mrdox/Metadata/Access.hpp

@@ -40,7 +40,7 @@ enum class Access
     This is used in records to refer to nested
     elements with access control.
 */
-struct RefWithAccess
+struct MemberRef
 {
     SymbolID id;
     Access access;

include/mrdox/Metadata/Record.hpp

@@ -67,11 +67,11 @@ struct BaseInfo
 */
 struct RecordScope
 {
-    std::vector<RefWithAccess> Records;
-    std::vector<RefWithAccess> Functions;
-    std::vector<RefWithAccess> Enums;
-    std::vector<RefWithAccess> Types;
-    std::vector<RefWithAccess> Vars;
+    std::vector<MemberRef> Records;
+    std::vector<MemberRef> Functions;
+    std::vector<MemberRef> Enums;
+    std::vector<MemberRef> Types;
+    std::vector<MemberRef> Vars;
 };
 
 /** Metadata for struct, class, or union.

include/mrdox/Metadata/Template.hpp

@@ -39,7 +39,7 @@ struct TemplateInfo
     // for partial specializations:
     //     - Params will be non-empty
     //     - each template parameter will appear at least
-    //       once in Args outside of a non-deduced context 
+    //       once in Args outside of a non-deduced context
     std::vector<TParam> Params;
     std::vector<TArg> Args;
 

include/mrdox/MetadataFwd.hpp

@@ -39,7 +39,7 @@ struct MemberTypeInfo;
 struct NamespaceInfo;
 struct RecordInfo;
 struct RecordScope;
-struct RefWithAccess;
+struct MemberRef;
 struct Reference;
 struct Scope;
 struct SymbolInfo;

source/AST/ASTVisitor.cpp

@@ -697,7 +697,7 @@ writeParent(
     }
 
     // Create an empty Record for the child,
-    // and insert the child as a RefWithAccess.
+    // and insert the child as a MemberRef.
     // Then return the parent as a serialized bitcode.
     Assert(! I.Namespace.empty());
     Assert(I.Namespace[0].RefType == InfoType::IT_record);

source/AST/AnyBlock.hpp

@@ -691,7 +691,7 @@ class TemplateParamBlock
                 return makeError("invalid template parameter kind");
             }
         }
-            
+
         default:
             return AnyBlock::parseRecord(R, ID, Blob);
         }
@@ -729,7 +729,7 @@ class TemplateParamBlock
             TypeBlock B(*t, br_);
             if(auto Err = br_.readBlock(B, ID))
                 return Err;
-            // KRYSTIAN NOTE: is this check correct? 
+            // KRYSTIAN NOTE: is this check correct?
             // copied from a function with TypeInfo sub-block
             switch(B.F)
             {

source/AST/BitcodeWriter.cpp

@@ -591,11 +591,11 @@ emitRecord(
     Stream.EmitRecordWithAbbrev(Abbrevs.get(ID), Record);
 }
 
-// vector<RefWithAccess>
+// vector<MemberRef>
 void
 BitcodeWriter::
 emitRecord(
-    std::vector<RefWithAccess> const& list,
+    std::vector<MemberRef> const& list,
     RecordID ID)
 {
     Assert(RecordIDNameMap[ID]);

source/AST/BitcodeWriter.hpp

@@ -86,7 +86,7 @@ class BitcodeWriter
     void emitRecord(Enum Value, RecordID ID);
 
     void emitRecord(llvm::SmallVectorImpl<SymbolID> const& Values, RecordID ID);
-    void emitRecord(std::vector<RefWithAccess> const& list, RecordID ID);
+    void emitRecord(std::vector<MemberRef> const& list, RecordID ID);
 
     void emitRecord(SymbolID const& Str, RecordID ID);
     void emitRecord(StringRef Str, RecordID ID);

source/AST/DecodeRecord.hpp

@@ -99,20 +99,20 @@ decodeRecord(
     return llvm::Error::success();
 }
 
-// vector<RefWithAccess>
+// vector<MemberRef>
 inline
 llvm::Error
 decodeRecord(
     Record const& R,
-    std::vector<RefWithAccess>& f,
+    std::vector<MemberRef>& f,
     llvm::StringRef blob)
 {
-    constexpr auto RefWithAccessSize =
+    constexpr auto MemberRefSize =
         BitCodeConstants::USRHashSize + 1;
     if(R.empty())
         return makeError("empty");
-    auto n = R.size() / RefWithAccessSize;
-    if(R.size() != n * RefWithAccessSize)
+    auto n = R.size() / MemberRefSize;
+    if(R.size() != n * MemberRefSize)
         return makeError("short Record");
     auto src = R.begin();
     f.resize(n);

source/Metadata/Reduce.cpp

@@ -124,14 +124,14 @@ void merge(NamespaceInfo& I, NamespaceInfo&& Other)
 static
 void
 reduceRefsWithAccess(
-    std::vector<RefWithAccess>& list,
-    std::vector<RefWithAccess>&& otherList)
+    std::vector<MemberRef>& list,
+    std::vector<MemberRef>&& otherList)
 {
     for(auto const& ref : otherList)
     {
         auto it = llvm::find_if(
             list,
-            [ref](RefWithAccess const& other) noexcept
+            [ref](MemberRef const& other) noexcept
             {
                 return other.id == ref.id;
             });