modified thrift yarp_generator to add name and version to yarp data types

Author: randaz81

src/idls/thrift/src/t_yarp_generator.cc

@@ -316,7 +316,9 @@ class t_yarp_generator : public t_oop_generator
     void generate_struct_read_connectionreader(t_struct* tstruct, std::ostringstream& f_h_, std::ostringstream& f_cpp_);
     void generate_struct_write_wirereader(t_struct* tstruct, std::ostringstream& f_h_, std::ostringstream& f_cpp_);
     void generate_struct_write_connectionreader(t_struct* tstruct, std::ostringstream& f_h_, std::ostringstream& f_cpp_);
+    void generate_struct_typeconstexpr(t_struct* tstruct, std::ostringstream& f_h_, const std::string& type, const std::string& version);
     void generate_struct_tostring(t_struct* tstruct, std::ostringstream& f_h_, std::ostringstream& f_cpp_);
+    void generate_struct_gettype(t_struct* tstruct, std::ostringstream& f_h_, std::ostringstream& f_cpp_);
     void generate_struct_unwrapped_helper(t_struct* tstruct, std::ostringstream& f_h_, std::ostringstream& f_cpp_);
     void generate_struct_editor(t_struct* tstruct, std::ostringstream& f_h_, std::ostringstream& f_cpp_);
     void generate_struct_editor_default_constructor(t_struct* tstruct, std::ostringstream& f_h_, std::ostringstream& f_cpp_);
@@ -1842,12 +1844,18 @@ void t_yarp_generator::generate_struct(t_struct* tstruct)
 
     std::string yarp_type_name{};
     if (annotations.find("yarp.type.name") != annotations.end()) {
-        yarp_api_keyword = annotations.at("yarp.type.name");
+        yarp_type_name = annotations.at("yarp.type.name");
+    }
+    else {
+        yarp_type_name = "yarp/"+name;
     }
 
     std::string yarp_type_version{};
     if (annotations.find("yarp.type.version") != annotations.end()) {
-        yarp_api_keyword = annotations.at("yarp.type.version");
+        yarp_type_version = annotations.at("yarp.type.version");
+    }
+    else {
+        yarp_type_version = "1.0";
     }
 
     // Open header file
@@ -1884,6 +1892,7 @@ void t_yarp_generator::generate_struct(t_struct* tstruct)
 
     f_h_ << "#include <yarp/os/Wire.h>\n";
     f_h_ << "#include <yarp/os/idl/WireTypes.h>\n";
