diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2009-10-04 20:20:24 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2009-10-04 20:20:24 (GMT) |
| commit | a62d9f8f1c2c97d454ff33bc1a4911d1362d9766 (patch) | |
| tree | 36e6fdf77248708eaee0f1180b2ea526d1323c18 /src/scanner.l | |
| parent | 0c8b6ca69f951ce8c94902764cf036d6a79e5102 (diff) | |
| download | Doxygen-a62d9f8f1c2c97d454ff33bc1a4911d1362d9766.zip Doxygen-a62d9f8f1c2c97d454ff33bc1a4911d1362d9766.tar.gz Doxygen-a62d9f8f1c2c97d454ff33bc1a4911d1362d9766.tar.bz2 | |
Release-1.6.1-20091004
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/scanner.l b/src/scanner.l index f112d5b..dd1eb77 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -1124,7 +1124,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) <FindMembers>{BN}{1,80} { lineCount(); } -<FindMembers>"@"{ID}{BN}*"(" { +<FindMembers>"@"({ID}".")*{ID}{BN}*"(" { if (insideJava) // Java annotation { lineCount(); @@ -2010,7 +2010,8 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) lastCPPContext = YY_START; BEGIN( SkipCPP ) ; } -<FindMembers,FindFields>{B}*"#"{B}*"define" { if (insidePHP) +<FindMembers,FindFields>{B}*"#"{B}*("cmake")?"define" { + if (insidePHP) REJECT; current->bodyLine = yyLineNr; BEGIN( Define ); @@ -2674,6 +2675,10 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) current->type=current->type.simplifyWhiteSpace(); current->args=removeRedundantWhiteSpace(current->args); current->name=current->name.stripWhiteSpace(); + if (current->section==Entry::CLASS_SEC) // remove spec for "struct Bla bla;" + { + current->spec = 0; + } current->section = Entry::VARIABLE_SEC ; current->fileName = yyFileName; current->startLine = yyLineNr; |