Added commentAttributes to structure

Signed-off-by: Cervenka Dusan <cervenka@acrios.com>

Author: Hadatko

dissect/cstruct/cstruct.py

@@ -70,7 +70,7 @@ class {name}(Structure):
     def __init__(self, cstruct, structure, source=None):
         self.structure = structure
         self.source = source
-        super({name}, self).__init__(cstruct, structure.name, structure.fields)
+        super({name}, self).__init__(cstruct, structure.name, structure.fields, structure.commentAttributes)
 
     def _read(self, stream):
         r = OrderedDict()
@@ -353,7 +353,7 @@ def _parse_fields_enums(self, s):
         nextval = 0
         values = {}
         fields = re.finditer(
-            r'(?P<commentBlock>\/\*(\*(?!\/)|[^*])*\*\/)?\n[ \t\r\n]*(?P<value>[^\n,]+),',
+            r'(?P<commentBlock>\/\*(\*(?!\/)|[^*])*\*\/)?[ \t\r\n]*(?P<value>[^\n,]+),',
             s,
         )
 
@@ -363,8 +363,6 @@ def _parse_fields_enums(self, s):
             # Ignore fo now
             # commentAttributes = self.parse_comment_block(d['commentBlock'])
 
-            print(d["value"])
-
             field = re.finditer(
                 r'(?P<key>[a-zA-z][^ ]*)[ ]*=?[ ]*(?P<value>[^ ]+)?',
                 d["value"],
@@ -381,7 +379,7 @@ def _parse_fields_enums(self, s):
     def _structs(self, data):
         compiler = Compiler(self.cstruct)
         r = re.finditer(
-            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*;',
+            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*;',
             data,
         )
         for t in r:
@@ -396,7 +394,8 @@ def _structs(self, data):
 
             if d['type'] == 'struct':
                 data = self._parse_fields_struct(d['fields'][1:-1].strip())
-                st = Structure(self.cstruct, name, data)
+                commentAttributes = self.parse_comment_block(d['commentBlock'])
+                st = Structure(self.cstruct, name, data, commentAttributes)
                 if d['flags'] == 'compile' or self.compiled:
                     st = compiler.compile(st)
             elif d['typedef'] == 'typedef':
@@ -774,11 +773,12 @@ def __repr__(self):
 class Structure(BaseType):
     """Type class for structures."""
 
-    def __init__(self, cstruct, name, fields=None):
+    def __init__(self, cstruct, name, fields=None, commentAttributes={}):
         self.name = name
         self.size = None
         self.lookup = OrderedDict()
         self.fields = fields if fields else []
+        self.commentAttributes = commentAttributes
 
 
         for f in self.fields:
@@ -932,7 +932,7 @@ def __repr__(self):
     def show(self, indent=0):
         """Pretty print this structure."""
         if indent == 0:
-            print("struct {}".format(self.name))
+            print("{} struct {}".format(self.commentAttributes, self.name))
 
         for field in self.fields:
             if field.offset is None:
@@ -1382,6 +1382,9 @@ def __getattr__(self, attr):
     def __contains__(self, attr):
         return attr in self.values
 
+    def __repr__(self):
+        return '<Enum {}>'.format(self.name)
+
 
 class EnumInstance(object):
     """Implements a value instance of an Enum"""