From a825e8dc7bf8a3fc8fac24d601a4107f552fa5db Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Wed, 11 Mar 2020 21:59:44 +0100 Subject: Fixed sig11 regression while parsing cast to function pointer --- src/code.l | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/code.l b/src/code.l index c1350e3..0754db6 100644 --- a/src/code.l +++ b/src/code.l @@ -1199,10 +1199,10 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext); yyextra->name+=yytext; } -"("{B}*("*"{B}*)+{SCOPENAME}*{B}*")"/{B}* { // (*p)->func() but not "if (p) ..." +"("{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 ); } -("("{B}*("*"{B}*)+{ID}*{B}*")"{B}*)/("."|"->") { +("("{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 ); } -- cgit v0.12