dissect.cstruct 3.11.dev3__py3-none-any.whl → 3.12.dev2__py3-none-any.whl

dissect/cstruct/types/structure.py

@@ -22,7 +22,7 @@ class Field:
         self.alignment = type_.alignment
 
     def __repr__(self):
-        bits_str = " : {self.bits}" if self.bits else ""
+        bits_str = f" : {self.bits}" if self.bits else ""
         return f"<Field {self.name} {self.type}{bits_str}>"
 
 
@@ -324,6 +324,12 @@ class Union(Structure):
             size = max(len(field.type), size)
             alignment = max(field.alignment, alignment)
 
+        if self.align and size is not None:
+            # Add "tail padding" if we need to align
+            # This bit magic rounds up to the next alignment boundary
+            # E.g. offset = 3; alignment = 8; -offset & (alignment - 1) = 5
+            size += -size & (alignment - 1)
+
         self.size = size
         self.alignment = alignment
 

{dissect.cstruct-3.11.dev3.dist-info → dissect.cstruct-3.12.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 3.11.dev3
+Version: 3.12.dev2
 Summary: A Dissect module implementing a parser for C-like structures: structure parsing in Python made easy
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Apache License 2.0

{dissect.cstruct-3.11.dev3.dist-info → dissect.cstruct-3.12.dev2.dist-info}/RECORD

@@ -15,12 +15,12 @@ dissect/cstruct/types/flag.py,sha256=BQMmpoO_ey-CRf1cP4Nrf7L_U4zvhIZoVrM3ZkyWFRk
 dissect/cstruct/types/instance.py,sha256=3KceA9k1Cxo5HKa5wH7O48vtzvNMTsjsO917hgOQk4U,1997
 dissect/cstruct/types/packedtype.py,sha256=93D8Rcn1SDeY0oOYA73DwgFIbwuNhOffR-NL0_Z6nqg,1997
 dissect/cstruct/types/pointer.py,sha256=ghfZ9y638KCzem0rXgYeeTPXbYhacHfWx8uD003GkWo,4609
-dissect/cstruct/types/structure.py,sha256=D7VViVKJgeINknmgBw46vzariDo5NptOH3Pt477vx6o,13153
+dissect/cstruct/types/structure.py,sha256=epjVmMUCxoMNCi5xMoMIyw9Ujp_g2cSEPcZl7eJN0bE,13442
 dissect/cstruct/types/voidtype.py,sha256=JaKEIjOsGTARn8g30vv7WCH_OAdEkKt4Mw6Oneo_3Mw,301
 dissect/cstruct/types/wchartype.py,sha256=pVp_xlu4xHdxzQG6FB30IxNSwnKRC183jleeUG4nzQ4,1693
-dissect.cstruct-3.11.dev3.dist-info/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
-dissect.cstruct-3.11.dev3.dist-info/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
-dissect.cstruct-3.11.dev3.dist-info/METADATA,sha256=A5Ossj_e6oxYdHZkG_x0k8jXAizE-vysW9ch99QFSMA,8303
-dissect.cstruct-3.11.dev3.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-dissect.cstruct-3.11.dev3.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.cstruct-3.11.dev3.dist-info/RECORD,,
+dissect.cstruct-3.12.dev2.dist-info/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
+dissect.cstruct-3.12.dev2.dist-info/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
+dissect.cstruct-3.12.dev2.dist-info/METADATA,sha256=9gnt1Q1FUNBId8jQbmOmMzzx72FFxt6Oc2IVnNHDIK0,8303
+dissect.cstruct-3.12.dev2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+dissect.cstruct-3.12.dev2.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect.cstruct-3.12.dev2.dist-info/RECORD,,

{dissect.cstruct-3.11.dev3.dist-info → dissect.cstruct-3.12.dev2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any