Process review feedback

Author: Schamper

dissect/cstruct/expression.py

@@ -58,6 +58,9 @@
 
 
 def precedence(o1: TokenType, o2: TokenType) -> bool:
+    # Unary (prefix) operators are right-associative, so use strict greater-than
+    if o2 in UNARY_OPERATORS:
+        return PRECEDENCE_LEVELS[o1] > PRECEDENCE_LEVELS[o2]
     return PRECEDENCE_LEVELS[o1] >= PRECEDENCE_LEVELS[o2]
 
 

dissect/cstruct/parser.py

@@ -211,7 +211,7 @@ def _parse_include(self) -> None:
 
     def _parse_config_flags(self) -> None:
         """Parse configuration flags from a directive like ``#[flag1, flag2, ...]``."""
-        self._flags.extend(self._expect(TokenType.PP_FLAGS).value.split(","))
+        self._flags.extend(flag.strip() for flag in self._expect(TokenType.PP_FLAGS).value.split(","))
 
     def _handle_conditional(self) -> None:
         """Handle conditional directives: ``#ifdef``, ``#ifndef``, ``#else``, ``#endif``."""

tests/test_expression.py

@@ -71,6 +71,7 @@ def cs_with_consts(cs: cstruct) -> cstruct:
     ("21 - B", 8),
     ("A + B", 21),
     ("~1", -2),
+    ("-~1", 2),
     ("~(A + 5)", ~13),
     ("10l", 10),
     ("10ll", 10),

tests/test_parser.py

@@ -5,6 +5,7 @@
 from dissect.cstruct import cstruct
 from dissect.cstruct.exceptions import ParserError, ResolveError
 from dissect.cstruct.lexer import tokenize
+from dissect.cstruct.parser import CStyleParser
 from dissect.cstruct.types import BaseArray, Pointer, Structure
 from tests.utils import verify_compiled
 
@@ -361,3 +362,14 @@ def test_multiple_declarators(cs: cstruct) -> None:
     assert cs.test.fields["c"].type == cs.uint32
     assert cs.test.fields["d"].type.__name__ == "__anonymous_0__"
     assert cs.test.fields["e"].type is cs.test.fields["d"].type
+
+
+def test_config_flags(cs: cstruct) -> None:
+    """Test that we parse configuration flag directives correctly."""
+    cdef = """
+    #[a, b, c]
+    """
+    parser = CStyleParser(cs)
+    parser.parse(cdef)
+
+    assert parser._flags == ["a", "b", "c"]