diff options
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/scanner.l b/src/scanner.l index 72cee53..5bd5c0b 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -1136,7 +1136,9 @@ TITLE [tT][iI][tT][lL][eE] } <DefineEnd>. -<FindMembers>[*&]+ { current->name += yytext ; } +<FindMembers>[*&]+ { current->name += yytext ; + addType( current ); + } <FindMembers,MemberSpec,Function,NextSemi,BitFields,ReadInitializer>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" { lineCount(); if (current->bodyLine==-1) @@ -1677,7 +1679,7 @@ TITLE [tT][iI][tT][lL][eE] } <ReadBody>. { current->program += yytext ; } -<FindMembers>"("({BN}*{ID}{BN}*"::")*({BN}*"*"{BN}*)+ { +<FindMembers>("("({BN}*{ID}{BN}*"::")*({BN}*"*"{BN}*)+)+ { current->bodyLine = yyLineNr; lineCount(); addType(current); @@ -1769,13 +1771,17 @@ TITLE [tT][iI][tT][lL][eE] <FuncFuncType>. { current->type += *yytext; } -<FindMembers>"(" { current->args = yytext; - current->bodyLine = yyLineNr; - currentArgumentContext = FuncQual; - fullArgString=current->args.copy(); - copyArgString=¤t->args; - BEGIN( ReadFuncArgType ) ; - //printf(">>> Read function arguments!\n"); +<FindMembers>"(" { + if (!current->name.isEmpty()) + { + current->args = yytext; + current->bodyLine = yyLineNr; + currentArgumentContext = FuncQual; + fullArgString=current->args.copy(); + copyArgString=¤t->args; + BEGIN( ReadFuncArgType ) ; + //printf(">>> Read function arguments!\n"); + } } /* <FindMembers>"("{BN}*("void"{BN}*)?")" { |