Fixed sig11 regression while parsing cast to function pointer

doxygen · Mar 11, 2020 · a825e8d · a825e8d
1 parent 30887ac
commit a825e8d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/code.l b/src/code.l
@@ -1199,10 +1199,10 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
   					  yyextra->name+=yytext; 
 					}
-<Body>"("{B}*("*"{B}*)+{SCOPENAME}*{B}*")"/{B}*	{  // (*p)->func() but not "if (p) ..."
+<Body>"("{B}*("*"{B}*)+{SCOPENAME}+{B}*")"/{B}*	{  // (*p)->func() but not "if (p) ..."
 					  yyextra->code->codify(yytext);
 					  uint s=0;while (s<(uint)yyleng && !isId(yytext[s])) s++;
-                                          uint e=(uint)yyleng-1;while (!isId(yytext[e])) e--;
+                                          uint e=(uint)yyleng-1;while (e>1 && !isId(yytext[e])) e--;
 					  QCString varname = ((QCString)yytext).mid(s,e-s+1); 
 					  addType(yyscanner);
   					  yyextra->name=varname; 
@@ -1896,10 +1896,10 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
 					  BEGIN( MemberCall2 ); 
 					}
-<FuncCall,MemberCall2>("("{B}*("*"{B}*)+{ID}*{B}*")"{B}*)/("."|"->") { 
+<FuncCall,MemberCall2>("("{B}*("*"{B}*)+{ID}+{B}*")"{B}*)/("."|"->") { 
   					  yyextra->code->codify(yytext);
 					  uint s=0;while (!isId(yytext[s])) s++;
-                                          uint e=(uint)yyleng-1;while (!isId(yytext[e])) e--;
+                                          uint e=(uint)yyleng-1;while (e>1 && !isId(yytext[e])) e--;
 					  yyextra->name=((QCString)yytext).mid(s,e-s+1); 
 					  BEGIN( MemberCall2 ); 
 					}