diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2012-12-26 15:59:17 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2012-12-26 15:59:17 (GMT) |
| commit | 48f4de5c47d55b6622b6fdc9b5c288e19d5692f9 (patch) | |
| tree | 629c4681a5158d26512b815623754b33165d8d23 /src/scanner.l | |
| parent | fee4053bd3dd075a2dd2cba4da8166ec5307eadd (diff) | |
| download | Doxygen-48f4de5c47d55b6622b6fdc9b5c288e19d5692f9.zip Doxygen-48f4de5c47d55b6622b6fdc9b5c288e19d5692f9.tar.gz Doxygen-48f4de5c47d55b6622b6fdc9b5c288e19d5692f9.tar.bz2 | |
Release-1.8.3
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/src/scanner.l b/src/scanner.l index c711765..8efca45 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -3053,13 +3053,24 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" <FindMembers>":" { - if (current->type.isEmpty()) // anonymous padding field, e.g. "int :7;" + if (current->type.isEmpty() && + current->name=="enum") // see bug 69041, C++11 style anon enum: 'enum : unsigned int {...}' { - addType(current); - current->name.sprintf("__pad%d__",padCount++); + current->section=Entry::ENUM_SEC; + current->name.resize(0); + current->args.resize(0); + BEGIN(EnumBaseType); } - BEGIN(BitFields); - current->bitfields+=":"; + else + { + if (current->type.isEmpty()) // anonymous padding field, e.g. "int :7;" + { + addType(current); + current->name.sprintf("__pad%d__",padCount++); + } + BEGIN(BitFields); + current->bitfields+=":"; + } } <BitFields>. { current->bitfields+=*yytext; @@ -3069,6 +3080,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } <EnumBaseType>\n { lineCount(); + current->args+=' '; } <FindMembers>[;,] { QCString oldType = current->type; @@ -3428,7 +3440,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" current->program += yytext; } } -<ReadBody,ReadNSBody,ReadBodyIntf>"{" { current->program += yytext ; +<ReadBody,ReadNSBody,ReadBodyIntf>"{" { current->program += yytext ; ++curlyCount ; } <ReadBodyIntf>"}" { @@ -4672,11 +4684,11 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } } } +<SkipInits>{ID}{BN}*"{" { // C++11 style initializer (see bug 688647) + lineCount(); + ++curlyCount; + } <SkipInits>"{" { // C++11 style initializer - //addToBody(yytext); - //lastCurlyContext = FindMembers; - //curlyCount=0; - //BEGIN( SkipCurly ) ; unput('{'); BEGIN( Function ); } |