issue #8465 Parens in return type template are dropped

The "(" was eaten when the sharp parens ended but not the number of round brackets so exter condition required.
doxygen · Mar 29, 2021 · 3770392 · 3770392
1 parent 42bac34
commit 3770392
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/scanner.l b/src/scanner.l
@@ -1914,7 +1914,8 @@ NONLopt [^\n]*
                                           lineCount(yyscanner);
                                           yyextra->current->name+='>';
                                           // *yyextra->currentTemplateSpec+='>';
-                                          if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
+                                          --yyextra->sharpCount;
+                                          if (yyextra->roundCount==0 && yyextra->sharpCount<=0)
                                           {
                                             yyextra->current->bodyLine = yyextra->yyLineNr;
                                             yyextra->current->bodyColumn = yyextra->yyColNr;
@@ -1925,6 +1926,11 @@ NONLopt [^\n]*
                                             //printf("Found %s\n",yyextra->current->name.data());
                                             BEGIN( ReadFuncArgType ) ;
                                           }
+                                          else if (yyextra->sharpCount<=0)
+                                          {
+                                             yyextra->current->name+="(";
+                                             yyextra->roundCount++;
+                                          }
                                         }
 <EndTemplate>">"{BNopt}/"("({BN}*{ID}{BN}*"::")*({BN}*"*"{BN}*)+ { // function pointer returning a template instance
                                           lineCount(yyscanner);