child enums are refs

Author: vinniefalco

include/mrdox/Metadata/Scope.hpp

@@ -38,7 +38,7 @@ struct Scope
     std::vector<Reference> Records;
     std::vector<Reference> Functions;
     std::vector<Reference> Typedefs;
-    std::vector<EnumInfo> Enums;
+    std::vector<Reference> Enums;
     std::vector<Reference> Variables;
 
     explicit

source/api/AST/AnyBlock.hpp

@@ -1213,20 +1213,6 @@ readSubBlock(
         }
         break;
     }
-    case BI_ENUM_BLOCK_ID:
-    {
-        if constexpr(
-            std::derived_from<T, NamespaceInfo> ||
-            std::derived_from<T, RecordInfo>)
-        {
-            EnumBlock B(br_);
-            if(auto Err = br_.readBlock(B, ID))
-                return Err;
-            I->Children.Enums.emplace_back(std::move(*B.I));
-            return llvm::Error::success();
-        }
-        break;
-    }
     default:
         break;
     }

source/api/AST/BitcodeIDs.hpp

@@ -134,7 +134,8 @@ enum class FieldId
     F_child_namespace,
     F_child_record,
     F_child_function,
-    F_child_typedef
+    F_child_typedef,
+    F_child_enum
 };
 
 } // mrdox

source/api/AST/BitcodeWriter.cpp

@@ -900,8 +900,8 @@ emitBlock(
         emitBlock(ref, FieldId::F_child_function);
     for (const auto& ref : I.Children.Typedefs)
         emitBlock(ref, FieldId::F_child_typedef);
-    for (const auto& C : I.Children.Enums)
-        emitBlock(C);
+    for (const auto& ref : I.Children.Enums)
+        emitBlock(ref, FieldId::F_child_enum);
 }
 
 void
@@ -929,8 +929,8 @@ emitBlock(
         emitBlock(C, FieldId::F_child_function);
     for (const auto& ref : I.Children.Typedefs)
         emitBlock(ref, FieldId::F_child_typedef);
-    for (const auto& C : I.Children.Enums)
-        emitBlock(C);
+    for (const auto& ref : I.Children.Enums)
+        emitBlock(ref, FieldId::F_child_enum);
     if (I.Template)
         emitBlock(*I.Template);
     emitRecord(I.Friends, RECORD_FRIENDS);

source/api/AST/DecodeRecord.hpp

@@ -219,6 +219,7 @@ decodeRecord(
     case FieldId::F_child_record:
     case FieldId::F_child_function:
     case FieldId::F_child_typedef:
+    case FieldId::F_child_enum:
     case FieldId::F_default:
         Field = F;
         return llvm::Error::success();

source/api/AST/Serializer.cpp

@@ -473,7 +473,7 @@ insertChild(Parent& parent, Child&& I)
     }
     else if constexpr(std::is_same_v<Child, EnumInfo>)
     {
-        parent.Children.Enums.emplace_back(std::move(I));
+        parent.Children.Enums.emplace_back(I.id, I.Name, Child::type_id);
     }
     else
     {

source/api/Corpus.cpp

@@ -177,8 +177,8 @@ visit(Scope const& I, Visitor& f) const
     for(auto const& ref : I.Typedefs)
         if(! visit(get<TypedefInfo>(ref.id), f))
             return false;
-    for(auto const& J : I.Enums)
-        if(! visit(J, f))
+    for(auto const& ref : I.Enums)
+        if(! visit(get<EnumInfo>(ref.id), f))
             return false;
     return true;
 }
@@ -230,8 +230,8 @@ visitWithOverloads(
     for(auto const& ref : I.Typedefs)
         if(! visit(get<TypedefInfo>(ref.id), f))
             return false;
-    for(auto const& J : I.Enums)
-        if(! visit(J, f))
+    for(auto const& ref : I.Enums)
+        if(! visit(get<EnumInfo>(ref.id), f))
             return false;
     return true;
 }

source/api/CorpusImpl.cpp

@@ -80,8 +80,8 @@ visit(Scope& I, MutableVisitor& f)
         visit(get<FunctionInfo>(ref.id), f);
     for(auto& ref : I.Typedefs)
         visit(get<TypedefInfo>(ref.id), f);
-    for(auto& J : I.Enums)
-        visit(J, f);
+    for(auto& ref : I.Enums)
+        visit(get<EnumInfo>(ref.id), f);
 }
 
 void
@@ -171,11 +171,8 @@ class CorpusImpl::
         canonicalize(scope.Namespaces);
         canonicalize(scope.Records);
         canonicalize(scope.Functions);
-        // VFALCO These are non-copyable and thus cannot be sorted yet
-    #if 0
         canonicalize(scope.Typedefs);
         canonicalize(scope.Enums);
-    #endif
     }
 
     void canonicalize(std::vector<Reference>& list) noexcept

source/api/Metadata/Namespace.cpp

@@ -47,8 +47,8 @@ merge(NamespaceInfo&& Other)
     reduceChildren(Children.Namespaces, std::move(Other.Children.Namespaces));
     reduceChildren(Children.Records, std::move(Other.Children.Records));
     reduceChildren(Children.Functions, std::move(Other.Children.Functions));
-    reduceChildren(Children.Enums, std::move(Other.Children.Enums));
     reduceChildren(Children.Typedefs, std::move(Other.Children.Typedefs));
+    reduceChildren(Children.Enums, std::move(Other.Children.Enums));
     mergeBase(std::move(Other));
 }
 

source/api/Metadata/Record.cpp

@@ -49,8 +49,8 @@ merge(RecordInfo&& Other)
     // Reduce children if necessary.
     reduceChildren(Children.Records, std::move(Other.Children.Records));
     reduceChildren(Children.Functions, std::move(Other.Children.Functions));
-    reduceChildren(Children.Enums, std::move(Other.Children.Enums));
     reduceChildren(Children.Typedefs, std::move(Other.Children.Typedefs));
+    reduceChildren(Children.Enums, std::move(Other.Children.Enums));
     SymbolInfo::merge(std::move(Other));
     if (!Template)
         Template = Other.Template;