Merge branch 'support_parenthesis_in_comments' into devel

Hadatko · Hadatko · commit aa24d67a709b · 2019-12-20T09:23:28.000+01:00
diff --git a/dissect/cstruct/cstruct.py b/dissect/cstruct/cstruct.py
@@ -368,7 +368,7 @@ def _enums(self, data):
     def _structs(self, data):
         compiler = Compiler(self.cstruct)
         r = re.finditer(
-            r'(#(?P<flags>(?:compile))\s+)?((?P<typedef>typedef)\s+)?(?P<type>[^\s]+)\s+(?P<name>[^\s]+)?(?P<fields>\s*\{[^}]+\}(?P<defs>\s+[^;\n]+)?)?\s*;',
+            r'(#(?P<flags>(?:compile))\s+)?((?P<typedef>typedef)\s+)?(?P<type>[^\s]+)\s+(?P<name>[^\s]+)?(?P<fields>\s*\{(\s*//[^\n]*|/\*[^*]*\*/|[^}])+\}(?P<defs>\s+[^;\n]+)?)?\s*;',
             data,
         )
         for t in r:

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ def _enums(self, data):`
`368`	`368`	`def _structs(self, data):`
`369`	`369`	`compiler = Compiler(self.cstruct)`
`370`	`370`	`r = re.finditer(`
`371`		`- r'(#(?P<flags>(?:compile))\s+)?((?P<typedef>typedef)\s+)?(?P<type>[^\s]+)\s+(?P<name>[^\s]+)?(?P<fields>\s\{[^}]+\}(?P<defs>\s+[^;\n]+)?)?\s;',`
	`371`	`+ r'(#(?P<flags>(?:compile))\s+)?((?P<typedef>typedef)\s+)?(?P<type>[^\s]+)\s+(?P<name>[^\s]+)?(?P<fields>\s\{(\s//[^\n]\|/\[^]\/\|[^}])+\}(?P<defs>\s+[^;\n]+)?)?\s;',`
`372`	`372`	`data,`
`373`	`373`	`)`
`374`	`374`	`for t in r:`