dissect.cstruct 3.14.dev2__py3-none-any.whl → 3.14.dev3__py3-none-any.whl

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.dev2.dist-info → dissect.cstruct-3.14.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 3.14.dev2
+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.dev2.dist-info → dissect.cstruct-3.14.dev3.dist-info}/RECORD

@@ -4,7 +4,7 @@ dissect/cstruct/compiler.py,sha256=htgYvaAQiH_e9XFdAH4M1nMzwwfizycorathMz6p5Z4,1
 dissect/cstruct/cstruct.py,sha256=koqYcltVplqz7sEi6DrOXwm1bBiYDqoORyCsQ9x0smk,9728
 dissect/cstruct/exceptions.py,sha256=WqsUW4OiIpRLQLvixfLrfKl0rtvU1qx7pvfBrz9Sz-I,293
 dissect/cstruct/expression.py,sha256=Thd_TuEOz_46LLRVIZI4ePcSnXYJp1PUeuIKx7AJ8h0,10659
-dissect/cstruct/parser.py,sha256=Zc-y5NkfOi4By6wAZKffpcyfqFtYHrSyHs8veMMuaBQ,19489
+dissect/cstruct/parser.py,sha256=Mt4PLT5MGtEq__UyRK9HLL2Z0kxi7q16cw4dZayrdos,20028
 dissect/cstruct/utils.py,sha256=z5cGtQ5IRMf9KfI67vFx-ZiFDoU6JFmRNn-7avgHkCA,9752
 dissect/cstruct/types/__init__.py,sha256=b6DoyHXJ38yNa2Ku7tYI3kpIsC-SB7wCXBBdx0Yp1IU,948
 dissect/cstruct/types/base.py,sha256=UPG1Djfo3IPM11Zy87yI2XNS_rT82xbpofSuD9wvZmk,6377
@@ -18,9 +18,9 @@ dissect/cstruct/types/pointer.py,sha256=ghfZ9y638KCzem0rXgYeeTPXbYhacHfWx8uD003G
 dissect/cstruct/types/structure.py,sha256=epjVmMUCxoMNCi5xMoMIyw9Ujp_g2cSEPcZl7eJN0bE,13442
 dissect/cstruct/types/voidtype.py,sha256=JaKEIjOsGTARn8g30vv7WCH_OAdEkKt4Mw6Oneo_3Mw,301
 dissect/cstruct/types/wchartype.py,sha256=pVp_xlu4xHdxzQG6FB30IxNSwnKRC183jleeUG4nzQ4,1693
-dissect.cstruct-3.14.dev2.dist-info/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
-dissect.cstruct-3.14.dev2.dist-info/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
-dissect.cstruct-3.14.dev2.dist-info/METADATA,sha256=KGpVIvqtLpwzTBgdUYqag78cI8ufFv_4pUMW1NoHYq8,8303
-dissect.cstruct-3.14.dev2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dissect.cstruct-3.14.dev2.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.cstruct-3.14.dev2.dist-info/RECORD,,
+dissect.cstruct-3.14.dev3.dist-info/COPYRIGHT,sha256=H-18RXfshdH9AdHwW2eO1Xa-5s6tY5eipHh5c0whDu4,316
+dissect.cstruct-3.14.dev3.dist-info/LICENSE,sha256=PhUqiw6jAh2KbBdVRPBq_hfAvfcTBin7nZ3CK7NQbTM,11341
+dissect.cstruct-3.14.dev3.dist-info/METADATA,sha256=ndcjqZiVqb63BCmy55Uw4T32El_XdVDmEWNrL3oYqds,8303
+dissect.cstruct-3.14.dev3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dissect.cstruct-3.14.dev3.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect.cstruct-3.14.dev3.dist-info/RECORD,,