dissect.cstruct 3.14.dev7__tar.gz → 3.14.dev8__tar.gz

{dissect_cstruct-3.14.dev7/dissect.cstruct.egg-info → dissect_cstruct-3.14.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 3.14.dev7
+Version: 3.14.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: Apache License 2.0

{dissect_cstruct-3.14.dev7 → dissect_cstruct-3.14.dev8}/dissect/cstruct/expression.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import string
-from typing import TYPE_CHECKING, Callable, Optional, Union
+from typing import TYPE_CHECKING, Callable, Optional
 
 from dissect.cstruct.exceptions import ExpressionParserError, ExpressionTokenizerError
 
@@ -18,7 +18,7 @@ class ExpressionTokenizer:
         self.pos = 0
         self.tokens = []
 
-    def equal(self, token: str, expected: Union[str, str[str]]) -> bool:
+    def equal(self, token: str, expected: str | set[str]) -> bool:
         if isinstance(expected, set):
             return token in expected
         else:
@@ -42,7 +42,7 @@ class ExpressionTokenizer:
     def match(
         self,
         func: Optional[Callable[[str], bool]] = None,
-        expected: Optional[str] = None,
+        expected: Optional[str | set[str]] = None,
         consume: bool = True,
         append: bool = True,
     ) -> bool:
@@ -142,7 +142,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=" ", append=False):
+            elif self.match(expected={" ", "\t"}, append=False):
                 continue
             else:
                 raise ExpressionTokenizerError(

{dissect_cstruct-3.14.dev7 → dissect_cstruct-3.14.dev8/dissect.cstruct.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 3.14.dev7
+Version: 3.14.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: Apache License 2.0

{dissect_cstruct-3.14.dev7 → dissect_cstruct-3.14.dev8}/tests/test_expression.py

@@ -11,6 +11,7 @@ testdata = [
     ("7*8", 56),
     ("7 *8", 56),
     ("   7  *     8  ", 56),
+    ("\t7\t*\t8\t", 56),
     ("0 / 1", 0),
     ("1 / 1", 1),
     ("2 / 2", 1),