dissect.cstruct 5.0.dev7__py3-none-any.whl → 5.0.dev8__py3-none-any.whl

dissect/cstruct/__init__.py

@@ -30,12 +30,18 @@ from dissect.cstruct.types import (
 )
 from dissect.cstruct.util import (
     dumpstruct,
+    f16,
+    f32,
+    f64,
     hexdump,
     p8,
     p16,
     p32,
     p64,
     pack,
+    pf16,
+    pf32,
+    pf64,
     swap,
     swap16,
     swap32,
@@ -75,12 +81,18 @@ __all__ = [
     "ctypes",
     "ctypes_type",
     "dumpstruct",
+    "f16",
+    "f32",
+    "f64",
     "hexdump",
     "p8",
     "p16",
     "p32",
     "p64",
     "pack",
+    "pf16",
+    "pf32",
+    "pf64",
     "swap",
     "swap16",
     "swap32",

dissect/cstruct/compiler.py

@@ -11,6 +11,7 @@ from typing import TYPE_CHECKING
 from dissect.cstruct.bitbuffer import BitBuffer
 from dissect.cstruct.types import (
     Array,
+    BaseArray,
     Char,
     CharArray,
     Flag,
@@ -24,18 +25,15 @@ from dissect.cstruct.types import (
     Wchar,
     WcharArray,
 )
-from dissect.cstruct.types.base import BaseArray
 from dissect.cstruct.types.enum import EnumMetaType
-from dissect.cstruct.types.packed import _struct
+from dissect.cstruct.util import _struct
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
     from types import MethodType
 
     from dissect.cstruct.cstruct import cstruct
-    from dissect.cstruct.types import (
-        BaseType,
-    )
+    from dissect.cstruct.types import BaseType
     from dissect.cstruct.types.structure import Field
 
 SUPPORTED_TYPES = (

dissect/cstruct/types/base.py

@@ -6,6 +6,7 @@ from typing import TYPE_CHECKING, Any, BinaryIO, ClassVar, TypeVar
 
 from dissect.cstruct.exception import ArraySizeError
 from dissect.cstruct.expression import Expression
+from dissect.cstruct.util import normalize_endianness
 
 if TYPE_CHECKING:
     from collections.abc import Callable
@@ -328,27 +329,5 @@ def _is_eof(stream: BinaryIO) -> bool:
     return False
 
 
-ENDIANNESS_MAP: dict[AllowedEndianness, Endianness] = {
-    "<": "<",
-    ">": ">",
-    "!": "!",
-    "@": "@",
-    "=": "=",
-    "network": "!",
-    "little": "<",
-    "big": ">",
-}
-
-
-def normalize_endianness(endian: AllowedEndianness) -> Endianness:
-    """Normalize an endianness string to one of the standard format characters."""
-    try:
-        return ENDIANNESS_MAP[endian]
-    except KeyError:
-        raise ValueError(
-            f"Invalid endianness: {endian!r}, expected one of {', '.join(ENDIANNESS_MAP.keys())}"
-        ) from None
-
-
 # As mentioned in the BaseType class, we correctly set the type here
 MetaType.ArrayType = Array

dissect/cstruct/types/packed.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
-from functools import lru_cache
-from struct import Struct
 from typing import TYPE_CHECKING, Any, BinaryIO, Generic, TypeVar
 
 from dissect.cstruct.types.base import EOF, BaseType
+from dissect.cstruct.util import _struct
 
 if TYPE_CHECKING:
     from typing_extensions import Self
@@ -12,11 +11,6 @@ if TYPE_CHECKING:
     from dissect.cstruct.cstruct import Endianness
 
 
-@lru_cache(1024)
-def _struct(endian: str, packchar: str) -> Struct:
-    return Struct(f"{endian}{packchar}")
-
-
 T = TypeVar("T", int, float)
 
 

dissect/cstruct/util.py

@@ -3,15 +3,17 @@ from __future__ import annotations
 import os
 import pprint
 import string
+import struct
 import sys
 from enum import Enum
+from functools import lru_cache
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
     from typing import Literal
 
-    from dissect.cstruct.cstruct import AllowedEndianness
+    from dissect.cstruct.cstruct import AllowedEndianness, Endianness
     from dissect.cstruct.types.base import BaseType
     from dissect.cstruct.types.structure import Structure
 
@@ -64,6 +66,28 @@ ENDIANNESS_TO_BYTEORDER_MAP: dict[AllowedEndianness, Literal["big", "little"]] =
     "big": "big",
 }
 
+ENDIANNESS_MAP: dict[AllowedEndianness, Endianness] = {
+    "<": "<",
+    ">": ">",
+    "!": "!",
+    "@": "@",
+    "=": "=",
+    "network": "!",
+    "little": "<",
+    "big": ">",
+}
+
+
+def normalize_endianness(endian: AllowedEndianness) -> Endianness:
+    """Normalize an endianness string to one of the standard format characters."""
+    try:
+        return ENDIANNESS_MAP[endian]
+    except KeyError:
+        raise ValueError(
+            f"Invalid endianness: {endian!r}, expected one of {', '.join(ENDIANNESS_MAP.keys())}"
+        ) from None
+
+
 Palette = list[tuple[int, str]]
 
 
@@ -327,6 +351,11 @@ def dumpstruct(
     return _dumpstruct(obj, obj.dumps(), offset, color, output, autoskip)
 
 
+@lru_cache(1024)
+def _struct(endian: str, packchar: str) -> struct.Struct:
+    return struct.Struct(f"{endian}{packchar}")
+
+
 def pack(value: int, size: int | None = None, endian: AllowedEndianness = "little") -> bytes:
     """Pack an integer value to a given bit size, endianness.
 
@@ -400,6 +429,36 @@ def p64(value: int, endian: AllowedEndianness = "little") -> bytes:
     return pack(value, 64, endian)
 
 
+def pf16(value: float, endian: AllowedEndianness = "little") -> bytes:
+    """Pack a 16 bit float.
+
+    Arguments:
+        value: Value to pack.
+        endian: Endianness to use (little, big, network, <, >, !, @ or =).
+    """
+    return _struct(normalize_endianness(endian), "e").pack(value)
+
+
+def pf32(value: float, endian: AllowedEndianness = "little") -> bytes:
+    """Pack a 32 bit float.
+
+    Arguments:
+        value: Value to pack.
+        endian: Endianness to use (little, big, network, <, >, !, @ or =).
+    """
+    return _struct(normalize_endianness(endian), "f").pack(value)
+
+
+def pf64(value: float, endian: AllowedEndianness = "little") -> bytes:
+    """Pack a 64 bit float.
+
+    Arguments:
+        value: Value to pack.
+        endian: Endianness to use (little, big, network, <, >, !, @ or =).
+    """
+    return _struct(normalize_endianness(endian), "d").pack(value)
+
+
 def u8(value: bytes, endian: AllowedEndianness = "little", sign: bool = False) -> int:
     """Unpack an 8 bit integer.
 
@@ -444,6 +503,36 @@ def u64(value: bytes, endian: AllowedEndianness = "little", sign: bool = False)
     return unpack(value, 64, endian, sign)
 
 
+def f16(value: bytes, endian: AllowedEndianness = "little") -> float:
+    """Unpack a 16 bit float.
+
+    Arguments:
+        value: Value to unpack.
+        endian: Endianness to use (little, big, network, <, >, !, @ or =).
+    """
+    return _struct(normalize_endianness(endian), "e").unpack(value)[0]
+
+
+def f32(value: bytes, endian: AllowedEndianness = "little") -> float:
+    """Unpack a 32 bit float.
+
+    Arguments:
+        value: Value to unpack.
+        endian: Endianness to use (little, big, network, <, >, !, @ or =).
+    """
+    return _struct(normalize_endianness(endian), "f").unpack(value)[0]
+
+
+def f64(value: bytes, endian: AllowedEndianness = "little") -> float:
+    """Unpack a 64 bit float.
+
+    Arguments:
+        value: Value to unpack.
+        endian: Endianness to use (little, big, network, <, >, !, @ or =).
+    """
+    return _struct(normalize_endianness(endian), "d").unpack(value)[0]
+
+
 def swap(value: int, size: int) -> int:
     """Swap the endianness of an integer with a given bit size.
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.cstruct
-Version: 5.0.dev7
+Version: 5.0.dev8
 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-5.0.dev7.dist-info → dissect_cstruct-5.0.dev8.dist-info}/RECORD

@@ -1,32 +1,32 @@
-dissect/cstruct/__init__.py,sha256=8VNVQfPH4aH5V_kD-jvtLPwQ-ag9ppKHTy3dbxIR6ik,1378
+dissect/cstruct/__init__.py,sha256=KOyNeUvu4c0JaAiyOfj7iftGwUIjTmD8MwHtFsLPLSU,1504
 dissect/cstruct/bitbuffer.py,sha256=lZuLUOluHx4mzFGRp62_FO45_iJwXayyzv9-v8b0Q08,2687
-dissect/cstruct/compiler.py,sha256=vVg2H-pi9ugQ8Xvhs1JQ--4BjA5gtO2tW-1W8jr36V4,14283
+dissect/cstruct/compiler.py,sha256=hlCNd7EQml8bJxI-fQB-kLS8CSdU3_YxzgIkxJbSJiU,14224
 dissect/cstruct/cstruct.py,sha256=bsCesSpbE0H4MUsHwb2iEbeadOBlOSAVENwyoP-UkP8,24929
 dissect/cstruct/exception.py,sha256=RqD08LuBkbMqa3iQ1A05DNN8XgEmQR_SUnguwe9LGo8,316
 dissect/cstruct/expression.py,sha256=MEwqHGgqA2fUk4kYk4lRLDWNTAMhB4-saJ5BgTxl7OA,7956
 dissect/cstruct/lexer.py,sha256=NDUfAWgyxgRNRuVO8ExXQ51LqQXS2mv9bywVa_M7tFQ,19665
 dissect/cstruct/parser.py,sha256=xCK-1O8c86sVFvjaXXSRgTsJWWd0ncKM6KJf2wbyGG8,21348
-dissect/cstruct/util.py,sha256=S__kLEb9HKZg_WZR4CGtXDxkIkERLKbzFTHoU8FT8tU,15313
+dissect/cstruct/util.py,sha256=0khT6G1B7ZjNR7kjD9ox30jDaky8ZxxdUaN5FPMWQ_o,17845
 dissect/cstruct/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/cstruct/tools/stubgen.py,sha256=FLQieYE-MeKK31DcrDzwNUropUYHPjwdfcDb1X2L6j4,7651
 dissect/cstruct/types/__init__.py,sha256=6P71Pu94Dv7RNjZpDZ19pqzx-G0QzmQw4q0-3zWALso,911
-dissect/cstruct/types/base.py,sha256=rU1S2FQllx7X7BQG7qMOwNa7waxAJyuTHTNwtkiAz0g,12763
+dissect/cstruct/types/base.py,sha256=JRc5LpEOZwXQD0Wjo_Q_dWc6lEFtLTW1Q56SCGdDgj4,12268
 dissect/cstruct/types/char.py,sha256=s4zDmnbuOjwHgcsnEihjSqgC6H3t1jsfBTYH2ykwvHU,2997
 dissect/cstruct/types/enum.py,sha256=YIWyP3H0tdxmuSI82enoULiN0YevpnU0UaY5ioBCYfI,8518
 dissect/cstruct/types/flag.py,sha256=7xxQjFEDPHSQOxBHgcc75WzPiAxflOquwr7Z7c3erLE,2347
 dissect/cstruct/types/int.py,sha256=Ewejng5pBYnQHPtzL5W0wQMJVUPYyrY8ALES8mFaabI,1324
 dissect/cstruct/types/leb128.py,sha256=V97XTJT_Xbw1LpTwTN1OkjPHuQQAQUxd8OGuA6yEDmE,2387
-dissect/cstruct/types/packed.py,sha256=78nQWm-yylgfK3858nN-XZhO5jiqyO-piGNEyPD2ps4,2458
+dissect/cstruct/types/packed.py,sha256=NewM2M3CsQKHbByLL42sxaTTOFNoo8gC-dnYe_79qTg,2330
 dissect/cstruct/types/pointer.py,sha256=eGMrB_tTnKXKmYrcqyA_12IdukXcxRG3WOeQ1dgt7lk,3927
 dissect/cstruct/types/structure.py,sha256=7pBg0moZbszeRomFEp5CbAHZcd1J8IVTmEG9Mo2eKS0,37571
 dissect/cstruct/types/void.py,sha256=LCYnTcxsFPaxln36QEUxWuCZVioHRRckMuqtlm6tH54,1218
 dissect/cstruct/types/wchar.py,sha256=YCYlu91D9AMVpWOLbVMdpvDDURH-EqyppM5UMDU5UQw,3200
-dissect_cstruct-5.0.dev7.dist-info/licenses/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
-dissect_cstruct-5.0.dev7.dist-info/licenses/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
-dissect_cstruct-5.0.dev7.dist-info/METADATA,sha256=IUF-_jFf7_GABYqAww23JWUTr-f73OKwmaICtDcOGc8,9255
-dissect_cstruct-5.0.dev7.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-dissect_cstruct-5.0.dev7.dist-info/entry_points.txt,sha256=z53zqZqwD2OLrAkRwrP4wTeiU9CQe7xrMly0T2c0_wQ,71
-dissect_cstruct-5.0.dev7.dist-info/scm_file_list.json,sha256=nuFWhDGL6VmjcwOB94CSfjNBblnsa9imUy8X4BLyvhw,2306
-dissect_cstruct-5.0.dev7.dist-info/scm_version.json,sha256=wMGNV4ui6dgAUOW0hK23797wTuOlVvhVvvLFz_dXXFk,162
-dissect_cstruct-5.0.dev7.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect_cstruct-5.0.dev7.dist-info/RECORD,,
+dissect_cstruct-5.0.dev8.dist-info/licenses/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
+dissect_cstruct-5.0.dev8.dist-info/licenses/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
+dissect_cstruct-5.0.dev8.dist-info/METADATA,sha256=e7oamdNZkbBocBjcD_kkj0T-wSHGf5mPhSgWn-MWHos,9255
+dissect_cstruct-5.0.dev8.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+dissect_cstruct-5.0.dev8.dist-info/entry_points.txt,sha256=z53zqZqwD2OLrAkRwrP4wTeiU9CQe7xrMly0T2c0_wQ,71
+dissect_cstruct-5.0.dev8.dist-info/scm_file_list.json,sha256=nuFWhDGL6VmjcwOB94CSfjNBblnsa9imUy8X4BLyvhw,2306
+dissect_cstruct-5.0.dev8.dist-info/scm_version.json,sha256=znogn9Q3i6GJ75IR8pSsX582lmewE1Hqievuy3IQk8U,162
+dissect_cstruct-5.0.dev8.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect_cstruct-5.0.dev8.dist-info/RECORD,,

{dissect_cstruct-5.0.dev7.dist-info → dissect_cstruct-5.0.dev8.dist-info}/scm_version.json

@@ -1,7 +1,7 @@
 {
   "tag": "5.0.dev0",
-  "distance": 7,
-  "node": "g32253fe9f286383a8bda6b953c7c85571cd89833",
+  "distance": 8,
+  "node": "g3032ad71f5e15148222c2faef49e47112a36bf12",
   "dirty": true,
   "branch": "main",
   "node_date": "2026-07-20"