Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] Fix dynamic struct decoding for nested structs (#7346)

Browse Source 
After a struct-type field descriptor had offsets calculated more than once, IsBitField would return true, causing the second call to CalculateOffsets to calculate incorrect offsets.
This commit is contained in:
Ryan Blue
2024-11-05 08:43:04 -05:00
committed by GitHub
parent 8588b5e520
commit 7a6c7af412
5 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wpiutil/src/test/java/edu/wpi/first/util/struct/DynamicStructTest.java
View File

@@ -49,16 +49,36 @@ class DynamicStructTest {
@Test
void testDelayedValid() {
var desc = assertDoesNotThrow(() -> db.add("test", "foo a"));
final var desc = assertDoesNotThrow(() -> db.add("test", "foo a"));
assertFalse(desc.isValid());
var desc2 = assertDoesNotThrow(() -> db.add("test2", "foo a[2]"));
var desc2 = assertDoesNotThrow(() -> db.add("test2", "foo a; foo b;"));
assertFalse(desc2.isValid());
var desc3 = assertDoesNotThrow(() -> db.add("foo", "int32 a"));
assertTrue(desc3.isValid());
var desc3 = assertDoesNotThrow(() -> db.add("test3", "foo a[2]"));
assertFalse(desc3.isValid());
var desc4 = assertDoesNotThrow(() -> db.add("foo", "int32 a"));
assertTrue(desc4.isValid());
assertTrue(desc.isValid());
assertEquals(desc.getSize(), 4);
assertTrue(desc2.isValid());
assertEquals(desc2.getSize(), 8);
assertTrue(desc3.isValid());
assertEquals(desc3.getSize(), 8);
}
@Test
void testReuseNestedStructDelayed() {
var desc2 = assertDoesNotThrow(() -> db.add("test2", "test a;test b;"));
var desc = assertDoesNotThrow(() -> db.add("test", "int32 a; uint16 b; int16 c;"));
assertTrue(desc.isValid());
assertTrue(desc2.isValid());
assertEquals(desc2.getSize(), 16);
var fields = desc2.getFields();
var field = fields.get(0);
assertEquals(field.getOffset(), 0);
assertEquals(field.getName(), "a");
field = fields.get(1);
assertEquals(field.getOffset(), 8);
assertEquals(field.getName(), "b");
}
@Test