diff options
author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2008-04-20 08:30:56 (GMT) |
---|---|---|
committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2008-04-20 08:30:56 (GMT) |
commit | 2f0a01b60fb0cb5f2fb42510039c22eabd86e786 (patch) | |
tree | 1ef12f6f2f4d51d8e4486b2d467e6f047ef9515a /src/scanner.l | |
parent | 238c63a16c820818ba71ae256f3f50eed2a94cf2 (diff) | |
download | Doxygen-2f0a01b60fb0cb5f2fb42510039c22eabd86e786.zip Doxygen-2f0a01b60fb0cb5f2fb42510039c22eabd86e786.tar.gz Doxygen-2f0a01b60fb0cb5f2fb42510039c22eabd86e786.tar.bz2 |
Release-1.5.5-20080420
Diffstat (limited to 'src/scanner.l')
-rw-r--r-- | src/scanner.l | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/src/scanner.l b/src/scanner.l index 61e8d11..b42e115 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -644,6 +644,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) %x PackageName %x JavaImport %x CSAccessorDecl +%x CSGeneric %x PreLineCtrl %x DefinePHP %x DefinePHPEnd @@ -2725,11 +2726,17 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) } } <IDLAttribute>"propput" { - current->mtype = Property; + if (Config_getBool("IDL_PROPERTY_SUPPORT")) + { + current->mtype = Property; + } current->spec |= Entry::Settable; } <IDLAttribute>"propget" { - current->mtype = Property; + if (Config_getBool("IDL_PROPERTY_SUPPORT")) + { + current->mtype = Property; + } current->spec |= Entry::Gettable; } <IDLAttribute>. { @@ -2744,7 +2751,8 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) BEGIN( IDLProp ); } <IDLProp>{BN}*"["[^\]]*"]"{BN}* { // attribute of a parameter - idlAttr += yytext; + idlAttr = yytext; + idlAttr=idlAttr.stripWhiteSpace(); } <IDLProp>{ID} { // property type idlProp = yytext; @@ -2781,7 +2789,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) BEGIN( FindMembers ); } <IDLProp>. { // spaces, *, or other stuff - idlProp+=yytext; + //idlProp+=yytext; } <Array>"]" { current->args += *yytext ; if (--squareCount<=0) @@ -4273,11 +4281,31 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) { BEGIN( ObjCProtocolList ); } + else if (insideCS) // C# generic class + { + BEGIN( CSGeneric ); + } else // C++ template specialization { BEGIN( ClassTemplSpec ); } } +<CSGeneric>"<" { + if (current->tArgLists==0) + { + current->tArgLists = new QList<ArgumentList>; + current->tArgLists->setAutoDelete(TRUE); + } + ArgumentList *al = new ArgumentList; + current->spec |= Entry::Template; + current->tArgLists->append(al); + currentArgumentList = al; + templateStr="<"; + fullArgString = templateStr; + copyArgString = &templateStr; + currentArgumentContext = CompoundName; + BEGIN( ReadTempArgs ); + } <ObjCProtocolList>"<" { insideProtocolList=TRUE; BEGIN( Bases ); |