Merge pull request #5 from ACRIOS-Systems/feature/simple_macro_support

Added support for simple macros

Author: Hadatko

dissect/cstruct/cstruct.py

@@ -324,7 +324,7 @@ def parse(self, data):
         self._constants(data)
         self._enums(data)
         self._structs(data)
-        self._lookups(data, self.cstruct.consts)
+        self._lookups(data)
 
     def _constants(self, data):
         r = re.finditer(r'#define\s+(?P<name>[^\s]+)\s+(?P<value>[^\r\n]+)\s*\n', data)
@@ -375,7 +375,7 @@ def _parse_fields_enums(self, s):
             commentAttributes = self.parse_comment_block(d['commentBlock'])
 
             field = re.finditer(
-                r'(?P<key>[a-zA-z][^ =]*)[ ]*=?[ ]*(?P<value>[^ ]+)?',
+                r'(?P<key>[a-zA-z][^ =]*)[ ]*=?[ ]*(?P<value>[^,/]+)?',
                 d["value"],
             )
 
@@ -484,7 +484,7 @@ def parse_comment_block(self,s):
 
         return commentAttributes
 
-    def _lookups(self, data, consts):
+    def _lookups(self, data):
         r = re.finditer(r'\$(?P<name>[^\s]+) = ({[^}]+})\w*\n', data)
 
         for t in r:
@@ -493,6 +493,15 @@ def _lookups(self, data, consts):
                 [(self.cstruct.consts[k], v) for k, v in d.items()]
             )
 
+        #support simple defines
+        r = re.finditer(r'^[ \t]*#define (?P<name>[^\s]+)[ \t]+(?P<value>\(?-?[0-9]+U?\)?)\n?', data)
+
+        for t in r:
+            d = ast.literal_eval(t.group(2))
+            self.cstruct.lookups[t.group(1)] = dict(
+                [(self.cstruct.consts[k], v) for k, v in d.items()]
+            )
+
 
 class Instance(object):
     """Holds parsed structure data."""

tests/test_basic.py

@@ -151,9 +151,11 @@ def test_bytes_integer_signed_be():
 
 def test_enum():
     d = """
+    #define MyEnumVal 4
+
     enum Test16 : uint16 {
         A = 0x1,
-        B = 0x2
+        B = 0x6 - MyEnumVal
     };
 
     enum Test24 : uint24 {