diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2000-07-23 15:31:35 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2000-07-23 15:31:35 (GMT) |
| commit | 422c14b6f19d70c78762ea571031f142acf9a972 (patch) | |
| tree | 191fcbf13137ceda80267e217af7556d5a1f194e /src/scanner.l | |
| parent | 686cb8df0c558cdfe8b0b9a48355566391daf073 (diff) | |
| download | Doxygen-422c14b6f19d70c78762ea571031f142acf9a972.zip Doxygen-422c14b6f19d70c78762ea571031f142acf9a972.tar.gz Doxygen-422c14b6f19d70c78762ea571031f142acf9a972.tar.bz2 | |
Release-1.2.0
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/src/scanner.l b/src/scanner.l index 9967667..ba99f5b 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -2449,7 +2449,7 @@ DOCPARAM ([a-z_A-Z0-9:\<\>\=\.\-]+)|("\"".*"\"") lineCount(); BEGIN( CompoundName ); } -<FindMembers>{B}*("disp")?"interface"{BN}+ { // M$/Corba IDL interface +<FindMembers>{B}*((("disp")?"interface")|"valuetype"){BN}+ { // M$/Corba IDL interface isTypedef=FALSE; current->section = Entry::INTERFACE_SEC; addType( current ) ; @@ -3157,24 +3157,31 @@ DOCPARAM ([a-z_A-Z0-9:\<\>\=\.\-]+)|("\"".*"\"") //printf("adding `%s' `%s' `%s' to enum `%s' (mGrpId=%d)\n", // current->type.data(), current->name.data(), // current->args.data(), current_root->name.data(),current->mGrpId); - current->fileName = yyFileName; - current->startLine = yyLineNr; - current->type = "@"; // enum marker - current->args = current->args.simplifyWhiteSpace(); - current->name = current->name.stripWhiteSpace(); - current->section = Entry::VARIABLE_SEC; - // add to the scope of the enum - current_root->addSubEntry(current); - current = new Entry(*current); - // add to the scope surrounding the enum (copy!) - current_root->parent->addSubEntry(current); - current = new Entry ; - current->protection = protection ; - current->sig = sig; - current->virt = virt; - current->stat = gstat; - current->slot = slot; - current->mGrpId = memberGroupId; + if (!current->name.isEmpty()) + { + current->fileName = yyFileName; + current->startLine = yyLineNr; + current->type = "@"; // enum marker + current->args = current->args.simplifyWhiteSpace(); + current->name = current->name.stripWhiteSpace(); + current->section = Entry::VARIABLE_SEC; + // add to the scope of the enum + current_root->addSubEntry(current); + current = new Entry(*current); + // add to the scope surrounding the enum (copy!) + current_root->parent->addSubEntry(current); + current = new Entry ; + current->protection = protection ; + current->sig = sig; + current->virt = virt; + current->stat = gstat; + current->slot = slot; + current->mGrpId = memberGroupId; + } + else // probably a redundant , + { + current->reset(); + } } /* <FindFieldArg>"," { unput(*yytext); BEGIN(FindFields); } |