diff options
author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2004-06-17 19:53:53 (GMT) |
---|---|---|
committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2004-06-17 19:53:53 (GMT) |
commit | d3c3bbd02543280d12a763d82aa5b54ce516c57f (patch) | |
tree | e215fcacfb74cc58f4d27e30b9722efd930d7a7a /src/doctokenizer.l | |
parent | f309c3c0e7c1cf29df6b850e19d647e93a30ce28 (diff) | |
download | Doxygen-d3c3bbd02543280d12a763d82aa5b54ce516c57f.zip Doxygen-d3c3bbd02543280d12a763d82aa5b54ce516c57f.tar.gz Doxygen-d3c3bbd02543280d12a763d82aa5b54ce516c57f.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); } |