Fix escaped strings to match changes from ros2/rosidl#862

Signed-off-by: Anthony Welte <[email protected]>

Author: TonyWelte

rosidlcpp_generator_c/resource/full__description.c.template

@@ -109,9 +109,9 @@ const rosidl_runtime_c__type_description__TypeDescription *
 {% if raw_source.content %}
 static char toplevel_type_raw_source[] =
 {%   for line in span(raw_source.content, 0, length(raw_source.content) - 1) %}
-  "{{ utf8_encode(escape_tab(line)) }}\n"
+  "{{ utf8_encode(line) }}\n"
 {%   endfor %}
-  "{{ utf8_encode(escape_tab(last(raw_source.content))) }}";
+  "{{ utf8_encode(last(raw_source.content)) }}";
 {% endif %}
 
 static char {{ raw_source.encoding }}_encoding[] = "{{ raw_source.encoding }}";

rosidlcpp_generator_c/src/rosidlcpp_generator_c/rosidlcpp_generator_c.cpp

@@ -608,27 +608,16 @@ auto static_seq(const std::string& varname, const nlohmann::json& value) -> std:
 
 auto utf8_encode(const std::string& value_string) -> std::string {
   std::string utf8_encoded;
-  for (const auto& c : value_string) {
+  for (const auto& c : rosidlcpp_core::escape_string(value_string)) {
     if (static_cast<unsigned char>(c) < 0x80) {
       utf8_encoded += c;
     } else {
       utf8_encoded += fmt::format("\\x{:02x}", static_cast<unsigned char>(c));
     }
   }
-  return rosidlcpp_core::escape_string(utf8_encoded);
+  return utf8_encoded;
 }
 
-auto escape_tab(const std::string& value_string) -> std::string {
-  std::string escaped_string;
-  for (const auto& c : value_string) {
-    if (c == '\t') {
-      escaped_string += "\\t";
-    } else {
-      escaped_string += c;
-    }
-  }
-  return escaped_string;
-}
 auto field_type_id_to_name(int field_type_id) -> std::string {
   return FIELD_TYPE_ID_TO_NAME.at(field_type_id);
 }
@@ -656,7 +645,6 @@ GeneratorC::GeneratorC(rosidlcpp_core::GeneratorArguments generator_arguments, b
   GENERATOR_BASE_REGISTER_FUNCTION("static_seq_n", 2, static_seq_n);
   GENERATOR_BASE_REGISTER_FUNCTION("static_seq", 2, static_seq);
   GENERATOR_BASE_REGISTER_FUNCTION("utf8_encode", 1, utf8_encode);
-  GENERATOR_BASE_REGISTER_FUNCTION("escape_tab", 1, escape_tab);
   GENERATOR_BASE_REGISTER_FUNCTION("FIELD_TYPE_ID_TO_NAME", 1, field_type_id_to_name);
 }
 

rosidlcpp_generator_py/src/rosidlcpp_generator_py/rosidlcpp_generator_py.cpp

@@ -132,17 +132,29 @@ auto get_imports(const nlohmann::json& members) -> nlohmann::json {
   return result;
 }
 
+std::string escape_string_py(std::string_view str, char quote_char) {
+  std::string result;
+  for (const auto& c : str) {
+    if (c == '\\') {
+      result += "\\\\";
+    } else if (c == quote_char) {
+      result += std::format("\\{}", quote_char);
+    } else {
+      result += c;
+    }
+  }
+  return result;
+}
+
 auto primitive_value_to_py(nlohmann::json type, nlohmann::json value) -> std::string {
   assert(!value.is_null());
 
   if (rosidlcpp_core::is_string(type)) {
     const auto string_value = value.get<std::string>();
-    if (!string_value.contains('\'')) {
-      return std::format("'{}'", string_value);
-    } else if (!string_value.contains('"')) {
-      return std::format("\"{}\"", string_value);
+    if (!string_value.contains('\'') || string_value.contains('"')) {
+      return std::format("'{}'", escape_string_py(string_value, '\''));
     } else {
-      return std::format("'''{}'''", string_value);
+      return std::format("\"{}\"", escape_string_py(string_value, '\"'));
     }
   }