dissect.cstruct 3.10.dev3__tar.gz → 3.11__tar.gz

{dissect.cstruct-3.10.dev3/dissect.cstruct.egg-info → dissect.cstruct-3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 3.10.dev3
+Version: 3.11
 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.10.dev3 → dissect.cstruct-3.11}/dissect/cstruct/cstruct.py

@@ -139,6 +139,10 @@ class cstruct:
             "u4": "uint32",
             "u8": "uint64",
             "u16": "uint128",
+            "__u8": "uint8",
+            "__u16": "uint16",
+            "__u32": "uint32",
+            "__u64": "uint64",
             "uchar": "uint8",
             "ushort": "unsigned short",
             "uint": "unsigned int",
@@ -184,7 +188,7 @@ class cstruct:
 
         self.typedefs[name] = type_
 
-    def load(self, definition: str, deftype: int = None, **kwargs) -> None:
+    def load(self, definition: str, deftype: int = None, **kwargs) -> "cstruct":
         """Parse structures from the given definitions using the given definition type.
 
         Definitions can be parsed using different parsers. Currently, there's
@@ -208,6 +212,8 @@ class cstruct:
         elif deftype == cstruct.DEF_LEGACY:
             CStyleParser(self, **kwargs).parse(definition)
 
+        return self
+
     def loadfile(self, path: str, deftype: int = None, **kwargs) -> None:
         """Load structure definitions from a file.
 

{dissect.cstruct-3.10.dev3 → dissect.cstruct-3.11}/dissect/cstruct/utils.py

@@ -135,7 +135,10 @@ def _dumpstruct(
     ci = 0
     out = [f"struct {structure.name}:"]
     foreground, background = None, None
-    for field in instance._type.fields:
+    for field in instance._type.lookup.values():
+        if getattr(field.type, "anonymous", False):
+            continue
+
         if color:
             foreground, background = colors[ci % len(colors)]
             palette.append((instance._size(field.name), background))

{dissect.cstruct-3.10.dev3 → dissect.cstruct-3.11/dissect.cstruct.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 3.10.dev3
+Version: 3.11
 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.10.dev3 → dissect.cstruct-3.11}/pyproject.toml

@@ -46,4 +46,3 @@ license-files = ["LICENSE", "COPYRIGHT"]
 include = ["dissect.*"]
 
 [tool.setuptools_scm]
-local_scheme = "no-local-version"

{dissect.cstruct-3.10.dev3 → dissect.cstruct-3.11}/tests/test_util.py

@@ -28,6 +28,42 @@ def test_dumpstruct(capsys, compiled):
         uint32 testval;
     };
     """
+
+    cs = cstruct.cstruct()
+    cs.load(cdef, compiled=compiled)
+
+    assert verify_compiled(cs.test, compiled)
+
+    buf = b"\x39\x05\x00\x00"
+    obj = cs.test(buf)
+
+    dumpstruct(cs.test, buf)
+    captured_1 = capsys.readouterr()
+
+    dumpstruct(obj)
+    captured_2 = capsys.readouterr()
+
+    assert captured_1.out == captured_2.out
+
+    out_1 = dumpstruct(cs.test, buf, output="string")
+    out_2 = dumpstruct(obj, output="string")
+
+    assert out_1 == out_2
+
+    with pytest.raises(ValueError) as excinfo:
+        dumpstruct(obj, output="generator")
+    assert str(excinfo.value) == "Invalid output argument: 'generator' (should be 'print' or 'string')."
+
+
+def test_dumpstruct_anonymous(capsys, compiled):
+    cdef = """
+    struct test {
+        struct {
+            uint32 testval;
+        };
+    };
+    """
+
     cs = cstruct.cstruct()
     cs.load(cdef, compiled=compiled)