Fixed support for single field structures in messages

Author: Yuri6037

compiler/Cargo.toml

@@ -17,7 +17,7 @@ toml = { version = "0.5.11", optional = true }
 bp3d-util = { version = "1.4.0", features = ["simple-error", "path", "index-map"], optional = true }
 itertools = { version = "0.13.0", optional = true }
 regex = { version = "1.10.5", optional = true }
-bp3d-debug = { version = "1.0.0-rc.5.0.0", optional = true }
+bp3d-debug = { version = "1.0.0-rc.6.1.0", optional = true }
 
 [features]
 model = ["serde"]

compiler/src/compiler/message.rs

@@ -35,7 +35,7 @@ use crate::compiler::Protocol;
 use crate::model::message::MessageFieldValue;
 use crate::model::protocol::{Description, Endianness};
 use crate::model::structure::StructFieldRaw;
-use bp3d_debug::error;
+use bp3d_debug::{error, trace};
 use std::cell::Cell;
 use std::fmt::{Display, Formatter};
 use std::rc::Rc;
@@ -421,12 +421,12 @@ impl Field {
             let r = Referenced::lookup(proto, &item_type).ok_or(Error::UndefinedReference(item_type))?;
             match r {
                 Referenced::Struct(r) => {
-                    if !has_unions
-                        && r.fields.len() == 1
-                        && r.fields[0].ty.as_fixed().is_some()
-                        && r.fields[0].ty.as_fixed().map(|v| v.raw.is_transmute()).unwrap_or_default()
-                        && r.fields[0].loc.bit_size % 8 == 0
-                    {
+                    let is_single = r.fields.len() == 1;
+                    let is_fixed = r.fields[0].ty.as_fixed().is_some();
+                    let is_none = r.fields[0].ty.as_fixed().map(|v| v.raw.is_none()).unwrap_or_default();
+                    let is_byte_aligned = r.fields[0].loc.bit_size % 8 == 0;
+                    trace!({has_unions} {is_single} {is_fixed} {is_none} {is_byte_aligned}, "Found struct reference: {}", r.name);
+                    if !has_unions && is_single && is_fixed && is_none && is_byte_aligned {
                         let fixed = unsafe { r.fields[0].ty.as_fixed().unwrap_unchecked() };
                         Ok(Field {
                             name: value.name,

compiler/src/compiler/structure.rs

@@ -219,8 +219,8 @@ pub enum FieldRaw {
 }
 
 impl FieldRaw {
-    pub fn is_transmute(&self) -> bool {
-        matches!(self, Self::Transmute)
+    pub fn is_none(&self) -> bool {
+        matches!(self, Self::None)
     }
 
     fn from_model(ty: SimpleType, bit_size: usize) -> FieldRaw {

testprog/src/test.json5

@@ -1,5 +1,19 @@
 {
     name: "test",
+    structs: [
+        {
+            name: "SingleValue",
+            fields: [
+                {
+                    name: "v",
+                    raw: {
+                        type: "unsigned",
+                        bits: 8
+                    }
+                }
+            ]
+        }
+    ],
     messages: [
         {
             name: "Test1",
@@ -16,7 +30,8 @@
                         type: "unsigned",
                         bits: 32
                     }
-                }
+                },
+                { name: "p3", item_type: "SingleValue" }
             ]
         },
         {

testprog/tests/test_test.rs

@@ -35,6 +35,7 @@ fn write_message<W: Write>(out: W) {
         p1: Some(Test1 {
             s1: "this is a test",
             p1: 42,
+            p3: 42
         }),
         s1: "a test",
         s2: Some("hello world"),
@@ -48,6 +49,7 @@ fn test() {
     write_message(&mut v);
     let msg = Test::from_bytes(&v).unwrap().into_inner();
     assert_eq!(msg.p1.as_ref().unwrap().p1, 42);
+    assert_eq!(msg.p1.as_ref().unwrap().p3, 42);
     assert_eq!(msg.p1.as_ref().unwrap().s1, "this is a test");
     assert_eq!(msg.s1, "a test");
     assert_eq!(msg.s2, Some("hello world"));
@@ -68,9 +70,11 @@ fn test_offsets() {
     assert_eq!(offsets.s2.start, 7);
     assert_eq!(offsets.s2.size(), 13);
     assert_eq!(offsets.p1.start, 20);
-    assert_eq!(offsets.p1.size(), 20);
+    assert_eq!(offsets.p1.size(), 21);
     assert_eq!(offsets.p1_offsets.unwrap().s1.start, 0);
     assert_eq!(offsets.p1_offsets.unwrap().s1.size(), 15);
     assert_eq!(offsets.p1_offsets.unwrap().p1.start, 15);
     assert_eq!(offsets.p1_offsets.unwrap().p1.size(), 4);
+    assert_eq!(offsets.p1_offsets.unwrap().p3.start, 19);
+    assert_eq!(offsets.p1_offsets.unwrap().p3.size(), 1);
 }