dissect.cstruct 4.8.dev8__py3-none-any.whl → 5.0.dev0__py3-none-any.whl

dissect/cstruct/utils.py

@@ -7,13 +7,13 @@ import sys
 from enum import Enum
 from typing import TYPE_CHECKING
 
-from dissect.cstruct.types.pointer import Pointer
-from dissect.cstruct.types.structure import Structure
-
 if TYPE_CHECKING:
     from collections.abc import Iterator
     from typing import Literal
 
+    from dissect.cstruct.types.base import BaseType
+    from dissect.cstruct.types.structure import Structure
+
 # Regular ANSI colors
 COLOR_RED = "\033[0;31m"
 COLOR_GREEN = "\033[0;32m"
@@ -263,14 +263,15 @@ def _dumpstruct(
             continue
 
         value = getattr(structure, field._name)
-        if isinstance(value, (str, Pointer, Enum)):
-            value = repr(value)
-        elif isinstance(value, int):
+
+        if isinstance(value, int) and not isinstance(value, Enum):
             value = hex(value)
         elif isinstance(value, list):
             value = pprint.pformat(value)
             if "\n" in value:
                 value = value.replace("\n", f"\n{' ' * (len(field._name) + 4)}")
+        else:
+            value = repr(value)
 
         if color:
             foreground, background = colors[ci % len(colors)]
@@ -316,11 +317,10 @@ def dumpstruct(
     if output not in ("print", "string"):
         raise ValueError(f"Invalid output argument: {output!r} (should be 'print' or 'string').")
 
-    if isinstance(obj, Structure):
-        return _dumpstruct(obj, obj.dumps(), offset, color, output, autoskip)
-    if issubclass(obj, Structure) and data is not None:
+    if isinstance(obj, type) and data is not None:
         return _dumpstruct(obj(data), data, offset, color, output, autoskip)
-    raise ValueError("Invalid arguments")
+
+    return _dumpstruct(obj, obj.dumps(), offset, color, output, autoskip)
 
 
 def pack(value: int, size: int | None = None, endian: str = "little") -> bytes:
@@ -468,3 +468,17 @@ def swap64(value: int) -> int:
         value: Integer to swap.
     """
     return swap(value, 64)
+
+
+def sizeof(type_: type[BaseType] | BaseType) -> int:
+    """Get the size of a type in bytes."""
+    return len(type_)
+
+
+def offsetof(type_: type[Structure], name: str) -> int:
+    """Get the offset of a field in a structure."""
+    if (field := type_.fields.get(name)) is None:
+        raise ValueError(f"Structure '{type_.__name__}' does not have a field named '{name}'")
+    if (offset := field.offset) is None:
+        raise ValueError(f"Field '{field._name}' of structure '{type_.__name__}' does not have a known offset")
+    return offset

{dissect_cstruct-4.8.dev8.dist-info → dissect_cstruct-5.0.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.cstruct
-Version: 4.8.dev8
+Version: 5.0.dev0
 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-Expression: Apache-2.0

{dissect_cstruct-4.8.dev8.dist-info → dissect_cstruct-5.0.dev0.dist-info}/RECORD

@@ -1,11 +1,12 @@
 dissect/cstruct/__init__.py,sha256=Z47dU_PpbZyc2ZSyu-ww-ncX6igaTw0ItVHzVgiaiKI,1380
 dissect/cstruct/bitbuffer.py,sha256=bid_N4ZsaTeC3x5Fzs8viUrldT863dMPtEDih20Nt6k,2644
 dissect/cstruct/compiler.py,sha256=uOjteLdoUIVNSX71TsBAusW8U085RRH9dXkbK3dp1vY,14203
-dissect/cstruct/cstruct.py,sha256=1lHbxZwj5x2EmmXLR0sJlp-wQqaTtd_ht1lvwit0KtQ,19483
-dissect/cstruct/exceptions.py,sha256=SX05-_HqQn8lYC7SBHv5OrYEepYRMNmRiIzVPW8bvMQ,330
-dissect/cstruct/expression.py,sha256=mf5GFGLAn_2Tz3QK86Yqoi317l8cjMcffBKzP2STE6M,10841
-dissect/cstruct/parser.py,sha256=Mk8QbkDov_xfauZnp2MqUmFGOPZlp7O2rSLYbB9S3g4,24550
-dissect/cstruct/utils.py,sha256=jSWZY8AWoLHF1W9ix-7EH2eI7pTHzLfnSfQHWH1qgKM,14190
+dissect/cstruct/cstruct.py,sha256=Rq7RodLtegSbJzB0fYtSnbdBcx39Oxwm6rKZoKZVIeY,20129
+dissect/cstruct/exceptions.py,sha256=RqD08LuBkbMqa3iQ1A05DNN8XgEmQR_SUnguwe9LGo8,316
+dissect/cstruct/expression.py,sha256=BIqSs-xvCb4WvUb0_xjg2A4hclH8cs_W0lIGydzluIE,8027
+dissect/cstruct/lexer.py,sha256=NEU1Ww29jWjOfhODNXMGhsBR9b-_ITnz5J-4A3kf688,19178
+dissect/cstruct/parser.py,sha256=7F_QmlY7SZRXq-SOnbu7C6M2D8FKN63zvNNfE0D4bvQ,20545
+dissect/cstruct/utils.py,sha256=3ZEeZ_bAZRm7IcyeB6i9h7qrcYB42LW9GJR9BtKTUDg,14650
 dissect/cstruct/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/cstruct/tools/stubgen.py,sha256=wvl07h3VnJZWe9ygX4QMxjEH1ZcWaI_6_pSdAJoOEXk,7820
 dissect/cstruct/types/__init__.py,sha256=6P71Pu94Dv7RNjZpDZ19pqzx-G0QzmQw4q0-3zWALso,911
@@ -20,10 +21,12 @@ dissect/cstruct/types/pointer.py,sha256=PqeJOoNBUfMd5uO2kpF6OHeW7Q6R1N1W1V4q1Mak
 dissect/cstruct/types/structure.py,sha256=I9LVeZ81rNE5GDT6wxpUL-PqMO31Ae6TVLLzTGyd6mM,33012
 dissect/cstruct/types/void.py,sha256=Gvh0HqI6jQSj2uesdo3J8-G41brWCz8pmP16l8xTBxE,1074
 dissect/cstruct/types/wchar.py,sha256=N9Y_XX2_hZEe2DwepJjxsB6xuRJ6zINRalcUofR59kY,2608
-dissect_cstruct-4.8.dev8.dist-info/licenses/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
-dissect_cstruct-4.8.dev8.dist-info/licenses/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
-dissect_cstruct-4.8.dev8.dist-info/METADATA,sha256=LpS2_xD11bTw0F2YOz0X9ZWNDgptmNd_FcgzHnrR8nI,9255
-dissect_cstruct-4.8.dev8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-dissect_cstruct-4.8.dev8.dist-info/entry_points.txt,sha256=z53zqZqwD2OLrAkRwrP4wTeiU9CQe7xrMly0T2c0_wQ,71
-dissect_cstruct-4.8.dev8.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect_cstruct-4.8.dev8.dist-info/RECORD,,
+dissect_cstruct-5.0.dev0.dist-info/licenses/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
+dissect_cstruct-5.0.dev0.dist-info/licenses/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
+dissect_cstruct-5.0.dev0.dist-info/METADATA,sha256=ujB3Cdxy5Yc--uXeWI4IIE24zn_t5r70jW_xmC7OBzc,9255
+dissect_cstruct-5.0.dev0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+dissect_cstruct-5.0.dev0.dist-info/entry_points.txt,sha256=z53zqZqwD2OLrAkRwrP4wTeiU9CQe7xrMly0T2c0_wQ,71
+dissect_cstruct-5.0.dev0.dist-info/scm_file_list.json,sha256=K27Mlh84EZbq__O4ajx8gV0dOE5BF81hxo0Hvtrzz1U,2308
+dissect_cstruct-5.0.dev0.dist-info/scm_version.json,sha256=He7zR_9aI3hjUAyokmxGFi-iCH_17nbqSm6K2gebcEo,163
+dissect_cstruct-5.0.dev0.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect_cstruct-5.0.dev0.dist-info/RECORD,,

{dissect_cstruct-4.8.dev8.dist-info → dissect_cstruct-5.0.dev0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.1)
+Generator: setuptools (83.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

dissect_cstruct-5.0.dev0.dist-info/scm_file_list.json

@@ -0,0 +1,78 @@
+{
+  "files": [
+    ".gitignore",
+    "COPYRIGHT",
+    "README.md",
+    "CHANGELOG.md",
+    ".git-blame-ignore-revs",
+    "tox.ini",
+    ".gitattributes",
+    "pyproject.toml",
+    "MANIFEST.in",
+    "LICENSE",
+    ".github/pull_request_template.md",
+    ".github/workflows/dissect-ci.yml",
+    "dissect/cstruct/parser.py",
+    "dissect/cstruct/compiler.py",
+    "dissect/cstruct/cstruct.py",
+    "dissect/cstruct/bitbuffer.py",
+    "dissect/cstruct/utils.py",
+    "dissect/cstruct/exceptions.py",
+    "dissect/cstruct/lexer.py",
+    "dissect/cstruct/expression.py",
+    "dissect/cstruct/__init__.py",
+    "dissect/cstruct/types/base.py",
+    "dissect/cstruct/types/pointer.py",
+    "dissect/cstruct/types/structure.py",
+    "dissect/cstruct/types/void.py",
+    "dissect/cstruct/types/int.py",
+    "dissect/cstruct/types/flag.py",
+    "dissect/cstruct/types/packed.py",
+    "dissect/cstruct/types/enum.py",
+    "dissect/cstruct/types/char.py",
+    "dissect/cstruct/types/wchar.py",
+    "dissect/cstruct/types/leb128.py",
+    "dissect/cstruct/types/__init__.py",
+    "dissect/cstruct/tools/stubgen.py",
+    "dissect/cstruct/tools/__init__.py",
+    "examples/secdesc.py",
+    "examples/pe.py",
+    "examples/mirai.py",
+    "examples/protobuf.py",
+    "examples/disk.py",
+    "tests/test_types_enum.py",
+    "tests/test_types_pointer.py",
+    "tests/test_types_leb128.py",
+    "tests/test_annotations.py",
+    "tests/test_types_wchar.py",
+    "tests/test_parser.py",
+    "tests/test_ctypes.py",
+    "tests/test_bitbuffer.py",
+    "tests/conftest.py",
+    "tests/test_types_packed.py",
+    "tests/test_types_structure.py",
+    "tests/test_types_union.py",
+    "tests/test_expression.py",
+    "tests/test_tools_stubgen.py",
+    "tests/test_types_custom.py",
+    "tests/utils.py",
+    "tests/test_lexer.py",
+    "tests/test_types_flag.py",
+    "tests/test_benchmark.py",
+    "tests/test_types_char.py",
+    "tests/test_compiler.py",
+    "tests/test_types_int.py",
+    "tests/test_types_void.py",
+    "tests/test_types_base.py",
+    "tests/test_align.py",
+    "tests/test_basic.py",
+    "tests/test_bitfield.py",
+    "tests/test_utils.py",
+    "tests/__init__.py",
+    "tests/_docs/conf.py",
+    "tests/_docs/Makefile",
+    "tests/_docs/index.rst",
+    "tests/_docs/__init__.py",
+    "tests/_data/testdef.txt"
+  ]
+}

dissect_cstruct-5.0.dev0.dist-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "5.0.dev0",
+  "distance": 0,
+  "node": "g7678a8f531377054d12afef5c69107e1e08b49a8",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-07"
+}