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

dissect/cstruct/compiler.py

@@ -226,18 +226,18 @@ class _ReadSourceGenerator:
 
     def _generate_structure(self, field: Field) -> Iterator[str]:
         template = f"""
-        {'_s = stream.tell()' if field.type.dynamic else ''}
+        {"_s = stream.tell()" if field.type.dynamic else ""}
         r["{field._name}"] = {self._map_field(field)}._read(stream, context=r)
-        {f's["{field._name}"] = stream.tell() - _s' if field.type.dynamic else ''}
+        {f's["{field._name}"] = stream.tell() - _s' if field.type.dynamic else ""}
         """
 
         yield dedent(template)
 
     def _generate_array(self, field: Field) -> Iterator[str]:
         template = f"""
-        {'_s = stream.tell()' if field.type.dynamic else ''}
+        {"_s = stream.tell()" if field.type.dynamic else ""}
         r["{field._name}"] = {self._map_field(field)}._read(stream, context=r)
-        {f's["{field._name}"] = stream.tell() - _s' if field.type.dynamic else ''}
+        {f's["{field._name}"] = stream.tell() - _s' if field.type.dynamic else ""}
         """
 
         yield dedent(template)

dissect/cstruct/cstruct.py

@@ -48,7 +48,7 @@ class cstruct:
     DEF_CSTYLE = 1
     DEF_LEGACY = 2
 
-    def __init__(self, endian: str = "<", pointer: str | None = None):
+    def __init__(self, load: str = "", *, endian: str = "<", pointer: str | None = None):
         self.endian = endian
 
         self.consts = {}
@@ -188,6 +188,9 @@ class cstruct:
         self.pointer: type[BaseType] = self.resolve(pointer)
         self._anonymous_count = 0
 
+        if load:
+            self.load(load)
+
     def __getattr__(self, attr: str) -> Any:
         try:
             return self.consts[attr]
@@ -369,14 +372,14 @@ class cstruct:
             "null_terminated": null_terminated,
         }
 
-        return cast(type[Array], self._make_type(name, bases, size, alignment=type_.alignment, attrs=attrs))
+        return cast("type[Array]", self._make_type(name, bases, size, alignment=type_.alignment, attrs=attrs))
 
     def _make_int_type(self, name: str, size: int, signed: bool, *, alignment: int | None = None) -> type[Int]:
