feat: add insert_name filter for improved type formatting

Author: wu-vincent

src/dwarf2cpp/cli.py

@@ -6,7 +6,7 @@
 from tqdm import tqdm
 
 from ._dwarf import DWARFContext
-from .filters import do_ns_actions, do_ns_chain
+from .filters import do_insert_name, do_ns_actions, do_ns_chain
 from .post_process import cleanup
 from .visitor import Visitor
 
@@ -34,6 +34,7 @@ def main(path: Path, base_dir: str, output_path: Path | None):
     env = Environment(loader=FileSystemLoader(template_dir), keep_trailing_newline=True)
     env.filters["ns_chain"] = do_ns_chain
     env.filters["ns_actions"] = do_ns_actions
+    env.filters["insert_name"] = do_insert_name
 
     for rel_path, file in (pbar := tqdm(visitor.files)):
         result = env.get_template("file.jinja").render(file=file)

src/dwarf2cpp/filters.py

@@ -1,3 +1,6 @@
+import functools
+import re
+
 from .models import Namespace
 
 
@@ -25,3 +28,37 @@ def do_ns_actions(prev: list[Namespace], curr: list[Namespace]):
         actions.append({"kind": "open", "namespace": n})
 
     return actions
+
+
+@functools.cache
+def do_insert_name(tp: str, name: str):
+    """Insert `name` into the C++ declarator described by `tp`."""
+    t = tp.strip()
+
+    if not name:
+        return t
+
+    # Arrays:  BASE [N][M]...
+    m = re.match(r"^(?P<base>.+?)(?P<arrays>(?:\s*\[[^\]]*\]\s*)+)$", t)
+    if m:
+        base = m.group("base").strip()
+        arrays = m.group("arrays").strip()
+        return f"{base} {name}{arrays}"
+
+    # Plain C-style function pointer:  RET (* )(ARGS...)
+    m = re.match(r"^(?P<ret>.+?)\s*\(\s*\*\s*\)\s*\((?P<args>.*)\)$", t)
+    if m:
+        ret = m.group("ret").strip()
+        args = m.group("args").strip()
+        return f"{ret} (*{name})({args})"
+
+    # # Member function pointer:  RET (Class::*)(ARGS...) [cv/ref qualifiers]
+    # m = re.match(r'^(?P<ret>.+?)\s*\(\s*(?P<cls>.+::\*)\s*\)\s*(?P<rest>.*)$', t)
+    # if m:
+    #     ret = m.group('ret').strip()
+    #     cls_ptr = m.group('cls').strip()  # e.g. Bedrock::JSONObject::Node::*
+    #     rest = m.group('rest').strip()  # e.g. (bool) const
+    #     return f"{ret} ({cls_ptr}{name}){(' ' + rest) if rest and not rest.startswith('(') else rest}"
+
+    # Fallback: just a normal "type name"
+    return f"{t} {name}"

src/dwarf2cpp/templates/attribute.jinja

@@ -1,7 +1,4 @@
-{%- set parts = obj.type.split('[', maxsplit=1) -%}
-{%- set type  = parts[0] -%}
-{%- set array = ('[{}'.format(parts[1]) if parts|length > 1 else '') -%}
 {{- "alignas({}) ".format(obj.alignment) if obj.alignment -}}
-{{ type }} {{ obj.name }}{{ array }}
+{{ obj.type | insert_name(obj.name) }}
 {{- " : {}".format(obj.bit_size) if obj.bit_size is not none -}}
 {{- " = {}".format(obj.default_value) if obj.default_value is not none -}}

src/dwarf2cpp/templates/function.jinja

@@ -8,7 +8,7 @@
 {%- for parameter in obj.parameters -%}
   {%- if parameter.name != "this" -%}
     {%- if parameter.kind.value == "positional" -%}
-      {{ parameter.type }}{{ " " ~ parameter.name if parameter.name }}
+      {{ parameter.type | insert_name(parameter.name) }}
     {%- elif parameter.kind.value == "variadic" -%}
       ...
     {%- endif -%}