Merge pull request #3325 from randaz81/thrift_test3

Added new test for thrift + bugfix

Author: randaz81

doc/release/v4_0_0.MD

@@ -8,7 +8,7 @@ YARP <yarp-4.0.> Release Notes
 
 
 A (partial) list of bug fixed and issues resolved in this release can be found
-[here](https://github.com/robotology/yarp/issues?q=label%3A%22Fixed+in%3A+YARP+yarp-3.12%22).
+[here](https://github.com/robotology/yarp/issues?q=label%3A%22Fixed+in%3A+YARP+yarp-4.0%22).
 
 New Features
 ----------------
@@ -32,6 +32,11 @@ Added new PortMonitor `throttleDown` to limit the bandwidth usage over a port co
 * `yarpmotorgui` can now use the option `reduce_bandwidth` to use `throttleDown` portmonitor to reduce bandwidth usage.
 * `yarpmotorgui` now handles the `braked` status from interface `IJointBrake`.
 
+### IDL_Thrift
+
+* improved generator to support services with multiple containers (lists, maps, sets)
+
+
 Deprecations and removals
 ---------------------------
 

src/commands/yarpidl_thrift/src/t_yarp_generator.cc

@@ -1576,7 +1576,12 @@ void t_yarp_generator::generate_deserialize_container(std::ostringstream& f_cpp_
 {
     THRIFT_DEBUG_COMMENT(f_cpp_);
 
-    if (ttype->is_map()) {
+    if (ttype->is_map())
+    {
+        // Begin scope of _csize
+        f_cpp_ << indent_cpp() << "{\n";
+        indent_up_cpp();
+
         f_cpp_ << indent_cpp() << "size_t _csize;\n";
         // kttpe and vtype available
         f_cpp_ << indent_cpp() << "yarp::os::idl::WireState _ktype;\n";
@@ -1595,7 +1600,16 @@ void t_yarp_generator::generate_deserialize_container(std::ostringstream& f_cpp_
         // Read container end
         f_cpp_ << indent_cpp() << "reader.readMapEnd();\n";
 
-    } else if (ttype->is_set()) {
+        // End scope of _csize
+        indent_down_cpp();
+        f_cpp_ << indent_cpp() << "}\n";
+    }
+    else if (ttype->is_set())
+    {
+        // Begin scope of _csize
+        f_cpp_ << indent_cpp() << "{\n";
+        indent_up_cpp();
+
         f_cpp_ << indent_cpp() << "size_t _csize;\n";
         f_cpp_ << indent_cpp() << "yarp::os::idl::WireState _etype;\n";
         f_cpp_ << indent_cpp() << "reader.readSetBegin(_etype, _csize);\n";
@@ -1612,11 +1626,20 @@ void t_yarp_generator::generate_deserialize_container(std::ostringstream& f_cpp_
         // Read container end
         f_cpp_ << indent_cpp() << "reader.readSetEnd();\n";
 
-    } else if (ttype->is_list()) {
+        // End scope of _csize
+        indent_down_cpp();
+        f_cpp_ << indent_cpp() << "}\n";
+    }
+    else if (ttype->is_list())
+    {
         t_container* tcontainer = static_cast<t_container*>(ttype);
         auto* elem_type = static_cast<t_list*>(ttype)->get_elem_type();
         bool use_push = tcontainer->has_cpp_name() || (static_cast<t_base_type*>(elem_type)->get_base() == t_base_type::TYPE_BOOL);
 
+        // Begin scope of _csize
+        f_cpp_ << indent_cpp() << "{\n";
+        indent_up_cpp();
+
         f_cpp_ << indent_cpp() << "size_t _csize;\n";
         f_cpp_ << indent_cpp() << "yarp::os::idl::WireState _etype;\n";
         f_cpp_ << indent_cpp() << "reader.readListBegin(_etype, _csize);\n";
@@ -1671,6 +1694,10 @@ void t_yarp_generator::generate_deserialize_container(std::ostringstream& f_cpp_
 
         // Read container end
         f_cpp_ << indent_cpp() << "reader.readListEnd();\n";
+
+        // End scope of _csize
+        indent_down_cpp();
+        f_cpp_ << indent_cpp() << "}\n";
     }
 }
 

src/commands/yarpidl_thrift/tests/CMakeLists.txt

@@ -3,3 +3,4 @@
 
 add_subdirectory(test1)
 add_subdirectory(test2)
+add_subdirectory(test3)

src/commands/yarpidl_thrift/tests/test3/CMakeLists.txt

@@ -0,0 +1,29 @@
+# SPDX-FileCopyrightText: 2026-2026 Istituto Italiano di Tecnologia (IIT)
+# SPDX-License-Identifier: BSD-3-Clause
+
+include (Catch)
+include(YarpCatchUtils)
+include(YarpChooseIDL)
+
+yarp_choose_idl(TEST3_THRIFT testdata.thrift)
+
+add_executable(harness_thrift_test3)
+
+target_sources(harness_thrift_test3
+  PRIVATE
+    main.cpp
+    ${TEST3_THRIFT_GEN_FILES}
+)
+
+target_link_libraries(harness_thrift_test3
+  PRIVATE
+    YARP_harness
+    YARP::YARP_os
+)
+
+target_include_directories(harness_thrift_test3
+ PUBLIC ${TEST3_THRIFT_BUILD_INTERFACE_INCLUDE_DIRS}
+)
+
+set_property(TARGET harness_thrift_test3 PROPERTY FOLDER "Test")
+yarp_catch_discover_tests(harness_thrift_test3)