diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2005-03-07 21:07:13 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2005-03-07 21:07:13 (GMT) |
| commit | 42eb3f9c14016086a2d2b18951585816eaf7bcab (patch) | |
| tree | 3f86b13900ced91ef5e802650b33a38767bf6c11 /src/scanner.l | |
| parent | 47b04448404f708d25de41246b04fb2219cc81df (diff) | |
| download | Doxygen-42eb3f9c14016086a2d2b18951585816eaf7bcab.zip Doxygen-42eb3f9c14016086a2d2b18951585816eaf7bcab.tar.gz Doxygen-42eb3f9c14016086a2d2b18951585816eaf7bcab.tar.bz2 | |
Release-1.4.1-20050307
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/scanner.l b/src/scanner.l index c06225a..1f8aa80 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -2121,7 +2121,12 @@ IDLATTR ("["[^\]]*"]"){BN}* <FindMembers,FindFields>("//"([!/]?){B}*{CMD}"{")|("/*"([!*]?){B}*{CMD}"{") { #ifdef COMMENTSCAN - REJECT; + Entry *tmp = current; + current = previous; + handleGroupStartCommand(current->name); + current = tmp; + initEntry(); + #else startGroup(); tmpDocType=-1; @@ -2154,7 +2159,7 @@ IDLATTR ("["[^\]]*"]"){BN}* } <FindMembers,FindFields,ReadInitializer>"//"([!/]?){B}*{CMD}"}".*|"/*"([!*]?){B}*{CMD}"}".*"*/" { #ifdef COMMENTSCAN - REJECT; + handleGroupEndCommand(); #else if (memberGroupId==DOX_NOGROUP && autoGroupStack.isEmpty()) { @@ -3266,7 +3271,7 @@ IDLATTR ("["[^\]]*"]"){BN}* <FuncQual>[{:;,] { if ( strcmp(yytext,";")==0 && insidePHP && - current->type.left(8) != "function" ) + !containsWord(current->type,"function") ) { current->reset(); initEntry(); @@ -3497,26 +3502,24 @@ IDLATTR ("["[^\]]*"]"){BN}* //printf("Adding entry `%s'\n",current->name.data()); if ( insidePHP) { - if (current->type.left(6) == "final " ) + if (findAndRemoveWord(current->type,"final")) { - current->type = current->type.mid(6); current->memSpec |= Entry::Final; } - if (current->type.left(9) == "abstract " ) + if (findAndRemoveWord(current->type,"abstract")) { - current->type = current->type.mid(9); current->memSpec |= Entry::Abstract; } } - if ( insidePHP && current->type.left(8) != "function" ) + if ( insidePHP && !containsWord(current->type,"function")) { initEntry(); } else { - if ( insidePHP && current->type.left(8) == "function" ) + if ( insidePHP) { - current->type = current->type.mid(8); + findAndRemoveWord(current->type,"function"); } previous = current; current_root->addSubEntry(current); @@ -4303,7 +4306,7 @@ IDLATTR ("["[^\]]*"]"){BN}* <FindMembers>"{" { if (insideCS && !current->name.isEmpty() && !current->type.isEmpty()) { - if (current->type.left(6)=="event " || current->type.find("event")!=-1) // event + if (containsWord(current->type,"event")) // event { current->mtype = mtype = Event; } |