issue #8838 export "something" { } wrong parsing

albert-github · albert-github · commit 1cf26658b7dc · 2021-10-22T14:02:22.000+02:00
According to the C++ standard "C" and "C++" have to be supported and other linkage types: "Use of a string-literal other than "C" or "C++" is conditionally-supported, with implementation-defined semantics."
diff --git a/src/pre.l b/src/pre.l
@@ -474,7 +474,7 @@ WSopt [ \t\r]*
                                             BEGIN(CopyLine);
                                           }
                                         }
-<CopyLine,LexCopyLine>"extern"{BN}{0,80}"\"C\""*{BN}{0,80}"{"   {
+<CopyLine,LexCopyLine>"extern"{BN}*"\""[^\"]+"\""{BN}*("{")?  {
                                           QCString text=yytext;
                                           yyextra->yyLineNr+=text.contains('\n');
                                           outputArray(yyscanner,yytext,yyleng);
diff --git a/src/scanner.l b/src/scanner.l
@@ -189,7 +189,7 @@ struct scannerYY_state
   bool             odlProp = false;
 
   bool             lexInit = false;
-  bool             externC = false;
+  bool             externLinkage = false;
 
   QCString         delimiter;
 
@@ -2347,7 +2347,7 @@ NONLopt [^\n]*
                                             }
                                             else
                                             {
-                                              yyextra->externC=FALSE; // see bug759247
+                                              yyextra->externLinkage=FALSE; // see bug759247
                                               BEGIN(FindMembers);
                                             }
                                           }
@@ -3471,7 +3471,7 @@ NONLopt [^\n]*
                                           {
                                             yyextra->current->args += yytext ;
                                             yyextra->squareCount=1;
-                                            yyextra->externC=FALSE; // see bug759247
+                                            yyextra->externLinkage=FALSE; // see bug759247
                                             BEGIN( Array ) ;
                                           }
                                         }
@@ -6325,14 +6325,14 @@ NONLopt [^\n]*
                                           startCommentBlock(yyscanner,yyextra->current->brief.isEmpty());
                                           BEGIN( DocLine );
                                         }
-<FindMembers>"extern"{BN}*"\"C"("++")?"\""{BN}*("{")?  {
+<FindMembers>"extern"{BN}*"\""[^\"]+"\""{BN}*("{")?  {
                                           lineCount(yyscanner);
-                                          yyextra->externC=TRUE;
+                                          yyextra->externLinkage=TRUE;
                                         }
 <FindMembers>"{"                        {
-                                          if (yyextra->externC)
+                                          if (yyextra->externLinkage)
                                           {
-                                            yyextra->externC=FALSE;
+                                            yyextra->externLinkage=FALSE;
                                           }
                                           else if (yyextra->insideCS &&
                                               !yyextra->current->name.isEmpty() &&

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ WSopt [ \t\r]*`
`474`	`474`	`BEGIN(CopyLine);`
`475`	`475`	`}`
`476`	`476`	`}`
`477`		`-<CopyLine,LexCopyLine>"extern"{BN}{0,80}"\"C\""*{BN}{0,80}"{" {`
	`477`	`+<CopyLine,LexCopyLine>"extern"{BN}"\""[^\"]+"\""{BN}("{")? {`
`478`	`478`	`QCString text=yytext;`
`479`	`479`	`yyextra->yyLineNr+=text.contains('\n');`
`480`	`480`	`outputArray(yyscanner,yytext,yyleng);`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ struct scannerYY_state`
`189`	`189`	`bool odlProp = false;`
`190`	`190`
`191`	`191`	`bool lexInit = false;`
`192`		`- bool externC = false;`
	`192`	`+ bool externLinkage = false;`
`193`	`193`
`194`	`194`	`QCString delimiter;`
`195`	`195`
`@@ -2347,7 +2347,7 @@ NONLopt [^\n]*`
`2347`	`2347`	`}`
`2348`	`2348`	`else`
`2349`	`2349`	`{`
`2350`		`- yyextra->externC=FALSE; // see bug759247`
	`2350`	`+ yyextra->externLinkage=FALSE; // see bug759247`
`2351`	`2351`	`BEGIN(FindMembers);`
`2352`	`2352`	`}`
`2353`	`2353`	`}`
`@@ -3471,7 +3471,7 @@ NONLopt [^\n]*`
`3471`	`3471`	`{`
`3472`	`3472`	`yyextra->current->args += yytext ;`
`3473`	`3473`	`yyextra->squareCount=1;`
`3474`		`- yyextra->externC=FALSE; // see bug759247`
	`3474`	`+ yyextra->externLinkage=FALSE; // see bug759247`
`3475`	`3475`	`BEGIN( Array ) ;`
`3476`	`3476`	`}`
`3477`	`3477`	`}`
`@@ -6325,14 +6325,14 @@ NONLopt [^\n]*`
`6325`	`6325`	`startCommentBlock(yyscanner,yyextra->current->brief.isEmpty());`
`6326`	`6326`	`BEGIN( DocLine );`
`6327`	`6327`	`}`
`6328`		`-<FindMembers>"extern"{BN}"\"C"("++")?"\""{BN}("{")? {`
	`6328`	`+<FindMembers>"extern"{BN}"\""[^\"]+"\""{BN}("{")? {`
`6329`	`6329`	`lineCount(yyscanner);`
`6330`		`- yyextra->externC=TRUE;`
	`6330`	`+ yyextra->externLinkage=TRUE;`
`6331`	`6331`	`}`
`6332`	`6332`	`<FindMembers>"{" {`
`6333`		`- if (yyextra->externC)`
	`6333`	`+ if (yyextra->externLinkage)`
`6334`	`6334`	`{`
`6335`		`- yyextra->externC=FALSE;`
	`6335`	`+ yyextra->externLinkage=FALSE;`
`6336`	`6336`	`}`
`6337`	`6337`	`else if (yyextra->insideCS &&`
`6338`	`6338`	`!yyextra->current->name.isEmpty() &&`