summaryrefslogtreecommitdiffstats
path: root/src/scanner.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2009-08-14 14:49:07 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2009-08-14 14:49:07 (GMT)
commit9e6be9a8ae24b788cf2463a703bda48cbd77c773 (patch)
treefed426d0d7216311cbd009a1fcd2786176478b5e /src/scanner.l
parent6e28050ef5483e624122b0bacb998c40664f78ee (diff)
downloadDoxygen-9e6be9a8ae24b788cf2463a703bda48cbd77c773.zip
Doxygen-9e6be9a8ae24b788cf2463a703bda48cbd77c773.tar.gz
Doxygen-9e6be9a8ae24b788cf2463a703bda48cbd77c773.tar.bz2
Release-1.5.9-20090814
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l26
1 files changed, 17 insertions, 9 deletions
diff --git a/src/scanner.l b/src/scanner.l
index c6db28c..f112d5b 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -866,13 +866,20 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
lineCount() ;
}
<FindMembers>{B}*"internal"{BN}*":"{BN}* { // for now treat C++/CLI's internal as package...
- current->protection = protection = Package ;
- current->mtype = mtype = Method;
- current->type.resize(0);
- current->name.resize(0);
- current->args.resize(0);
- current->argList->clear();
- lineCount() ;
+ if (insideCli)
+ {
+ current->protection = protection = Package ;
+ current->mtype = mtype = Method;
+ current->type.resize(0);
+ current->name.resize(0);
+ current->args.resize(0);
+ current->argList->clear();
+ lineCount() ;
+ }
+ else
+ {
+ REJECT;
+ }
}
<FindMembers>{B}*"protected"{BN}*":"{BN}* {
current->protection = protection = Protected ;
@@ -2706,8 +2713,9 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
<FindMembers>"[" {
if (!insideCS &&
- current->name.isEmpty() ||
- current->name=="typedef"
+ (current->name.isEmpty() ||
+ current->name=="typedef"
+ )
) // IDL function property
{
squareCount=1;