dissect.cstruct 4.0.dev0__tar.gz → 4.0.dev2__tar.gz

{dissect_cstruct-4.0.dev0/dissect.cstruct.egg-info → dissect_cstruct-4.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 4.0.dev0
+Version: 4.0.dev2
 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.dev0 → dissect_cstruct-4.0.dev2}/dissect/cstruct/expression.py

@@ -299,4 +299,7 @@ class Expression:
 
             self.evaluate_exp()
 
+        if len(self.queue) != 1:
+            raise ExpressionParserError("Invalid expression")
+
         return self.queue[0]

{dissect_cstruct-4.0.dev0 → dissect_cstruct-4.0.dev2}/dissect/cstruct/types/enum.py

@@ -11,6 +11,7 @@ if TYPE_CHECKING:
 
 
 PY_311 = sys.version_info >= (3, 11, 0)
+PY_312 = sys.version_info >= (3, 12, 0)
 
 
 class EnumMetaType(EnumMeta, MetaType):
@@ -56,6 +57,13 @@ class EnumMetaType(EnumMeta, MetaType):
 
     __len__ = MetaType.__len__
 
+    if not PY_312:
+        # Backport __contains__ from CPython 3.12
+        def __contains__(cls, value: Any) -> bool:
+            if isinstance(value, cls):
+                return True
+            return value in cls._value2member_map_
+
     def _read(cls, stream: BinaryIO, context: dict[str, Any] = None) -> Enum:
         return cls(cls.type._read(stream, context))
 
@@ -174,10 +182,7 @@ class Enum(BaseType, IntEnum, metaclass=EnumMetaType):
     @classmethod
     def _missing_(cls, value: int) -> Enum:
         # Emulate FlagBoundary.KEEP for enum (allow values other than the defined members)
-        pseudo_member = cls._value2member_map_.get(value, None)
-        if pseudo_member is None:
-            new_member = int.__new__(cls, value)
-            new_member._name_ = None
-            new_member._value_ = value
-            pseudo_member = cls._value2member_map_.setdefault(value, new_member)
-        return pseudo_member
+        new_member = int.__new__(cls, value)
+        new_member._name_ = None
+        new_member._value_ = value
+        return new_member

{dissect_cstruct-4.0.dev0 → dissect_cstruct-4.0.dev2/dissect.cstruct.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 4.0.dev0
+Version: 4.0.dev2
 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.dev0 → dissect_cstruct-4.0.dev2}/pyproject.toml

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

{dissect_cstruct-4.0.dev0 → dissect_cstruct-4.0.dev2}/tests/test_expression.py

@@ -94,6 +94,7 @@ def test_expression(expression: str, answer: int) -> None:
         ("-", ExpressionParserError, "Invalid expression: not enough operands"),
         ("(", ExpressionParserError, "Invalid expression"),
         (")", ExpressionParserError, "Invalid expression"),
+        (" ", ExpressionParserError, "Invalid expression"),
         ("()", ExpressionParserError, "Parser expected an expression, instead received empty parenthesis. Index: 1"),
         ("0()", ExpressionParserError, "Parser expected sizeof or an arethmethic operator instead got: '0'"),
         ("sizeof)", ExpressionParserError, "Invalid sizeof operation"),

{dissect_cstruct-4.0.dev0 → dissect_cstruct-4.0.dev2}/tests/test_types_enum.py

@@ -34,6 +34,18 @@ def test_enum(cs: cstruct, TestEnum: type[Enum]) -> None:
     assert TestEnum(0).name is None
     assert TestEnum(0).value == 0
 
+    assert 0 not in TestEnum
+    assert 1 in TestEnum
+    assert 2 in TestEnum
+    assert 3 in TestEnum
+    assert 4 not in TestEnum
+
+    assert TestEnum.A in TestEnum
+
+    # Mixing enums is not allowed
+    OtherEnum = cs._make_enum("Other", cs.uint8, {"A": 1, "B": 2, "C": 3})
+    assert OtherEnum.A not in TestEnum
+
 
 def test_enum_read(TestEnum: type[Enum]) -> None:
     assert TestEnum(b"\x02") == TestEnum.B