issue #10703 Incorrect output for a C++ type containing a function pointer

albert-github · albert-github · commit 046e76aace1f · 2024-03-01T11:25:43.000+01:00
Looks like we were bailing out nested template part a bit early (see also test in rule `&lt;EndTemplate&gt;"&gt;"{BNopt}/"::"              {`)
diff --git a/src/scanner.l b/src/scanner.l
@@ -2134,7 +2134,7 @@ NONLopt [^\n]*
 <EndTemplate>">"{BNopt}/"("({BN}*{TSCOPE}{BN}*"::")*({BN}*"*"{BN}*)+ { // function pointer returning a template instance
                                           lineCount(yyscanner);
                                           yyextra->current->name+='>';
-                                          if (yyextra->roundCount==0)
+                                          if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
                                           {
                                             BEGIN(FindMembers);
                                           }

Original file line number	Diff line number	Diff line change
`@@ -2134,7 +2134,7 @@ NONLopt [^\n]*`
`2134`	`2134`	`<EndTemplate>">"{BNopt}/"("({BN}{TSCOPE}{BN}"::")({BN}""{BN})+ { // function pointer returning a template instance`
`2135`	`2135`	`lineCount(yyscanner);`
`2136`	`2136`	`yyextra->current->name+='>';`
`2137`		`- if (yyextra->roundCount==0)`
	`2137`	`+ if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)`
`2138`	`2138`	`{`
`2139`	`2139`	`BEGIN(FindMembers);`
`2140`	`2140`	`}`