@@ -4362,8 +4362,7 @@ class cppfront
4362
4362
parameter_declaration_node const & n,
4363
4363
bool is_returns = false ,
4364
4364
bool is_template_parameter = false ,
4365
- bool is_statement = false ,
4366
- bool emit_identifier = true
4365
+ bool is_statement = false
4367
4366
)
4368
4367
-> void
4369
4368
{ STACKINSTR
@@ -4525,7 +4524,7 @@ class cppfront
4525
4524
printer.print_cpp2 ( unnamed_type_param_name (n.ordinal , n.declaration ->identifier ->get_token ()),
4526
4525
identifier_pos );
4527
4526
}
4528
- else if (emit_identifier) {
4527
+ else {
4529
4528
printer.print_cpp2 ( identifier, identifier_pos );
4530
4529
}
4531
4530
};
@@ -4542,13 +4541,13 @@ class cppfront
4542
4541
// Handle template parameters
4543
4542
4544
4543
if (n.declaration ->is_template ()) {
4544
+ assert ( n.declaration ->is_template () );
4545
4545
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 ();
4552
4551
return ;
4553
4552
}
4554
4553
@@ -4775,8 +4774,7 @@ class cppfront
4775
4774
parameter_declaration_list_node const & n,
4776
4775
bool is_returns = false ,
4777
4776
bool is_template_parameter = false ,
4778
- bool generating_postfix_inc_dec = false ,
4779
- bool emit_identifier = true
4777
+ bool generating_postfix_inc_dec = false
4780
4778
)
4781
4779
-> void
4782
4780
{ STACKINSTR
@@ -4805,7 +4803,7 @@ class cppfront
4805
4803
}
4806
4804
prev_pos = x->position ();
4807
4805
assert (x);
4808
- emit (*x, is_returns, is_template_parameter, false , emit_identifier );
4806
+ emit (*x, is_returns, is_template_parameter, false );
4809
4807
if (!x->declaration ->has_name (" this" )) {
4810
4808
first = false ;
4811
4809
}
0 commit comments