Apply comment log changes to all lines

Signed-off-by: Cervenka Dusan <[email protected]>

Author: Hadatko

dissect/cstruct/cstruct.py

@@ -88,6 +88,9 @@ def __repr__(self):
         return '<Structure {name} +compiled>'
 """
 
+COMMENT_REGEX_START =r'(\n?[ ]*\/\/[^\n]*\n)*[ ]*(?P<commentBlock>/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)?[ \t\r\n]*'
+COMMENT_REGEX_END =r'[ ]*(?P<commentBlockAfter>\/\*(\*(?!\/)|[^*])*\*\/)?(\n?[ ]*\/\/[^\n]*\n*)*'
+
 
 class Error(Exception):
     pass
@@ -333,7 +336,7 @@ def _constants(self, data):
 
     def _enums(self, data):
         r = re.finditer(
-            r'(?P<commentBlock>\/\*(\*(?!\/)|[^*])*\*\/)?[ \t\r\n]*enum\s+(?P<name>[^\s:{]+)\s*(:\s*(?P<type>[^\s]+)\s*)?\{(?P<values>[^}]+)\}\s*;',
+            COMMENT_REGEX_START+r'enum\s+(?P<name>[^\s:{]+)\s*(:\s*(?P<type>[^\s]+)\s*)?\{(?P<values>[^}]+)\}\s*;'+COMMENT_REGEX_END,
             data,
         )
         for t in r:
@@ -356,7 +359,7 @@ def _parse_fields_enums(self, s):
         values = {}
         valuesDetails = {}
         fields = re.finditer(
-            r'(\n?[ ]*\/\/[^\n]*\n)*[ ]*(?P<commentBlock>\/\/[^\n]*$|\/(?!\\)\*[\s\S]*?\*(?!\\)\/)?[ \t\r\n]*(?P<value>[ ]*[a-zA-z][^\n,\/]*),?[ ]*(?P<commentBlockAfter>\/\*(\*(?!\/)|[^*])*\*\/)?(\n?[ ]*\/\/[^\n]*\n*)*',
+            COMMENT_REGEX_START+r'(?P<value>[a-zA-z][^\n,/]*),?'+COMMENT_REGEX_END,
             s,
         )
 
@@ -383,7 +386,7 @@ def _parse_fields_enums(self, s):
     def _structs(self, data):
         compiler = Compiler(self.cstruct)
         r = re.finditer(
-            r'(?P<commentBlock>\/\*(\*(?!\/)|[^*])*\*\/)?[ \t\r\n]*(#(?P<flags>(?:compile))\s+)?((?P<typedef>typedef)\s+)?(?P<type>[^\s]+)\s+(__attribute__\(\([^)]+\)\)\s*)?(?P<name>[^\s]+)?(?P<fields>\s*\{(\s*//[^\n]*|/\*[^*]*\*/|[^}])+\}(?P<defs>\s+[^;\n]+)?)?\s*;',
+            COMMENT_REGEX_START+r'(#(?P<flags>(?:compile))\s+)?((?P<typedef>typedef)\s+)?(?P<type>[^\s]+)\s+(__attribute__\(\([^)]+\)\)\s*)?(?P<name>[^\s]+)?(?P<fields>\s*\{(\s*//[^\n]*|/\*[^*]*\*/|[^}])+\}(?P<defs>\s+[^;\n]+)?)?\s*;'+COMMENT_REGEX_END,
             data,
         )
         for t in r:
@@ -417,7 +420,7 @@ def _structs(self, data):
 
     def _parse_fields_struct(self, s):
         fields = re.finditer(
-            r'(\n?[ ]*\/\/[^\n]*\n)*[ ]*(?P<commentBlock>\/\*(\*(?!\/)|[^*])*\*\/)?[ \t\r\n]*(?P<type>[^\s]+)\s+(?P<name>[^\s\[:]+)(\s*:\s*(?P<bits>\d+))?(\[(?P<count>[^;\n]*)\])?;[ ]*(?P<commentBlockAfter>\/\*(\*(?!\/)|[^*])*\*\/)?(\n?[ ]*\/\/[^\n]*\n*)*',
+            COMMENT_REGEX_START+r'(?P<type>[^\s]+)\s+(?P<name>[^\s\[:]+)(\s*:\s*(?P<bits>\d+))?(\[(?P<count>[^;\n]*)\])?;'+COMMENT_REGEX_END,
             s,
         )
         r = []