Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-02-16 21:58:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Comment optional<T> in serializers and remove redundant Writer ReflectMember on std::vector

Browse Source
This commit is contained in:
Fangrui Song 2018-01-11 00:31:47 -08:00
parent 5f1aa34a9c
commit 4d07189b47
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/serializer.h
View File

@ -171,26 +171,38 @@ void Reflect(Writer& visitor, SerializeFormat& value);
//// Type constructors
// Usually used for null | object
// ReflectMember optional<T> is used to represent TypeScript optional properties
// (in `key: value` context).
// Reflect optional<T> is used for a different purpose, whether an object is
// nullable (possibly in `value` context). For the nullable semantics,
// std::variant<std::monostate, T> is recommended.
template <typename T>
void Reflect(Reader& visitor, optional<T>& value) {
if (visitor.IsNull()) {
visitor.GetNull();
return;
}
T real_value{};
T real_value;
Reflect(visitor, real_value);
value = real_value;
}
template <typename T>
void Reflect(Writer& visitor, optional<T>& value) {
// We omit optional fields for JsonWriter to reduce output.
// But don't omit them for other serialization formats.
if (value)
Reflect(visitor, *value);
else if (visitor.Format() != SerializeFormat::Json)
else
visitor.Null();
}
template <typename T>
void ReflectMember(Writer& visitor, const char* name, optional<T>& value) {
// For TypeScript optional property key?: value in the spec,
// We omit both key and value if value is std::nullopt (null) for JsonWriter
// to reduce output. But keep it for other serialization formats.
if (value || visitor.Format() != SerializeFormat::Json) {
visitor.Key(name);
Reflect(visitor, value);
}
}
// Backport C++17 std::disjunction
namespace {
@ -246,7 +258,7 @@ struct ReflectVariant {
}
};
// Writer feflection on std::variant recurses. This is induction basis.
// Writer reflection on std::variant recurses. This is induction basis.
template <typename... Ts>
struct ReflectVariant<0, Ts...> {
void operator()(Writer& visitor, std::variant<Ts...>& value) {}
@ -294,21 +306,6 @@ void ReflectMember(Writer& visitor, const char* name, T& value) {
visitor.Key(name);
Reflect(visitor, value);
}
template <typename T>
void ReflectMember(Writer& visitor, const char* name, std::vector<T>& values) {
visitor.Key(name);
visitor.StartArray(values.size());
for (auto& value : values)
Reflect(visitor, value);
visitor.EndArray();
}
template <typename T>
void ReflectMember(Writer& visitor, const char* name, optional<T>& value) {
if (value || visitor.Format() != SerializeFormat::Json) {
visitor.Key(name);
Reflect(visitor, value);
}
}
void ReflectMember(Writer& visitor, const char* name, std::string& value);
// Reader: