Support secureString/secureBytes aliases in TL schemes.

Author: levlam

td/generate/tl_writer_cpp.cpp

@@ -157,6 +157,12 @@ std::string TD_TL_writer_cpp::gen_fetch_class_name(const tl::tl_tree_type *tree_
   if (name == "Bytes") {
     return "TlFetchBytes<bytes>";
   }
+  if (name == "SecureString") {
+    return "TlFetchString<secure_string>";
+  }
+  if (name == "SecureBytes") {
+    return "TlFetchBytes<secure_bytes>";
+  }
 
   if (name == "Vector") {
     assert(t->arity == 1);
@@ -348,7 +354,7 @@ std::string TD_TL_writer_cpp::gen_store_class_name(const tl::tl_tree_type *tree_
     assert(false);
     return "";
   }
-  if (name == "String" || name == "Bytes") {
+  if (name == "String" || name == "Bytes" || name == "SecureString" || name == "SecureBytes") {
     return "TlStoreString";
   }
 
@@ -409,13 +415,13 @@ std::string TD_TL_writer_cpp::gen_type_store(const std::string &field_name, cons
   assert(!(t->flags & tl::FLAG_DEFAULT_CONSTRUCTOR));  // Not supported yet
 
   if (name == "#" || name == "Int" || name == "Long" || name == "Int32" || name == "Int53" || name == "Int64" ||
-      name == "Double" || name == "Bool" || name == "String" || name == "Int128" || name == "Int256" ||
-      name == "Int512") {
+      name == "Double" || name == "Bool" || name == "String" || name == "SecureString" || name == "Int128" ||
+      name == "Int256" || name == "Int512") {
     return "s.store_field(\"" + get_pretty_field_name(field_name) + "\", " + field_name + ");";
   } else if (name == "True") {
     // currently nothing to do
     return "";
-  } else if (name == "Bytes") {
+  } else if (name == "Bytes" || name == "SecureBytes") {
     return "s.store_bytes_field(\"" + get_pretty_field_name(field_name) + "\", " + field_name + ");";
   } else if (name == "Vector") {
     const tl::tl_tree_type *child = static_cast<const tl::tl_tree_type *>(tree_type->children[0]);
@@ -692,7 +698,7 @@ std::string TD_TL_writer_cpp::gen_constructor_field_init(int field_num, const st
   }
   std::string move_begin;
   std::string move_end;
-  if ((field_type == "bytes" || field_type.compare(0, 5, "array") == 0 ||
+  if ((field_type == "bytes" || field_type == "secure_bytes" || field_type.compare(0, 5, "array") == 0 ||
        field_type.compare(0, 10, "object_ptr") == 0) &&
       !is_default) {
     move_begin = "std::move(";

td/generate/tl_writer_h.cpp

@@ -64,6 +64,13 @@ std::string TD_TL_writer_h::gen_output_begin(const std::string &additional_impor
 }
 
 std::string TD_TL_writer_h::gen_output_begin_once() const {
+  std::string secure_strings;
+  if (tl_name != "td_api" && tl_name != "telegram_api" && tl_name != "mtproto_api") {
+    secure_strings = "using secure_string = " + string_type +
+                     ";\n\n"
+                     "using secure_bytes = " +
+                     bytes_type + ";\n\n";
+  }
   return "using int32 = std::int32_t;\n"
          "using int53 = std::int64_t;\n"
          "using int64 = std::int64_t;\n\n"
@@ -73,8 +80,7 @@ std::string TD_TL_writer_h::gen_output_begin_once() const {
          ";\n\n"
 
          "using bytes = " +
-         bytes_type +
-         ";\n\n"
+         bytes_type + ";\n\n" + secure_strings +
 
          "template <class Type>\n"
          "using array = std::vector<Type>;\n\n"

td/generate/tl_writer_td.cpp

@@ -23,7 +23,7 @@ int TD_TL_writer::get_max_arity() const {
 bool TD_TL_writer::is_built_in_simple_type(const std::string &name) const {
   return name == "True" || name == "Bool" || name == "Int" || name == "Long" || name == "Double" || name == "String" ||
          name == "Int32" || name == "Int53" || name == "Int64" || name == "Int128" || name == "Int256" ||
-         name == "Int512" || name == "Bytes";
+         name == "Int512" || name == "Bytes" || name == "SecureString" || name == "SecureBytes";
 }
 
 bool TD_TL_writer::is_built_in_complex_type(const std::string &name) const {
@@ -222,6 +222,12 @@ std::string TD_TL_writer::gen_type_name(const tl::tl_tree_type *tree_type) const
   if (name == "Bytes") {
     return "bytes";
   }
+  if (name == "SecureString") {
+    return "secure_string";
+  }
+  if (name == "SecureBytes") {
+    return "secure_bytes";
+  }
 
   if (name == "Vector") {
     assert(t->arity == 1);
@@ -275,9 +281,10 @@ std::string TD_TL_writer::gen_constructor_parameter(int field_num, const std::st
       field_type == "double ") {
     res += field_type;
   } else if (field_type == "UInt128 " || field_type == "UInt256 " || field_type == "UInt512 " ||
-             field_type == "string " || (string_type == bytes_type && field_type == "bytes ")) {
+             field_type == "string " || (string_type == bytes_type && field_type == "bytes ") ||
+             field_type == "secure_string " || (string_type == bytes_type && field_type == "secure_bytes ")) {
     res += field_type + "const &";
-  } else if (field_type.compare(0, 5, "array") == 0 || field_type == "bytes " ||
+  } else if (field_type.compare(0, 5, "array") == 0 || field_type == "bytes " || field_type == "secure_bytes " ||
              field_type.compare(0, 10, "object_ptr") == 0) {
     res += field_type + "&&";
   } else {