dissect.cstruct 4.0.dev2__py3-none-any.whl → 4.0.dev4__py3-none-any.whl

dissect/cstruct/compiler.py

@@ -26,6 +26,7 @@ from dissect.cstruct.types import (
     Wchar,
     WcharArray,
 )
+from dissect.cstruct.types.enum import EnumMetaType
 from dissect.cstruct.types.packed import _struct
 
 if TYPE_CHECKING:
@@ -108,6 +109,7 @@ class _ReadSourceGenerator:
         preamble = """
         r = {}
         s = {}
+        o = stream.tell()
         """
 
         if any(field.bits for field in self.fields):
@@ -149,7 +151,7 @@ class _ReadSourceGenerator:
 
             if field.offset is not None and field.offset != current_offset:
                 # If a field has a set offset and it's not the same as the current tracked offset, seek to it
-                yield f"stream.seek({field.offset})"
+                yield f"stream.seek(o + {field.offset})"
                 current_offset = field.offset
 
             if self.align and field.offset is None:
@@ -158,6 +160,9 @@ class _ReadSourceGenerator:
         for field in self.fields:
             field_type = self.cs.resolve(field.type)
 
+            if isinstance(field_type, EnumMetaType):
+                field_type = field_type.type
+
             if not issubclass(field_type, SUPPORTED_TYPES):
                 raise TypeError(f"Unsupported type for compiler: {field_type}")
 
@@ -190,10 +195,10 @@ class _ReadSourceGenerator:
             # Bit fields
             elif field.bits:
                 if not prev_was_bits:
-                    prev_bits_type = field.type
+                    prev_bits_type = field_type
                     prev_was_bits = True
 
-                if bits_remaining == 0 or prev_bits_type != field.type:
+                if bits_remaining == 0 or prev_bits_type != field_type:
                     bits_remaining = (size * 8) - field.bits
                     bits_rollover = True
 

dissect/cstruct/types/structure.py

@@ -49,7 +49,7 @@ class StructureMetaType(MetaType):
 
     def __new__(metacls, name: str, bases: tuple[type, ...], classdict: dict[str, Any]) -> MetaType:
         if (fields := classdict.pop("fields", None)) is not None:
-            metacls._update_fields(metacls, fields, align=classdict.get("align", False), classdict=classdict)
+            metacls._update_fields(metacls, fields, align=classdict.get("__align__", False), classdict=classdict)
 
         return super().__new__(metacls, name, bases, classdict)
 

{dissect.cstruct-4.0.dev2.dist-info → dissect.cstruct-4.0.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 4.0.dev2
+Version: 4.0.dev4
 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-4.0.dev2.dist-info → dissect.cstruct-4.0.dev4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 dissect/cstruct/__init__.py,sha256=E8HT9kh67nPR6cnUmTmTJIdGANNfInG_htxb8mPjSik,1344
 dissect/cstruct/bitbuffer.py,sha256=phqKSE-BS8crZ_sdzssF3E831bD5Gk8LOXIE7iQJXa8,2218
-dissect/cstruct/compiler.py,sha256=MYhlvXqhXwrjov5SFO3i8eftdsvjdrIXszQrflr6kQU,13810
+dissect/cstruct/compiler.py,sha256=dB7Wi1GC0pYoVe5x3olZDmAT3ypbyV-1h-BMefJk5dU,13991
 dissect/cstruct/cstruct.py,sha256=W-17FFc8OM2je7VTMMVQc-hivCAjaRj9qSdf4cEDrCY,14851
 dissect/cstruct/exceptions.py,sha256=WqsUW4OiIpRLQLvixfLrfKl0rtvU1qx7pvfBrz9Sz-I,293
 dissect/cstruct/expression.py,sha256=giBNkbFgsbsw2K2EvQi42GRlm9Z97UvhDhcHnNMG2dg,10763
@@ -15,12 +15,12 @@ dissect/cstruct/types/int.py,sha256=pBdr9InRY3EMHlULBmzBZCI2Qdh2XygsUelDWBrIRhc,
 dissect/cstruct/types/leb128.py,sha256=yHkWqcGEWkf-8ZzfLv_5p937fzrMRvlZXwxowEl36CU,2168
 dissect/cstruct/types/packed.py,sha256=gmNxtNRf9feY8k_7UYMGADe31dtXkw5fQYG1CtyvJBo,1973
 dissect/cstruct/types/pointer.py,sha256=kWfEBCgW7TDnJihZiDGUlldD3QSxVY19r8LGz7olswk,3644
-dissect/cstruct/types/structure.py,sha256=Pqdo4IjdF-XzTVTtDZqu9EUTxdsQ1a5HwAEgF9HbLg8,23954
+dissect/cstruct/types/structure.py,sha256=CqiT_Hzb33yVh5pCNbn-0MkgZcIhXOYfNlOqPnEgjgw,23958
 dissect/cstruct/types/void.py,sha256=RGBlM1yBYCFUM9yLyOETMZBd_nEp9-6vH5xFXaphK8o,438
 dissect/cstruct/types/wchar.py,sha256=5kap4GDypRmt5IoLhMnREbWaWTEMhY_xVLCFginbwFo,2536
-dissect.cstruct-4.0.dev2.dist-info/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
-dissect.cstruct-4.0.dev2.dist-info/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
-dissect.cstruct-4.0.dev2.dist-info/METADATA,sha256=EJQTgpQ_60wUCcHxQ2d1cqBK7FYjpuIL7T67XG2N-58,8303
-dissect.cstruct-4.0.dev2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dissect.cstruct-4.0.dev2.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.cstruct-4.0.dev2.dist-info/RECORD,,
+dissect.cstruct-4.0.dev4.dist-info/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
+dissect.cstruct-4.0.dev4.dist-info/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
+dissect.cstruct-4.0.dev4.dist-info/METADATA,sha256=40l7igJ3GhdnATO1fAbVDfb9MiSjf2ExjBZKQUyV-jE,8303
+dissect.cstruct-4.0.dev4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dissect.cstruct-4.0.dev4.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect.cstruct-4.0.dev4.dist-info/RECORD,,