+    f_h_ << "#include <yarp/os/Type.h>\n";
     if (need_common_) {
         f_h_ << '\n';
         f_h_ << "#include <" << get_include_prefix(program_) << program_->get_name() << "_common.h>" << '\n';
@@ -1925,7 +1934,9 @@ void t_yarp_generator::generate_struct(t_struct* tstruct)
     generate_struct_read_connectionreader(tstruct, f_h_, f_cpp_);
     generate_struct_write_wirereader(tstruct, f_h_, f_cpp_);
     generate_struct_write_connectionreader(tstruct, f_h_, f_cpp_);
+    generate_struct_typeconstexpr(tstruct, f_h_, yarp_type_name, yarp_type_version);
     generate_struct_tostring(tstruct, f_h_, f_cpp_);
+    generate_struct_gettype(tstruct, f_h_, f_cpp_);
     generate_struct_unwrapped_helper(tstruct, f_h_, f_cpp_);
 
     // Add editor class, if not disabled
@@ -2228,6 +2239,48 @@ void t_yarp_generator::generate_struct_tostring(t_struct* tstruct, std::ostrings
     assert(indent_count_cpp() == 0);
 }
 
+void t_yarp_generator::generate_struct_typeconstexpr(t_struct* tstruct, std::ostringstream& f_h_, const std::string& yarp_type_name, const std::string& yarp_type_version)
+{
+    THRIFT_DEBUG_COMMENT(f_h_);
+
+    const auto& name = tstruct->get_name();
+
+    f_h_ << indent_h() << "//The name and the version for this message\n";
+    f_h_ << indent_h() << "static constexpr const char* typeName = \"" << yarp_type_name << "\";\n";
+    f_h_ << indent_h() << "static constexpr const char* typeVersion = \"" << "1.0" << "\";\n";
+    f_h_ << '\n';
+
+    assert(indent_count_h() == 1);
+}
+
+void t_yarp_generator::generate_struct_gettype(t_struct* tstruct, std::ostringstream& f_h_, std::ostringstream& f_cpp_)
+{
+    THRIFT_DEBUG_COMMENT(f_h_);
+    THRIFT_DEBUG_COMMENT(f_cpp_);
+
+    const auto& name = tstruct->get_name();
+
+    f_h_ << indent_h() << "// Get the message type\n";
+    f_h_ << indent_h() << "yarp::os::Type getType() const;\n";
+    f_h_ << '\n';
+
+    f_cpp_ << indent_cpp() << "// Convert to a printable string\n";
+    f_cpp_ << indent_cpp() << "yarp::os::Type " << name << "::getType() const\n";
+    f_cpp_ << indent_cpp() << "{\n";
+    indent_up_cpp();
+    {
+        f_cpp_ << indent_cpp() << " yarp::os::Type typ = yarp::os::Type::byNameOnWire(typeName);\n";
+        f_cpp_ << indent_cpp() << "typ.setVersion(typeVersion);\n";
+        f_cpp_ << indent_cpp() << " return typ;\n";
+    }
+    indent_down_cpp();
+    f_cpp_ << indent_cpp() << "}\n";
+    f_cpp_ << '\n';
+
+    assert(indent_count_h() == 1);
+    assert(indent_count_cpp() == 0);
+}
+
 void t_yarp_generator::generate_struct_unwrapped_helper(t_struct* tstruct, std::ostringstream& f_h_, std::ostringstream& f_cpp_)
 {
     THRIFT_DEBUG_COMMENT(f_h_);

src/libYARP_dev/src/idl_generated_code/yarp/dev/LaserScan2D.cpp

@@ -82,7 +82,7 @@ bool LaserScan2D::read(yarp::os::ConnectionReader& connection)
 // Write structure on a Wire
 bool LaserScan2D::write(const yarp::os::idl::WireWriter& writer) const
 {
-    write_type();
+    //write_type();
 
     if (!write_angle_min(writer)) {
         return false;
@@ -126,7 +126,7 @@ std::string LaserScan2D::toString() const
 yarp::os::Type LaserScan2D::getType() const
 {
     yarp::os::Type typ = yarp::os::Type::byNameOnWire(typeName);
-    type.setVersion(typeVersion);
+    typ.setVersion(typeVersion);
     return typ;
 }
 

src/libYARP_os/src/yarp/os/Type.cpp

@@ -84,6 +84,7 @@ class Type::Private
     Property* prop{nullptr};
     std::string name;
     std::string name_on_wire;
+    std::string version;
 };
 
 
@@ -108,6 +109,21 @@ Type::~Type()
     delete mPriv;
 }
 
+std::string Type::getVersion() const
+{
+    return mPriv->version;
+}
+
+size_t Type::getMajorVersion() const
+{
+    return 1;
+}
+
+size_t Type::getMinorVersion() const
+{
+    return 1;
+}
+
 Type& Type::operator=(const Type& rhs)
 {
     if (&rhs != this) {
@@ -154,9 +170,14 @@ bool Type::hasName() const
     return !mPriv->name.empty();
 }
 
+bool Type::hasVersion() const
+{
+    return !mPriv->version.empty();
+}
+
 bool Type::isValid() const
 {
-    return hasName();
+    return hasName() && hasVersion();
 }
 
 std::string Type::toString() const
@@ -170,6 +191,11 @@ std::string Type::toString() const
     return "null";
 }
 
+Type& Type::setVersion(const std::string& version)
+{
+    mPriv->version = version;
+    return *this;
+}
 
 Type Type::byName(const char* name)
 {

src/libYARP_os/src/yarp/os/Type.h

@@ -72,8 +72,16 @@ class YARP_os_API Type
 
     std::string getNameOnWire() const;
 
+    std::string getVersion() const;
+    
+    size_t getMajorVersion() const;
+    
+    size_t getMinorVersion() const;
+
     bool hasName() const;
 
+    bool hasVersion() const;
+
     bool isValid() const;
 
     std::string toString() const;
@@ -84,6 +92,8 @@ class YARP_os_API Type
 
     Type& addProperty(const char* key, const Value& val);
 
+    Type& setVersion(const std::string& vesion);
+
     /** @} */
     /** @{ */