refactor: optimize template rendering logic

Author: wu-vincent

src/dwarf2cpp/models.py

@@ -229,6 +229,7 @@ def to_declaration(self) -> "TemplateParameter":
             case TemplateParameterKind.PACK:
                 return TemplateParameter(
                     TemplateParameterKind.PACK,
+                    type=self.type,
                     parameters=[p.to_declaration() for p in self.parameters],
                     name=self.name,
                 )
@@ -255,7 +256,5 @@ def merge(self, other: "Template") -> bool:
             if p1.name != p2.name or p1.kind != p2.kind:
                 return False
 
-        for p1, p2 in zip(self.parameters, other.parameters):
-            raise NotImplementedError
-
+        # TODO: merge parameters
         return True

src/dwarf2cpp/templates/template.jinja

@@ -1,20 +1,21 @@
-{{- "// " if not obj.declaration -}}
 template<
 {%- for parameter in obj.parameters -%}
   {%- if parameter.kind == "type" -%}
     typename{{ " " ~ parameter.name if parameter.name }}{{ " = {}".format(parameter.default) if parameter.default is not none }}
   {%- elif parameter.kind == "constant" -%}
     {{ parameter.type }}{{ " " ~ parameter.name if parameter.name }}{{ " = {}".format(parameter.default) if parameter.default is not none }}
   {%- elif parameter.kind == "pack" -%}
-    typename...{{ " " ~ parameter.name if parameter.name }}
+    {{ parameter.type or "typename" }}...{{ " " ~ parameter.name if parameter.name }}
   {%- elif parameter.kind == "template" -%}
-    template<typename> class{{ " " ~ parameter.name if parameter.name }}
+    {%- with obj = parameter -%}
+    {%- include "template.jinja" with context %} class{{ " " ~ parameter.name if parameter.name }}{{ " = {}".format(parameter.default) if parameter.default is not none }}
+    {%- endwith -%}
   {%- endif -%}
   {%- if not loop.last -%}, {% endif -%}
 {%- endfor -%}
 >
-{% if obj.declaration -%}
-{%- with obj = obj.declaration -%}
+{%- if obj.declaration %}
+{% with obj = obj.declaration -%}
   {%- include "{}.jinja".format(obj.kind) with context -%}
 {%- endwith -%}
 {%- endif -%}

src/dwarf2cpp/visitor.py

@@ -706,7 +706,6 @@ def visit_GNU_template_template_param(self, die: DWARFDie) -> None:
             raise ValueError(f"Unhandled child tag {child.tag}")
 
         self._cache[die.offset] = param
-        print(param)
 
     def generic_visit(self, die: DWARFDie) -> None:
         for child in die.children: