tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add TlStorerToString::store_object_field method.

Browse Source
This commit is contained in:
levlam 2021-11-01 18:59:35 +03:00
parent a4592bd522
commit 5e43075d3b
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/generate/tl_writer_cpp.cpp
View File

@ -404,8 +404,8 @@ std::string TD_TL_writer_cpp::gen_type_store(const std::string &field_name, cons
return gen_vector_store(field_name, child, vars, storer_type); return gen_vector_store(field_name, child, vars, storer_type);
} else { } else {
assert(tree_type->children.empty()); assert(tree_type->children.empty());
return "if (" + field_name + " == nullptr) { s.store_field(\"" + get_pretty_field_name(field_name) + return "s.store_object_field(\"" + get_pretty_field_name(field_name) + "\", static_cast<const BaseObject *>(" +
"\", \"null\"); } else { " + field_name + "->store(s, \"" + get_pretty_field_name(field_name) + "\"); }"; field_name + ".get()));";
} }
} }

4
td/generate/tl_writer_jni_cpp.cpp
View File

@ -322,8 +322,8 @@ std::string TD_TL_writer_jni_cpp::gen_type_store(const std::string &field_name,
res = gen_vector_store(field_name, child, vars, storer_type); res = gen_vector_store(field_name, child, vars, storer_type);
} else { } else {
if (storer_type == 1) { if (storer_type == 1) {
res = "if (" + field_name + " == nullptr) { s.store_field(\"" + get_pretty_field_name(field_name) + res = "s.store_object_field(\"" + get_pretty_field_name(field_name) + "\", static_cast<const BaseObject *>(" +
"\", \"null\"); } else { " + field_name + "->store(s, \"" + get_pretty_field_name(field_name) + "\"); }"; field_name + ".get()));";
} else { } else {
res = "if (" + field_name + " != nullptr) { jobject next; " + field_name + res = "if (" + field_name + " != nullptr) { jobject next; " + field_name +
"->store(env, next); if (next) { env->SetObjectField(s, " + field_name + "->store(env, next); if (next) { env->SetObjectField(s, " + field_name +

9
tdutils/td/utils/tl_storers.h
View File

@ -257,6 +257,15 @@ class TlStorerToString {
store_field_end(); store_field_end();
} }
template <class ObjectT>
void store_object_field(const char *name, const ObjectT *value) {
if (value == nullptr) {
store_field(name, "null");
} else {
value->store(*this, name);
}
}
void store_field(const char *name, const UInt128 &value) { void store_field(const char *name, const UInt128 &value) {
store_field_begin(name); store_field_begin(name);
store_binary(as_slice(value)); store_binary(as_slice(value));