dissect.cstruct 3.14.dev1__tar.gz → 3.14.dev3__tar.gz

{dissect.cstruct-3.14.dev1/dissect.cstruct.egg-info → dissect.cstruct-3.14.dev3}/PKG-INFO

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

@@ -2,12 +2,21 @@ from __future__ import annotations
 
 import ast
 import re
-from typing import TYPE_CHECKING, Dict, List
+from typing import TYPE_CHECKING, Dict, List, Optional
 
 from dissect.cstruct.compiler import Compiler
 from dissect.cstruct.exceptions import ParserError
 from dissect.cstruct.expression import Expression
-from dissect.cstruct.types import Array, Enum, Field, Flag, Pointer, Structure, Union
+from dissect.cstruct.types import (
+    Array,
+    BaseType,
+    Enum,
+    Field,
+    Flag,
+    Pointer,
+    Structure,
+    Union,
+)
 
 if TYPE_CHECKING:
     from dissect.cstruct import cstruct
@@ -158,6 +167,9 @@ class TokenParser(Parser):
 
         names = self._names(tokens)
         for name in names:
+            type_, name, bits = self._parse_field_type(type_, name)
+            if bits is not None:
+                raise ParserError(f"line {self._lineno(tokens.previous)}: typedefs cannot have bitfields")
             self.cstruct.addtype(name, type_)
 
     def _struct(self, tokens: TokenConsumer, register: bool = False) -> None:
@@ -236,9 +248,15 @@ class TokenParser(Parser):
             raise ParserError(f"line {self._lineno(tokens.next)}: expected name")
         nametok = tokens.consume()
 
+        type_, name, bits = self._parse_field_type(type_, nametok.value)
+
+        tokens.eol()
+        return Field(name.strip(), type_, bits)
+
+    def _parse_field_type(self, type_: BaseType, name: str) -> tuple[BaseType, str, Optional[int]]:
         pattern = self.TOK.patterns[self.TOK.NAME]
         # Dirty trick because the regex expects a ; but we don't want it to be part of the value
-        d = pattern.match(nametok.value + ";").groupdict()
+        d = pattern.match(name + ";").groupdict()
 
         name = d["name"]
         count_expression = d["count"]
@@ -269,8 +287,7 @@ class TokenParser(Parser):
 
                 type_ = Array(self.cstruct, type_, count)
 
-        tokens.eol()
-        return Field(name, type_, int(d["bits"]) if d["bits"] else None)
+        return type_, name, int(d["bits"]) if d["bits"] else None
 
     def _names(self, tokens: TokenConsumer) -> List[str]:
         names = []
@@ -564,6 +581,7 @@ class TokenConsumer:
     def __init__(self, tokens: List[Token]):
         self.tokens = tokens
         self.flags = []
+        self.previous = None
 
     def __contains__(self, token) -> bool:
         return token in self.tokens
@@ -582,7 +600,8 @@ class TokenConsumer:
             return None
 
     def consume(self) -> Token:
-        return self.tokens.pop(0)
+        self.previous = self.tokens.pop(0)
+        return self.previous
 
     def reset_flags(self) -> None:
         self.flags = []

{dissect.cstruct-3.14.dev1 → dissect.cstruct-3.14.dev3/dissect.cstruct.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 3.14.dev1
+Version: 3.14.dev3
 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.dev1 → dissect.cstruct-3.14.dev3}/tests/test_basic.py

@@ -4,6 +4,7 @@ import pytest
 from dissect import cstruct
 
 from dissect.cstruct.exceptions import ArraySizeError, ParserError, ResolveError
+from dissect.cstruct.types import Array, Pointer
 
 from .utils import verify_compiled
 
@@ -571,3 +572,31 @@ def test_reserved_keyword(compiled: bool):
         assert verify_compiled(cs.resolve(name), compiled)
 
         assert cs.resolve(name)(b"\x01").a == 1
+
+
+def test_typedef_types():
+    cdef = """
+    typedef char uuid_t[16];
+    typedef uint32 *ptr;
+
+    struct test {
+        uuid_t uuid;
+        ptr ptr;
+    };
+    """
+    cs = cstruct.cstruct(pointer="uint8")
+    cs.load(cdef)
+
+    assert isinstance(cs.uuid_t, Array)
+    assert cs.uuid_t(b"\x01" * 16) == b"\x01" * 16
+
+    assert isinstance(cs.ptr, Pointer)
+    assert cs.ptr(b"\x01AAAA") == 1
+    assert cs.ptr(b"\x01AAAA").dereference() == 0x41414141
+
+    obj = cs.test(b"\x01" * 16 + b"\x11AAAA")
+    assert obj.uuid == b"\x01" * 16
+    assert obj.ptr.dereference() == 0x41414141
+
+    with pytest.raises(ParserError, match="line 1: typedefs cannot have bitfields"):
+        cs.load("""typedef uint8 with_bits : 4;""")

{dissect.cstruct-3.14.dev1 → dissect.cstruct-3.14.dev3}/tox.ini

@@ -4,7 +4,7 @@ envlist = lint, py3, pypy3
 # requires if they are not available on the host system. This requires the
 # locally installed tox to have a minimum version 3.3.0. This means the names
 # of the configuration options are still according to the tox 3.x syntax.
-minversion = 4.2.4
+minversion = 4.4.3
 # This version of virtualenv will install setuptools version 65.5.0 and pip
 # 22.3. These versions fully support python projects defined only through a
 # pyproject.toml file (PEP-517/PEP-518/PEP-621)