@@ -4362,8 +4362,7 @@ class cppfront
43624362 parameter_declaration_node const & n,
43634363 bool is_returns = false ,
43644364 bool is_template_parameter = false ,
4365- bool is_statement = false ,
4366- bool emit_identifier = true
4365+ bool is_statement = false
43674366 )
43684367 -> void
43694368 { STACKINSTR
@@ -4525,7 +4524,7 @@ class cppfront
45254524 printer.print_cpp2 ( unnamed_type_param_name (n.ordinal , n.declaration ->identifier ->get_token ()),
45264525 identifier_pos );
45274526 }
4528- else if (emit_identifier) {
4527+ else {
45294528 printer.print_cpp2 ( identifier, identifier_pos );
45304529 }
45314530 };
@@ -4542,13 +4541,13 @@ class cppfront
45424541 // Handle template parameters
45434542
45444543 if (n.declaration ->is_template ()) {
4544+ assert ( n.declaration ->is_template () );
45454545 printer.print_cpp2 (" template " , identifier_pos);
4546- emit (*n.declaration ->template_parameters , is_returns, true , false , false );
4547- printer.print_cpp2 (" class" , identifier_pos);
4548- if (emit_identifier) {
4549- printer.print_cpp2 (" " , identifier_pos);
4550- printer.print_cpp2 ( identifier, identifier_pos );
4551- }
4546+ emit (*n.declaration ->template_parameters , is_returns, true );
4547+ printer.print_cpp2 (" class " , identifier_pos);
4548+
4549+ emit_template_name ();
4550+ emit_initializer ();
45524551 return ;
45534552 }
45544553
@@ -4775,8 +4774,7 @@ class cppfront
47754774 parameter_declaration_list_node const & n,
47764775 bool is_returns = false ,
47774776 bool is_template_parameter = false ,
4778- bool generating_postfix_inc_dec = false ,
4779- bool emit_identifier = true
4777+ bool generating_postfix_inc_dec = false
47804778 )
47814779 -> void
47824780 { STACKINSTR
@@ -4805,7 +4803,7 @@ class cppfront
48054803 }
48064804 prev_pos = x->position ();
48074805 assert (x);
4808- emit (*x, is_returns, is_template_parameter, false , emit_identifier );
4806+ emit (*x, is_returns, is_template_parameter, false );
48094807 if (!x->declaration ->has_name (" this" )) {
48104808 first = false ;
48114809 }
0 commit comments