diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2004-06-17 19:53:53 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2004-06-17 19:53:53 (GMT) |
| commit | 6b195c8d27c7cba3885acf1540f33ea7f51b9d1b (patch) | |
| tree | e215fcacfb74cc58f4d27e30b9722efd930d7a7a /src/doctokenizer.l | |
| parent | 62039dd46dfca33a45f5461a3732b3a707e4ce8b (diff) | |
| download | Doxygen-6b195c8d27c7cba3885acf1540f33ea7f51b9d1b.zip Doxygen-6b195c8d27c7cba3885acf1540f33ea7f51b9d1b.tar.gz Doxygen-6b195c8d27c7cba3885acf1540f33ea7f51b9d1b.tar.bz2 | |
Release-1.3.7-20040617
Diffstat (limited to 'src/doctokenizer.l')
| -rw-r--r-- | src/doctokenizer.l | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index e445f55..638d30a 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -295,7 +295,9 @@ FUNCCHAR [a-z_A-Z0-9,:\<\> \t\*\&] SCOPESEP "::"|"#"|"." SCOPEPRE {ID}("<"{TEMPCHAR}*">")?{SCOPESEP} SCOPEKEYS ":"({ID}":")* -SCOPEMASK {SCOPEPRE}*(~)?{ID}{SCOPEKEYS}?("<"{TEMPCHAR}*">")? +SCOPECPP {SCOPEPRE}*(~)?{ID}("<"{TEMPCHAR}*">")? +SCOPEOBJC {ID}{SCOPEKEYS}? +SCOPEMASK {SCOPECPP}|{SCOPEOBJC} FUNCARG "("{FUNCCHAR}*")" OPNEW {BLANK}+"new"({BLANK}*"[]")? OPDEL {BLANK}+"delete"({BLANK}*"[]")? @@ -462,6 +464,7 @@ LABELID [a-z_A-Z][a-z_A-Z0-9\-]* g_token->name = yytext; return TK_LNKWORD; } +<St_Para>{LNKWORD1}/"<br>" | // prevent <br> html tag to be parsed as template arguments <St_Para>{LNKWORD1} | <St_Para>{LNKWORD1}{FUNCARG} | <St_Para>{LNKWORD2} { @@ -794,7 +797,7 @@ LABELID [a-z_A-Z][a-z_A-Z0-9\-]* g_secType = SectionInfo::Paragraph; BEGIN(St_SecLabel2); } -<St_Sections>{CMD}"verbatim"{BLANK}+ { +<St_Sections>{CMD}"verbatim"/[^a-z_A-Z0-9] { g_endMarker="endverbatim"; BEGIN(St_SecSkip); } |