Support ParameterPack for TemplateParam

ast_canopy/ast_canopy/decl.py

@@ -191,6 +191,11 @@ def __init__(
 
         self.parse_entry_point = parse_entry_point
 
+    def __repr__(self) -> str:
+        name = self.function.name
+        tparam_names = [t.name for t in self.template_parameters]
+        return f"{name}<{','.join(tparam_names)}>"
+
     @classmethod
     def from_c_obj(
         cls, c_obj: bindings.FunctionTemplate, parse_entry_point: str
@@ -373,6 +378,11 @@ def __init__(
 
         self.parse_entry_point = parse_entry_point
 
+    def __repr__(self) -> str:
+        name = self.record.name
+        tparam_names = [t.name for t in self.template_parameters]
+        return f"{name}<{','.join(tparam_names)}>"
+
     @classmethod
     def from_c_obj(cls, c_obj: bindings.ClassTemplate, parse_entry_point: str):
         return cls(

ast_canopy/ast_canopy/instantiations.py

@@ -32,7 +32,7 @@ def validate(self):
     @property
     def param_list(self):
         return [
-            self.instantiated_args[tparam.name]
+            self.instantiated_args.get(tparam.name, None)
             for tparam in self.template_parameters
         ]
 
@@ -42,10 +42,11 @@ def get_instantiated_c_stmt(self) -> str:
 
         flatten = []
         for param in param_list:
-            if isinstance(param, BaseInstantiation):
-                flatten.append(param.get_instantiated_c_stmt())
-            else:
-                flatten.append(str(param))
+            if param is not None:
+                if isinstance(param, BaseInstantiation):
+                    flatten.append(param.get_instantiated_c_stmt())
+                else:
+                    flatten.append(str(param))
 
         param_list = ", ".join(flatten)
         return f"{name}<{param_list}>"

ast_canopy/ast_canopy/pylibastcanopy.cpp

@@ -126,6 +126,7 @@ PYBIND11_MODULE(pylibastcanopy, m) {
       .def_readwrite("name", &TemplateParam::name)
       .def_readwrite("type_", &TemplateParam::type)
       .def_readwrite("kind", &TemplateParam::kind)
+      .def_readwrite("is_parameter_pack", &TemplateParam::is_parameter_pack)
       .def("__repr__",
            [](const TemplateParam &t) {
              return "<TemplateParam: " + t.name + " " + t.type.name + ">";

ast_canopy/cpp/include/ast_canopy/ast_canopy.hpp

@@ -114,6 +114,7 @@ struct TemplateParam {
   std::string name;
   template_param_kind kind;
   Type type;
+  bool is_parameter_pack;
 };
 
 struct Function {

ast_canopy/cpp/src/template_param.cpp

@@ -14,12 +14,14 @@ TemplateParam::TemplateParam(const clang::TemplateTypeParmDecl *TPD) {
   name = TPD->getNameAsString();
   type = Type(TPD->getASTContext().getTypeDeclType(TPD), TPD->getASTContext());
   kind = template_param_kind::type;
+  is_parameter_pack = TPD->isParameterPack();
 }
 
 TemplateParam::TemplateParam(const clang::NonTypeTemplateParmDecl *TPD) {
   name = TPD->getNameAsString();
   type = Type(TPD->getType(), TPD->getASTContext());
   kind = template_param_kind::non_type;
+  is_parameter_pack = TPD->isParameterPack();
 }
 
 TemplateParam::TemplateParam(const clang::TemplateTemplateParmDecl *TPD) {