fix _ in macro names for included templates

src/vdct2template/expansion.py

@@ -24,7 +24,7 @@ def __init__(self, filename: Path, folder: Path) -> None:
         self.vdb_path = filename.resolve()
         self.folder = folder
         self.template_path = filename.with_suffix(".template")
-        self.includes = []
+        self.includes: list[Macros] = []
         self.text = filename.read_text()
 
         Expansion.expansions.append(self)
@@ -92,6 +92,10 @@ def process_includes(self):
             if include.vdb_path.name not in Expansion.processed:
                 yield include.process()
                 Expansion.processed.append(include.vdb_path.name)
+            # else:
+            #     cur_macros = Expansion.processed[include.vdb_path.name]
+            #     if cur_macros != include.macros:
+            #         print(f"WARNING: inconsistent macros for {include.vdb_path.name}")
 
     @classmethod
     def validate_includes(cls) -> bool:

src/vdct2template/macros.py

@@ -84,7 +84,7 @@ def process(self):
         """
         text = self.vdb_path.read_text()
         for name in self.macros.keys():
-            text = text.replace(f"${name}", f"$_{name}")
+            text = text.replace(f"$({name})", f"$(_{name})")
 
         # remove redundant VDB things
         text = DROP.sub("", text)