Add metadata/fields separation

dev-osrose · Dec 23, 2020 · 974243d · 974243d
1 parent 0258b28
commit 974243d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 33 deletions.
diff --git a/generator/src/codegen/codegen_source.rs b/generator/src/codegen/codegen_source.rs
@@ -302,12 +302,13 @@ impl<'a, W: Write> CodeSourceGenerator<'a, W> {
     }
 
     fn packet_to_json(&mut self, packet: &Packet) -> Result<()> {
-        cg!(self, "void to_json(nlohmann::json& j, const {}& data) {{", packet.class_name());
+        cg!(self, "void RoseCommon::Packet::to_json(nlohmann::json& j, const {}& data) {{", packet.class_name());
         self.indent();
         cg!(self, "j = nlohmann::json{{");
         self.indent();
-        cg!(self, "{{ \"packet\", \"{}\" }},", packet.type_());
-        cg!(self, "{{ \"size\", data.get_size() }},");
+        cg!(self, "{{ \"metadata\", {{ {{ \"packet\", \"{}\" }}, {{ \"size\", data.get_size() }} }} }},", packet.type_());
+        cg!(self, "{{ \"fields\", {{");
+        self.indent();
         for content in packet.contents() {
             use self::PacketContent::*;
             match content {
@@ -323,6 +324,8 @@ impl<'a, W: Write> CodeSourceGenerator<'a, W> {
             }
         }
         self.dedent();
+        cg!(self, "}} }}");
+        self.dedent();
         cg!(self, "}};");
         self.dedent();
         cg!(self, "}}");
@@ -334,7 +337,7 @@ impl<'a, W: Write> CodeSourceGenerator<'a, W> {
     }
 
     fn simple_type_to_json(&mut self, packet_name:&str, element: &SimpleType) -> Result<()> {
-        cg!(self, "void to_json(nlohmann::json& j, const {}::{}& data) {{", packet_name, element.name());
+        cg!(self, "void RoseCommon::Packet::to_json(nlohmann::json& j, const {}::{}& data) {{", packet_name, element.name());
         self.indent();
         cg!(self, "j = nlohmann::json{{");
         self.indent();
@@ -369,7 +372,7 @@ impl<'a, W: Write> CodeSourceGenerator<'a, W> {
         if element.inline() == true {
             return Ok(());
         }
-        cg!(self, "void to_json(nlohmann::json& j, const {}::{}& data) {{", packet_name, element.name());
+        cg!(self, "void RoseCommon::Packet::to_json(nlohmann::json& j, const {}::{}& data) {{", packet_name, element.name());
         self.indent();
         use ::flat_ast::ComplexTypeContent::*;
         cg!(self, "j = nlohmann::json{{");

diff --git a/srv_test.cpp b/srv_test.cpp
@@ -385,46 +385,47 @@ constexpr size_t SrvTest::size() {
 }
 
 
-void to_json(nlohmann::json& j, const Aaa& data) {
-    j = json{
+void RoseCommon::Packet::to_json(nlohmann::json& j, const SrvTest::Aaa& data) {
+    j = nlohmann::json{
         { "value", static_cast<uint8_t>(data) },
     };
 }
-void to_json(nlohmann::json& j, const Bbb& data) {
-    j = json{
+void RoseCommon::Packet::to_json(nlohmann::json& j, const SrvTest::Bbb& data) {
+    j = nlohmann::json{
         { "value", data.operator std::string() },
     };
 }
 
-void to_json(nlohmann::json& j, const Pote& data) {
-    j = json{
+void RoseCommon::Packet::to_json(nlohmann::json& j, const SrvTest::Pote& data) {
+    j = nlohmann::json{
         { "a", data.get_a() },
         { "b", data.get_b() },
         { "c", data.get_c() },
     };
 }
-void to_json(nlohmann::json& j, const Pote2& data) {
-    j = json{
+void RoseCommon::Packet::to_json(nlohmann::json& j, const SrvTest::Pote2& data) {
+    j = nlohmann::json{
         { "a", data.get_a() == 1 },
         { "b", data.get_b() == 1 },
     };
 }
-void to_json(nlohmann::json& j, const SrvTest& data) {
-    j = json{
-        { "packet", "PAKWC_TEST" },
-        { "size", data.get_size() },
-        { "a", data.get_a() == 1 },
-        { "b", data.get_b() == 1 },
-        { "c", data.get_c() },
-        { "d", data.get_d() == 1 },
-        { "e", data.get_e() == 1 },
-        { "f", data.get_f() == 1 },
-        { "g", data.get_g() == 1 },
-        { "h", data.get_h() == 1 },
-        { "pote", data.get_pote() },
-        { "pote2", data.get_pote2() },
-        { "x", data.get_x() },
-        { "y", data.get_y() },
+void RoseCommon::Packet::to_json(nlohmann::json& j, const SrvTest& data) {
+    j = nlohmann::json{
+        { "metadata", { "packet", "PAKWC_TEST" }, { "size", data.get_size() } },
+        { "fields", {
+            { "a", data.get_a() == 1 },
+            { "b", data.get_b() == 1 },
+            { "c", data.get_c() },
+            { "d", data.get_d() == 1 },
+            { "e", data.get_e() == 1 },
+            { "f", data.get_f() == 1 },
+            { "g", data.get_g() == 1 },
+            { "h", data.get_h() == 1 },
+            { "pote", data.get_pote() },
+            { "pote2", data.get_pote2() },
+            { "x", data.get_x() },
+            { "y", data.get_y() },
+        } }
     };
 }
 
diff --git a/srv_test.h b/srv_test.h
@@ -136,11 +136,11 @@ class SrvTest : public CRosePacket {
         Bbb y;
 };
 
-void to_json(nlohmann::json& j, const Aaa& data);
-void to_json(nlohmann::json& j, const Bbb& data);
+void to_json(nlohmann::json& j, const SrvTest::Aaa& data);
+void to_json(nlohmann::json& j, const SrvTest::Bbb& data);
 
-void to_json(nlohmann::json& j, const Pote& data);
-void to_json(nlohmann::json& j, const Pote2& data);
+void to_json(nlohmann::json& j, const SrvTest::Pote& data);
+void to_json(nlohmann::json& j, const SrvTest::Pote2& data);
 void to_json(nlohmann::json& j, const SrvTest& data);
 
 }