fix(cpp1): do not emit TTP parameter names

Author: JohelEGP

regression-tests/pure2-bugfix-for-template-template-parameter.cpp2

@@ -1,5 +1,5 @@
-t: @struct <T: <_>> type = { }
+t: @struct <T: <_, _: _>> type = { }
 
-u: @struct <T: type> type = { }
+u: @struct <T, V: _> type = { }
 
 main: () = { _ = :t<u> = (); }

regression-tests/test-results/pure2-bugfix-for-template-template-parameter.cpp

@@ -7,17 +7,17 @@
 #include "cpp2util.h"
 
 #line 1 "pure2-bugfix-for-template-template-parameter.cpp2"
-template<template <typename _> class T> class t;
+template<template <typename, auto> class T> class t;
 
-template<typename T> class u;
+template<typename T, auto V> class u;
 
 
 //=== Cpp2 type definitions and function declarations ===========================
 
 #line 1 "pure2-bugfix-for-template-template-parameter.cpp2"
-template<template <typename _> class T> class t {};
+template<template <typename, auto> class T> class t {};
 
-template<typename T> class u {};
+template<typename T, auto V> class u {};
 
 auto main() -> int;
 

source/cppfront.cpp

@@ -3828,7 +3828,8 @@ class cppfront
     auto emit(
         parameter_declaration_node const& n,
         bool                              is_returns            = false,
-        bool                              is_template_parameter = false
+        bool                              is_template_parameter = false,
+        bool                              emit_identifier       = true
     )
         -> void
     {
@@ -3914,8 +3915,11 @@ class cppfront
 
         if (n.declaration->is_type()) {
             assert (n.declaration->identifier);
-            printer.print_cpp2("typename ", n.declaration->identifier->position());
-            emit(*n.declaration->identifier);
+            printer.print_cpp2("typename", n.declaration->identifier->position());
+            if (emit_identifier) {
+                printer.print_cpp2(" ", n.declaration->identifier->position());
+                emit(*n.declaration->identifier);
+            }
             return;
         }
 
@@ -3925,9 +3929,12 @@ class cppfront
         if (n.declaration->is_template()) {
             assert (n.declaration->identifier);
             printer.print_cpp2("template ", n.declaration->identifier->position());
-            emit(*n.declaration->template_parameters);
-            printer.print_cpp2(" class ", n.declaration->identifier->position());
-            emit(*n.declaration->identifier);
+            emit(*n.declaration->template_parameters, is_returns, true, false);
+            printer.print_cpp2(" class", n.declaration->identifier->position());
+            if (emit_identifier) {
+                printer.print_cpp2(" ", n.declaration->identifier->position());
+                emit(*n.declaration->identifier);
+            }
             return;
         }
 
@@ -3939,9 +3946,11 @@ class cppfront
 
         if (is_template_parameter) {
             emit( type_id );
-            printer.print_cpp2(" ", type_id.position());
-            assert (n.declaration->identifier);
-            emit(*n.declaration->identifier);
+            if (emit_identifier) {
+                printer.print_cpp2(" ", type_id.position());
+                assert (n.declaration->identifier);
+                emit(*n.declaration->identifier);
+            }
             return;
         }
 
@@ -4123,8 +4132,9 @@ class cppfront
     //
     auto emit(
         parameter_declaration_list_node const& n,
-        bool                                   is_returns            = false,
-        bool                                   is_template_parameter = false
+        bool                              is_returns            = false,
+        bool                              is_template_parameter = false,
+        bool                              emit_identifier       = true
     )
         -> void
     {
@@ -4152,7 +4162,7 @@ class cppfront
             }
             prev_pos = x->position();
             assert(x);
-            emit(*x, is_returns, is_template_parameter);
+            emit(*x, is_returns, is_template_parameter, emit_identifier);
             if (!x->declaration->has_name("this")) {
                 first = false;
             }