feat: add merge functionality

Author: wu-vincent

src/dwarf2cpp/models.py

@@ -13,6 +13,12 @@ class Object:
     is_implicit: bool = False
     access: AccessAttribute | None = None
 
+    def merge(self, other: "Object") -> bool:
+        if self != other:
+            return False
+
+        return True
+
 
 @dataclass
 class Namespace:
@@ -50,9 +56,29 @@ class Attribute(Object):
     default_value: int | float | None = None
     alignment: int | None = None
     bit_size: int | None = None
-    is_template: bool = False
     is_static: bool = False
 
+    def merge(self, other: "Object") -> bool:
+        if not isinstance(other, Attribute):
+            return False
+
+        if self.name != other.name or self.type != other.type:
+            return False
+
+        if self.default_value is None:
+            self.default_value = other.default_value
+
+        if self.alignment is None:
+            self.alignment = other.alignment
+
+        if self.bit_size is None:
+            self.bit_size = other.bit_size
+
+        if self.is_static is None:
+            self.is_static = other.is_static
+
+        return True
+
 
 class ParameterKind(enum.StrEnum):
     POSITIONAL = "positional"

src/dwarf2cpp/visitor.py

@@ -136,15 +136,19 @@ def files(self) -> Generator[tuple[str, dict[int, list[Object]]]]:
                 continue
 
             for line, objects in file.items():
-                # ensure the uniqueness of elements
-                if len(objects) > 1:
-                    seen = []
-                    for obj in objects:
-                        if obj not in seen:
-                            seen.append(obj)
-                    objects = seen
+                result = []
 
-                file[line] = objects
+                for item in objects:
+                    if not result:
+                        # First item, just add it
+                        result.append(item)
+                    elif not item in result:
+                        last = result[-1]
+                        if not last.merge(item):
+                            # merge() returned False, so append new item
+                            result.append(item)
+
+                file[line] = result
 
             yield rel_path, file
 
@@ -662,8 +666,7 @@ def _handle_attribute(self, die: DWARFDie) -> None:
                 "DW_TAG_template_value_parameter",
                 "DW_TAG_GNU_template_parameter_pack",
             }:
-                variable.is_template = True
-                variable.default_value = None
+                pass
             else:
                 raise ValueError(f"Unhandled child tag {child.tag}")