-        return cast(type[Int], self._make_type(name, (Int,), size, alignment=alignment, attrs={"signed": signed}))
+        return cast("type[Int]", self._make_type(name, (Int,), size, alignment=alignment, attrs={"signed": signed}))
 
     def _make_packed_type(self, name: str, packchar: str, base: type, *, alignment: int | None = None) -> type[Packed]:
         return cast(
-            type[Packed],
+            "type[Packed]",
             self._make_type(
                 name,
                 (base, Packed),

dissect/cstruct/expression.py

@@ -141,7 +141,7 @@ class ExpressionTokenizer:
                 self.tokens.append(">>")
             elif self.match(expected="<", append=False) and self.match(expected="<", append=False):
                 self.tokens.append("<<")
-            elif self.match(expected={" ", "\t"}, append=False):
+            elif self.match(expected={" ", "\n", "\t"}, append=False):
                 continue
             else:
                 raise ExpressionTokenizerError(

dissect/cstruct/parser.py

@@ -63,7 +63,7 @@ class TokenParser(Parser):
             "ENUM",
         )
         TOK.add(r"(?<=})\s*(?P<defs>(?:[a-zA-Z0-9_]+\s*,\s*)+[a-zA-Z0-9_]+)\s*(?=;)", "DEFS")
-        TOK.add(r"(?P<name>\**?\s*[a-zA-Z0-9_]+)(?:\s*:\s*(?P<bits>\d+))?(?:\[(?P<count>[^;\n]*)\])?\s*(?=;)", "NAME")
+        TOK.add(r"(?P<name>\**?\s*[a-zA-Z0-9_]+)(?:\s*:\s*(?P<bits>\d+))?(?:\[(?P<count>[^;]*)\])?\s*(?=;)", "NAME")
         TOK.add(r"#include\s+(?P<name>[^\s]+)\s*", "INCLUDE")
         TOK.add(r"[a-zA-Z_][a-zA-Z0-9_]*", "IDENTIFIER")
         TOK.add(r"[{}]", "BLOCK")
@@ -194,7 +194,7 @@ class TokenParser(Parser):
         if tokens.next == self.TOK.NAME:
             # As part of a struct field
             # struct type_name field_name;
-            if not len(names):
+            if not names:
                 raise ParserError(f"line {self._lineno(tokens.next)}: unexpected anonymous struct")
             return self.cstruct.resolve(names[0])
 

dissect/cstruct/types/structure.py

@@ -139,7 +139,7 @@ class StructureMetaType(MetaType):
 
         if cls.__compiled__:
             # If the previous class was compiled try to compile this too
-            from dissect.cstruct import compiler
+            from dissect.cstruct import compiler  # noqa: PLC0415
 
             try:
                 classdict["_read"] = compiler.Compiler(cls.cs).compile_read(fields, cls.__name__, align=cls.__align__)

{dissect_cstruct-4.6.dev2.dist-info → dissect_cstruct-4.6.dev4.dist-info}/METADATA

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

@@ -1,10 +1,10 @@
 dissect/cstruct/__init__.py,sha256=mILXFvtajLG5EqAPSeCJ2g5klZSnRbu7uqyGcH_DF2k,1344
 dissect/cstruct/bitbuffer.py,sha256=bid_N4ZsaTeC3x5Fzs8viUrldT863dMPtEDih20Nt6k,2644
-dissect/cstruct/compiler.py,sha256=v1xc0E5PexaJqxyUo-tkafz2NT00hIWBLfy3iGmM7vs,14153
-dissect/cstruct/cstruct.py,sha256=ZVyCn23pHOvTJtPERRBSF3XBAfDKjpIf38ZYuL-nFko,19369
+dissect/cstruct/compiler.py,sha256=WqkO23EE_iOpVuV7FqCFPX0Q0Mcfk0oyPacV-aCGKpk,14153
+dissect/cstruct/cstruct.py,sha256=p765dkRS-i1idodHalZYEPuyrPV0JZjkP22_SvMzJjs,19440
 dissect/cstruct/exceptions.py,sha256=WqsUW4OiIpRLQLvixfLrfKl0rtvU1qx7pvfBrz9Sz-I,293
-dissect/cstruct/expression.py,sha256=8UZ6M1WaQlz1uAGq0px-ScowJ0OGiz75Wl9S0HF2BGQ,10804
-dissect/cstruct/parser.py,sha256=IK0JfmNFUkTTUCDMcLGiLBnKWp3aN2GcT9ydutlfWb4,21322
+dissect/cstruct/expression.py,sha256=KUoKxEG-KrlovIGbt_Uskjpcgafow8_sfPaBZXJo4y8,10810
+dissect/cstruct/parser.py,sha256=QcNrgZU5QhmLu936kZSAYwP2w1SfQYTIRy3NAc2cXf8,21315
 dissect/cstruct/utils.py,sha256=6cU1QHTZnHXQaPoxMH93ELkwIIUgYw-TtxieEcVvYvw,10537
 dissect/cstruct/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/cstruct/tools/stubgen.py,sha256=x-jlIet9mzONfl4sbaz6fTgEJ-FXg50HqdLhFKCEJAo,7661
@@ -17,13 +17,13 @@ dissect/cstruct/types/int.py,sha256=MGsdUxJt-lj3nl9wzAgGX8cb_vJOtGLiCHwYZs1j_IA,
 dissect/cstruct/types/leb128.py,sha256=kDmsWGXX6vr1bm4uJcilsrQ7JABdQRio16rBZV21pno,2243
 dissect/cstruct/types/packed.py,sha256=tpZpb8tiSMXr1np6p0-nZqT4sY7zieO-4E16lmMmqJA,2128
 dissect/cstruct/types/pointer.py,sha256=PqeJOoNBUfMd5uO2kpF6OHeW7Q6R1N1W1V4q1MakN4I,3912
-dissect/cstruct/types/structure.py,sha256=TX0bFQV4p2GIJnzdaMX9UHoOHMDWfv7ouRYv2TVzm68,31761
+dissect/cstruct/types/structure.py,sha256=jHiSKGJDms2qIe7-f9XEazKg6VQ9BLuwPElze3YZQBY,31778
 dissect/cstruct/types/void.py,sha256=Gvh0HqI6jQSj2uesdo3J8-G41brWCz8pmP16l8xTBxE,1074
 dissect/cstruct/types/wchar.py,sha256=N9Y_XX2_hZEe2DwepJjxsB6xuRJ6zINRalcUofR59kY,2608
-dissect_cstruct-4.6.dev2.dist-info/licenses/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
-dissect_cstruct-4.6.dev2.dist-info/licenses/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
-dissect_cstruct-4.6.dev2.dist-info/METADATA,sha256=7cX0YwMcW9gyTSHiER7wX12LEHGIRN_vsxLkWGs80SE,8738
-dissect_cstruct-4.6.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dissect_cstruct-4.6.dev2.dist-info/entry_points.txt,sha256=z53zqZqwD2OLrAkRwrP4wTeiU9CQe7xrMly0T2c0_wQ,71
-dissect_cstruct-4.6.dev2.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect_cstruct-4.6.dev2.dist-info/RECORD,,
+dissect_cstruct-4.6.dev4.dist-info/licenses/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
+dissect_cstruct-4.6.dev4.dist-info/licenses/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
+dissect_cstruct-4.6.dev4.dist-info/METADATA,sha256=Q21VyYDUj3OUK4492osFe0D80aPybEfGzBpQBhvvn7s,8738
+dissect_cstruct-4.6.dev4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dissect_cstruct-4.6.dev4.dist-info/entry_points.txt,sha256=z53zqZqwD2OLrAkRwrP4wTeiU9CQe7xrMly0T2c0_wQ,71
+dissect_cstruct-4.6.dev4.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect_cstruct-4.6.dev4.dist-info/RECORD,,