fix inspect offset for nested struct/union

Author: andreax79

cstruct/abstract.py

@@ -238,18 +238,25 @@ def inspect(self, start_addr: Optional[int] = None, end_addr: Optional[int] = No
         """
         buffer = StringIO()
         if hasattr(self, "__mem__"):
-            mem = self.__mem__
+            mem = self.__mem__[self.__base__ :]
         else:
             mem = self.pack()
-        for i in range(start_addr or 0, end_addr or self.size, 16):
-            row = mem[i : i + 16]
+        if end_addr is None:
+            end_addr = self.size
+        for i in range(start_addr or 0, end_addr, 16):
+            row = mem[i : min(i + 16, end_addr)]
             buffer.write(f"{i:08x} ")
             for j, c in enumerate(row):
                 separator = " " if j == 7 else ""
                 buffer.write(f" {c:02x}{separator}")
+            for j in range(len(row) - 1, 15):
+                separator = " " if j == 7 else ""
+                buffer.write(f"   {separator}")
             buffer.write("  |")
             for c in row:
                 buffer.write(chr(c) if c >= 32 and c < 127 else ".")
+            for j in range(len(row) - 1, 15):
+                buffer.write(" ")
             buffer.write("|")
             buffer.write("\n")
         buffer.seek(0, 0)

tests/test_nested.py

@@ -259,6 +259,8 @@ def test_nested_struct_offset():
     assert o.pack() == b'ciao_ciao\x00\x00\xbc\x08\xe4\xb0\x0cX4\xe6\x07\x00\x003333'
     assert o.u1.pack() == b'\xe6\x07\x00\x00'
     assert o.aaa.pack() == b'3333'
+    assert o.u1.a_op.inspect() == "00000000  e6 07 00 00                                       |....            |\n"
+    assert o.u1.b_op.inspect() == "00000000  e6 07 00                                          |...             |\n"
 
 
 def test_nested_anonymous_struct_offset():
@@ -308,6 +310,9 @@ def test_nested_anonymous_struct_offset():
     assert o.pack() == b'ciao_ciao\x00\x00\xbc\x08\xe4\xb0\x0cX4\xe6\x07\x00\x003333'
     assert o.__anonymous0.pack() == b'\xe6\x07\x00\x00'
     assert o.aaa.pack() == b'3333'
+    assert o.__anonymous0.inspect() == "00000000  e6 07 00 00                                       |....            |\n"
+    assert o.__anonymous0.a_op.inspect() == "00000000  e6 07 00 00                                       |....            |\n"
+    assert o.__anonymous0.b_op.inspect() == "00000000  e6 07 00                                          |...             |\n"
 
     o = Opu()
     o.preamble = b'ciao_ciao'
@@ -325,3 +330,5 @@ def test_nested_anonymous_struct_offset():
     assert o.pack() == b'ciao_ciao\x00\x00\xbc\x08\xe4\xb0\x0cX4\xe6\x07\x00\x003333'
     assert o.a_op.pack() == b'\xe6\x07\x00\x00'
     assert o.aaa.pack() == b'3333'
+    assert o.a_op.inspect() == "00000000  e6 07 00 00                                       |....            |\n"
+    assert o.b_op.inspect() == "00000000  e6 07 00                                          |...             |\n"