Improve operator== implementation for Message

tuokri · Nov 21, 2023 · ebf02af · ebf02af
1 parent 80267c6
commit ebf02af
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/include/umb/message.hpp b/include/umb/message.hpp
@@ -74,8 +74,18 @@ class Message
 
     // TODO: reconsider this API.
     [[nodiscard]] constexpr virtual uint16_t type() const noexcept = 0;
+
+protected:
+    [[nodiscard]] virtual bool is_equal(const Message& msg) const = 0;
+
+    friend bool operator==(const Message&, const Message&);
 };
 
+bool operator==(const Message& lhs, const Message& rhs)
+{
+    return typeid(lhs) == typeid(rhs) && lhs.is_equal(rhs);
+}
+
 }
 
 #endif // USCRIPT_MSGBUF_MESSAGE_HPP
diff --git a/templates/cpp_header.jinja b/templates/cpp_header.jinja
@@ -54,7 +54,6 @@ public:
     [[nodiscard]] {{ cpp_type(field.type) }} {{ field.name }}() const;
     void set_{{ field.name }}({{ cpp_type_arg(field.type) }});
     {% endfor %}
-    friend bool operator==(const {{ message.name }}&, const {{ message.name }}&);
     [[nodiscard]] constexpr uint16_t type() const noexcept override
     {
         return static_cast<uint16_t>(message_type());
@@ -63,6 +62,8 @@ public:
     {
         return MessageType::{{ message.name }};
     }
+protected:
+    [[nodiscard]] bool is_equal(const ::umb::Message& msg) const override;
 
 private:
     {% for field in message.fields %}

diff --git a/templates/cpp_source.jinja b/templates/cpp_source.jinja
@@ -146,17 +146,18 @@ void {{ message.name }}::set_{{ field.name }}({{ cpp_type_arg(field.type) }} val
     m_{{ field.name }} = value;
 }
 
-{% endfor %}
+{% endfor -%}
 
-bool operator==(const {{ message.name }} & lhs, const {{ message.name }}& rhs)
+bool {{ message.name}}::is_equal(const ::umb::Message& msg) const
 {
+    const auto& m = static_cast<const {{ message.name }}&>(msg);
     return (
 {% for field in message.fields %}
     {% if field.type == "float" %}
-        ::umb::internal::Float{lhs.{{ field.name }}()}.AlmostEquals(
-            ::umb::internal::Float{rhs.{{ field.name }}()})
+        ::umb::internal::Float{ {{ field.name }}() }.AlmostEquals(
+            ::umb::internal::Float{m.{{ field.name }}()})
     {% else %}
-        (lhs.{{ field.name }}() == rhs.{{ field.name }}())
+        ({{ field.name }}() == m.{{ field.name }}())
     {% endif %}
         {% if not loop.is_last %} && {% endif %}
 {% endfor %}

diff --git a/tests/test_randomized.cpp b/tests/test_randomized.cpp
@@ -250,6 +250,7 @@ TEST_CASE("test TestMessages messages with randomized data")
                 CHECK(ok);
                 const auto bytes2 = m2->to_bytes();
                 CHECK_MESSAGE(bytes == bytes2, byte_cmp_msg(bytes, bytes2));
+                CHECK_EQ(*message, *m2);
                 // TODO: meta comparison functions?
 
                 const auto mt1 = message->type();