dissect.cstruct 4.0.dev6__tar.gz → 4.1.dev1__tar.gz

{dissect_cstruct-4.0.dev6/dissect.cstruct.egg-info → dissect_cstruct-4.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 4.0.dev6
+Version: 4.1.dev1
 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.dev6 → dissect_cstruct-4.1.dev1}/dissect/cstruct/parser.py

@@ -251,8 +251,10 @@ class TokenParser(Parser):
             type_ = self.cstruct.resolve(self._identifier(tokens))
         elif tokens.next == self.TOK.STRUCT:
             type_ = self._struct(tokens)
+
             if tokens.next != self.TOK.NAME:
-                return Field(type_.__name__, type_)
+                type_, name, bits = self._parse_field_type(type_, type_.__name__)
+                return Field(name.strip(), type_, bits)
 
         if tokens.next != self.TOK.NAME:
             raise ParserError(f"line {self._lineno(tokens.next)}: expected name")

{dissect_cstruct-4.0.dev6 → dissect_cstruct-4.1.dev1}/dissect/cstruct/types/structure.py

@@ -111,6 +111,8 @@ class StructureMetaType(MetaType):
             classdict["__init__"] = _patch_args_and_attributes(_make__init__(len(init_names)), init_names)
             classdict["__eq__"] = _patch_attributes(_make__eq__(num_fields), field_names, 1)
 
+        classdict["__hash__"] = _patch_attributes(_make__hash__(num_fields), field_names, 1)
+
         # If we're calling this as a class method or a function on the metaclass
         if issubclass(cls, type):
             size, alignment = cls._calculate_size_and_offsets(cls, fields, align)
@@ -676,3 +678,15 @@ def _make__bool__(fields: list[str]) -> str:
     """
 
     return dedent(code)
+
+
+@_codegen
+def _make__hash__(fields: list[str]) -> str:
+    vals = ", ".join(f"self.{name}" for name in fields)
+
+    code = f"""
+    def __hash__(self):
+        return hash(({vals}))
+    """
+
+    return dedent(code)

{dissect_cstruct-4.0.dev6 → dissect_cstruct-4.1.dev1/dissect.cstruct.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 4.0.dev6
+Version: 4.1.dev1
 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.dev6 → dissect_cstruct-4.1.dev1}/tests/test_parser.py

@@ -8,6 +8,22 @@ from dissect.cstruct.parser import TokenParser
 from dissect.cstruct.types import ArrayMetaType, Pointer
 
 
+def test_nested_structs(cs: cstruct, compiled: bool) -> None:
+    cdef = """
+    struct nest {
+        struct {
+            uint32 b;
+        } a[4];
+    };
+    """
+
+    cs.load(cdef, compiled=compiled)
+    data = b"\x00\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x03\x00\x00\x00"
+    obj = cs.nest(data)
+    for i in range(0, 4):
+        assert obj.a[i].b == i
+
+
 def test_preserve_comment_newlines() -> None:
     cdef = """
     // normal comment

{dissect_cstruct-4.0.dev6 → dissect_cstruct-4.1.dev1}/tests/test_types_structure.py

@@ -46,6 +46,9 @@ def test_structure(TestStruct: type[Structure]) -> None:
     assert obj.b is None
     assert len(obj) == 8
 
+    # Test hashing of values
+    assert hash((obj.a, obj.b)) == hash(obj)
+
 
 def test_structure_read(TestStruct: type[Structure]) -> None:
     obj = TestStruct(b"\x01\x00\x00\x00\x02\x00\x00\x00")

{dissect_cstruct-4.0.dev6 → dissect_cstruct-4.1.dev1}/tests/test_types_union.py

@@ -41,6 +41,8 @@ def test_union(TestUnion: type[Union]) -> None:
     assert obj.b is None
     assert len(obj) == 4
 
+    assert hash((obj.a, obj.b)) == hash(obj)
+
 
 def test_union_read(TestUnion: type[Union]) -> None:
     obj = TestUnion(b"\x01\x00\x00\x00")
@@ -288,7 +290,7 @@ def test_union_update(cs: cstruct) -> None:
     assert obj.a == 2
     obj.b = 0xFFFF
     assert obj.a == 0xFF
-    assert obj.dumps() == b"\xFF\xFF"
+    assert obj.dumps() == b"\xff\xff"
 
 
 def test_union_nested_update(cs: cstruct) -> None: