diff options
author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2009-05-22 11:07:08 (GMT) |
---|---|---|
committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2009-05-22 11:07:08 (GMT) |
commit | 7a3de4c3c8aac25c38b6e93bb0927de40cd1c650 (patch) | |
tree | 9568dad93df55e8726251e5bdb1f2d8c00bdde93 /src/scanner.l | |
parent | c34e05f1d2d21630290f758aafe6d151825d0ce8 (diff) | |
download | Doxygen-7a3de4c3c8aac25c38b6e93bb0927de40cd1c650.zip Doxygen-7a3de4c3c8aac25c38b6e93bb0927de40cd1c650.tar.gz Doxygen-7a3de4c3c8aac25c38b6e93bb0927de40cd1c650.tar.bz2 |
Release-1.5.9-20090522
Diffstat (limited to 'src/scanner.l')
-rw-r--r-- | src/scanner.l | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/scanner.l b/src/scanner.l index bd46a13..d189bef 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -1000,6 +1000,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) lineCount() ; } <FindMembers>[\-+]{BN}* { + printf("Found - insideObj=%d\n",insideObjC); if (!insideObjC) { REJECT; @@ -1477,7 +1478,8 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) isTypedef=((QCString)yytext).find("typedef")!=-1; current->section = Entry::CLASS_SEC ; current->spec = Entry::Struct; - current->objc = insideObjC = FALSE; + // bug 582676: can be a struct nested in an interface so keep insideObjC state + //current->objc = insideObjC = FALSE; addType( current ) ; current->type += " struct" ; current->fileName = yyFileName; @@ -1534,7 +1536,8 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) isTypedef=((QCString)yytext).find("typedef")!=-1; current->section = Entry::CLASS_SEC; current->spec = Entry::Union; - current->objc = insideObjC = FALSE; + // bug 582676: can be a struct nested in an interface so keep insideObjC state + //current->objc = insideObjC = FALSE; addType( current ) ; current->type += " union" ; current->fileName = yyFileName; |