Ignore most of unwanted comments.

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

Author: Hadatko

dissect/cstruct/cstruct.py

@@ -88,9 +88,14 @@ 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*)*'
+COMMENT_MULTILINE = r'/\*[^*]*\*+(?:[^/*][^*]*\*+)*/'
+COMMENT_INLINE = r'//[^\n]*'
+COMMENT_MULTILINE_REPEATED = r'(^[ ]*('+COMMENT_INLINE+r'|'+COMMENT_MULTILINE+r'([ ]*('+COMMENT_INLINE+r'|'+COMMENT_MULTILINE+r'))*)[ \t\r]*\n?)*^[ ]*('+COMMENT_INLINE+r'|(?P<commentBlock>'+COMMENT_MULTILINE+r'))+'
+COMMENT_REGEX_START=r'('+COMMENT_MULTILINE_REPEATED+r')?[ \t\r\n]*'
+COMMENT_REGEX_END =r'(?P<commentBlockAfter>(([ ]*'+COMMENT_MULTILINE+r')+)?[ ]*('+COMMENT_INLINE+r')?)?[ \t\r]*'
 
+#print(f"COMMENT_REGEX_START:{COMMENT_REGEX_START}")
+#print(f"COMMENT_REGEX_END:{COMMENT_REGEX_END}")
 
 class Error(Exception):
     pass
@@ -337,7 +342,7 @@ def _constants(self, data):
     def _enums(self, data):
         r = re.finditer(
             COMMENT_REGEX_START+r'enum\s+(?P<name>[^\s:{]+)\s*(:\s*(?P<type>[^\s]+)\s*)?\{(?P<values>[^}]+)\}\s*;'+COMMENT_REGEX_END,
-            data,
+            data, re.MULTILINE
         )
         for t in r:
             d = t.groupdict()
@@ -360,7 +365,7 @@ def _parse_fields_enums(self, s):
         valuesDetails = {}
         fields = re.finditer(
             COMMENT_REGEX_START+r'(?P<value>[a-zA-z][^\n,/]*),?'+COMMENT_REGEX_END,
-            s,
+            s, re.MULTILINE
         )
 
         for f in fields:
@@ -387,7 +392,7 @@ def _structs(self, data):
         compiler = Compiler(self.cstruct)
         r = re.finditer(
             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,
+            data, re.MULTILINE
         )
         for t in r:
             d = t.groupdict()
@@ -421,7 +426,7 @@ def _structs(self, data):
     def _parse_fields_struct(self, s):
         fields = re.finditer(
             COMMENT_REGEX_START+r'(?P<type>[^\s]+)\s+(?P<name>[^\s\[:]+)(\s*:\s*(?P<bits>\d+))?(\[(?P<count>[^;\n]*)\])?;'+COMMENT_REGEX_END,
-            s,
+            s, re.MULTILINE
         )
         r = []
         for f in fields:

tests/test_basic.py

@@ -798,13 +798,13 @@ def test_comment_field_parse_struct(capsys):
          */
         int testVar1;
         // int testVar1;
+        // int notAnStruct;
         int testVar2;
         /* dicardedCom2
         * @scale: 5
         * @unit: %testUnit2
         */
         int testVar3;
-        // int notAnStruct;
     };
     """, compiled=False)
 
@@ -838,11 +838,11 @@ def test_comment_field_parse_enum(capsys):
         testEnumVar1=5,
         // testEnumVar1,
         testEnumVar2,
+        // notAnEnum=14,
         /*
         * @comment: Comments are working 2
         */
         testEnumVar3,
-        // notAnEnum=14,
     };
     """, compiled=False)