Small tweak in string define parsing

Author: Schamper

dissect/cstruct/parser.py

@@ -170,8 +170,8 @@ def _parse_define(self) -> None:
                 if value[-1] != quote:
                     raise self._error("unterminated string literal", token=token)
 
-                # Remove the surrounding and any duplicate quotes
-                value = "".join(ch for ch in value if ch != quote)
+                # Remove the surrounding quotes and flatten escape sequences
+                value = value[1:-1].encode().decode("unicode_escape")
             elif value[:2].lower() in ("b'", 'b"'):
                 quote = value[1]
                 if value[-1] != quote:

tests/test_parser.py

@@ -228,6 +228,8 @@ def test_define(cs: cstruct) -> None:
     #define MULTILINE (1 + \
                         2 + \
                         3)
+    #define QUOTES "\'\"a'b\""
+    #define ESCAPE "\\'\\"a'b\\"\\n"
     #define FUNC(x) ( x == 0 )
     #define TERNARY(x) ( x ? 1 : 0 )
     """
@@ -243,6 +245,8 @@ def test_define(cs: cstruct) -> None:
     assert cs.consts["NULLBYTES"] == b"ADCRYPT\00"
     assert cs.consts["ARBITRARYBYTES"] == b"\x00\x01\x02"
     assert cs.consts["MULTILINE"] == 6
+    assert cs.consts["QUOTES"] == "'\"a'b\""
+    assert cs.consts["ESCAPE"] == "'\"a'b\"\n"
     # We don't evaluate function-like macros yet, so they should be stored as their raw string representation
     assert cs.consts["FUNC"] == "(x) ( x == 0 )"
     assert cs.consts["TERNARY"] == "(x) ( x ? 1 : 0 )"