diff options
Diffstat (limited to 'clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp')
-rw-r--r-- | clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp b/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp index 91b86bd..01e9b37 100644 --- a/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp +++ b/clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp @@ -38,14 +38,14 @@ namespace { /// Helper function to inject a JSON object \p Obj into another object \p Paren /// at position \p Key. -void serializeObject(Object &Paren, StringRef Key, Optional<Object> Obj) { +void serializeObject(Object &Paren, StringRef Key, std::optional<Object> Obj) { if (Obj) Paren[Key] = std::move(*Obj); } /// Helper function to inject a JSON array \p Array into object \p Paren at /// position \p Key. -void serializeArray(Object &Paren, StringRef Key, Optional<Array> Array) { +void serializeArray(Object &Paren, StringRef Key, std::optional<Array> Array) { if (Array) Paren[Key] = std::move(*Array); } @@ -66,7 +66,7 @@ void serializeArray(Object &Paren, StringRef Key, Optional<Array> Array) { /// /// \returns \c std::nullopt if the version \p V is empty, or an \c Object /// containing the semantic version representation of \p V. -Optional<Object> serializeSemanticVersion(const VersionTuple &V) { +std::optional<Object> serializeSemanticVersion(const VersionTuple &V) { if (V.empty()) return std::nullopt; @@ -152,7 +152,8 @@ Object serializeSourceRange(const PresumedLoc &BeginLoc, /// /// \returns \c std::nullopt if the symbol has default availability attributes, /// or an \c Array containing the formatted availability information. -Optional<Array> serializeAvailability(const AvailabilitySet &Availabilities) { +std::optional<Array> +serializeAvailability(const AvailabilitySet &Availabilities) { if (Availabilities.isDefault()) return std::nullopt; @@ -238,7 +239,7 @@ Object serializeIdentifier(const APIRecord &Record, Language Lang) { /// /// \returns \c std::nullopt if \p Comment is empty, or an \c Object containing /// the formatted lines. -Optional<Object> serializeDocComment(const DocComment &Comment) { +std::optional<Object> serializeDocComment(const DocComment &Comment) { if (Comment.empty()) return std::nullopt; @@ -290,7 +291,8 @@ Optional<Object> serializeDocComment(const DocComment &Comment) { /// /// \returns \c std::nullopt if \p DF is empty, or an \c Array containing the /// formatted declaration fragments array. -Optional<Array> serializeDeclarationFragments(const DeclarationFragments &DF) { +std::optional<Array> +serializeDeclarationFragments(const DeclarationFragments &DF) { if (DF.getFragments().empty()) return std::nullopt; @@ -421,8 +423,8 @@ Object serializeSymbolKind(const APIRecord &Record, Language Lang) { } template <typename RecordTy> -Optional<Object> serializeFunctionSignatureMixinImpl(const RecordTy &Record, - std::true_type) { +std::optional<Object> +serializeFunctionSignatureMixinImpl(const RecordTy &Record, std::true_type) { const auto &FS = Record.Signature; if (FS.empty()) return std::nullopt; @@ -447,8 +449,8 @@ Optional<Object> serializeFunctionSignatureMixinImpl(const RecordTy &Record, } template <typename RecordTy> -Optional<Object> serializeFunctionSignatureMixinImpl(const RecordTy &Record, - std::false_type) { +std::optional<Object> +serializeFunctionSignatureMixinImpl(const RecordTy &Record, std::false_type) { return std::nullopt; } @@ -583,7 +585,7 @@ bool SymbolGraphSerializer::shouldSkip(const APIRecord &Record) const { } template <typename RecordTy> -Optional<Object> +std::optional<Object> SymbolGraphSerializer::serializeAPIRecord(const RecordTy &Record) const { if (shouldSkip(Record)) return std::nullopt; @@ -856,7 +858,7 @@ void SymbolGraphSerializer::serialize(raw_ostream &os) { os << formatv("{0:2}", Value(std::move(root))) << "\n"; } -Optional<Object> +std::optional<Object> SymbolGraphSerializer::serializeSingleSymbolSGF(StringRef USR, const APISet &API) { APIRecord *Record = API.findRecordForUSR(USR); |