chore: add OptionalLocation

fix #316
cppalliance · Jun 17, 2023 · 23b8911 · 23b8911
1 parent ec7344e
commit 23b8911
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/include/mrdox/Metadata/Source.hpp b/include/mrdox/Metadata/Source.hpp
@@ -14,8 +14,8 @@
 #define MRDOX_API_METADATA_SOURCE_HPP
 
 #include <mrdox/Platform.hpp>
+#include <mrdox/ADT/Optional.hpp>
 #include <mrdox/Metadata/Info.hpp>
-#include <optional>
 #include <string>
 #include <string_view>
 
@@ -49,6 +49,11 @@ struct Location
     }
 };
 
+/** Like std::optional<SymbolID>
+*/
+using OptionalLocation = Optional<Location,
+    decltype([](const Location& loc) { return loc.Filename.empty(); })>;
+
 /** Stores source information for a declaration.
 */
 struct SourceInfo
@@ -60,7 +65,7 @@ struct SourceInfo
         actually a definition (e.g. alias-declarations and
         typedef declarations are never definition).
     */
-    std::optional<Location> DefLoc;
+    OptionalLocation DefLoc;
 
     /** Locations where the entity was declared,
 

diff --git a/source/AST/DecodeRecord.hpp b/source/AST/DecodeRecord.hpp
@@ -117,7 +117,7 @@ inline
 Error
 decodeRecord(
     Record const& R,
-    std::optional<Location>& Field,
+    OptionalLocation& Field,
     llvm::StringRef Blob)
 {
     if (R[0] > INT_MAX)