replace use of deprecated llvm::Optional with std::optional

Author: sdkrystian

include/mrdox/Metadata/Enum.hpp

@@ -15,10 +15,10 @@
 #include <mrdox/Platform.hpp>
 #include <mrdox/Metadata/Symbol.hpp>
 #include <mrdox/Metadata/Type.hpp>
-#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/SmallString.h>
 #include <llvm/ADT/SmallVector.h>
 #include <llvm/ADT/StringRef.h>
+#include <optional>
 #include <utility>
 
 namespace clang {
@@ -74,7 +74,7 @@ struct EnumInfo : SymbolInfo
     // Set to nonempty to the type when this is an explicitly typed enum. For
     //   enum Foo : short { ... };
     // this will be "short".
-    llvm::Optional<TypeInfo> BaseType;
+    std::optional<TypeInfo> BaseType;
 
     llvm::SmallVector<EnumValueInfo, 4> Members; // List of enum members.
 

include/mrdox/Metadata/Function.hpp

@@ -21,10 +21,10 @@
 #include <mrdox/Metadata/Symbols.hpp>
 #include <mrdox/Metadata/Template.hpp>
 #include <clang/Basic/Specifiers.h>
-#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/SmallString.h>
 #include <llvm/ADT/SmallVector.h>
 #include <clang/AST/Attr.h>
+#include <optional>
 #include <vector>
 
 namespace clang {
@@ -106,7 +106,7 @@ struct FunctionInfo : SymbolInfo
     std::vector<Param> Params; // List of parameters.
 
     // When present, this function is a template or specialization.
-    llvm::Optional<TemplateInfo> Template;
+    std::optional<TemplateInfo> Template;
 
     FnFlags0 specs0{.raw{0}};
     FnFlags1 specs1{.raw{0}};

include/mrdox/Metadata/Info.hpp

@@ -16,12 +16,12 @@
 #include <mrdox/Metadata/Javadoc.hpp>
 #include <mrdox/Metadata/Reference.hpp>
 #include <mrdox/Metadata/Symbols.hpp>
-#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/StringRef.h>
 #include <llvm/ADT/SmallVector.h>
 #include <array>
-#include <vector>
+#include <optional>
 #include <string>
+#include <vector>
 
 namespace clang {
 namespace mrdox {
@@ -48,7 +48,7 @@ struct Info
 
     /** The extracted javadoc for this declaration.
     */
-    llvm::Optional<Javadoc> javadoc;
+    std::optional<Javadoc> javadoc;
 
     //--------------------------------------------
 

include/mrdox/Metadata/MemberType.hpp

@@ -17,7 +17,7 @@
 #include <mrdox/Metadata/Javadoc.hpp>
 #include <mrdox/Metadata/FieldType.hpp>
 #include <mrdox/Metadata/Function.hpp>
-#include <llvm/ADT/Optional.h>
+#include <optional>
 
 namespace clang {
 namespace mrdox {
@@ -30,12 +30,12 @@ struct MemberTypeInfo
 {
     Access access = Access::Public;
 
-    llvm::Optional<Javadoc> javadoc;
+    std::optional<Javadoc> javadoc;
 
     //--------------------------------------------
 
     MemberTypeInfo() = default;
-    
+
     MemberTypeInfo(
         TypeInfo const& TI,
         llvm::StringRef Name,

include/mrdox/Metadata/Record.hpp

@@ -22,8 +22,8 @@
 #include <mrdox/Metadata/Template.hpp>
 #include <mrdox/Metadata/Symbols.hpp>
 #include <clang/AST/Type.h>
-#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/SmallVector.h>
+#include <optional>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -83,7 +83,7 @@ struct RecordInfo : SymbolInfo
     TagTypeKind TagType = TagTypeKind::TTK_Struct;
 
     // When present, this record is a template or specialization.
-    llvm::Optional<TemplateInfo> Template;
+    std::optional<TemplateInfo> Template;
 
     // Indicates if the record was declared using a typedef. Things like anonymous
     // structs in a typedef:

include/mrdox/Metadata/Symbol.hpp

@@ -15,8 +15,8 @@
 #include <mrdox/Platform.hpp>
 #include <mrdox/Metadata/Info.hpp>
 #include <mrdox/Metadata/Location.hpp>
-#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/SmallVector.h>
+#include <optional>
 
 namespace clang {
 namespace mrdox {
@@ -25,7 +25,7 @@ namespace mrdox {
 */
 struct SymbolInfo : Info
 {
-    llvm::Optional<Location> DefLoc;     // Location where this decl is defined.
+    std::optional<Location> DefLoc;     // Location where this decl is defined.
     llvm::SmallVector<Location, 2> Loc; // Locations where this decl is declared.
 
     //--------------------------------------------

source/-XML/XMLGenerator.hpp

@@ -16,7 +16,7 @@
 #include <mrdox/Generator.hpp>
 #include <mrdox/MetadataFwd.hpp>
 #include <mrdox/Metadata/Javadoc.hpp>
-#include <llvm/ADT/Optional.h>
+#include <optional>
 
 namespace clang {
 namespace mrdox {

source/-XML/XMLTags.hpp

@@ -18,9 +18,9 @@
 #include <mrdox/Metadata/Symbols.hpp>
 #include <mrdox/Metadata/Type.hpp>
 #include <clang/Basic/Specifiers.h>
-#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/StringRef.h>
 #include <llvm/Support/raw_ostream.h>
+#include <optional>
 
 /*
     Object for assisting with generating
@@ -146,7 +146,7 @@ struct Attribute
     }
 
     Attribute(
-        llvm::Optional<TypeInfo> const& opt)
+        std::optional<TypeInfo> const& opt)
         : name("type")
         , value(opt ? opt->Type.Name.str() : std::string())
         , pred(opt)

source/-XML/XMLWriter.cpp

@@ -534,7 +534,7 @@ writeMemberType(
 
 //------------------------------------------------
 
-void 
+void
 XMLWriter::
 writeTemplate(
     const std::optional<TemplateInfo>& I)
@@ -560,7 +560,7 @@ writeTemplate(
     tags_.open(templateTagName, {
         {"class", spec, !! spec},
         {id}
-    });   
+    });
 
     for(const TParam& tparam : I->Params)
         writeTemplateParam(tparam, tags_);
@@ -575,7 +575,7 @@ writeTemplate(
 void
 XMLWriter::
 writeJavadoc(
-    llvm::Optional<Javadoc> const& javadoc)
+    std::optional<Javadoc> const& javadoc)
 {
     if(! javadoc.has_value())
         return;

source/-XML/XMLWriter.hpp

@@ -84,9 +84,9 @@ class XMLWriter
     void writeSymbol(SymbolInfo const& I);
     void writeLocation(Location const& loc, bool def = false);
     void writeMemberType(MemberTypeInfo const& I);
-    void writeJavadoc(llvm::Optional<Javadoc> const& javadoc);
+    void writeJavadoc(std::optional<Javadoc> const& javadoc);
     void writeTemplate(const std::optional<TemplateInfo>& I);
-    
+
     template<class T>
     void writeNodes(AnyList<T> const& list);
     void writeNode(Javadoc::Node const& node);