summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-10-04 17:58:19 (GMT)
committerGitHub <noreply@github.com>2020-10-04 17:58:19 (GMT)
commit8afc2218f92d509803c71cffa3f6ea0f41704738 (patch)
tree5757b30079d460776643b4d008a6532a67e55339
parent21bc8b5077ff95c823f9633f81c0738c271219bd (diff)
parent64f6dd32f9c0d0d98bb70dac76af684c608d7dda (diff)
downloadDoxygen-8afc2218f92d509803c71cffa3f6ea0f41704738.zip
Doxygen-8afc2218f92d509803c71cffa3f6ea0f41704738.tar.gz
Doxygen-8afc2218f92d509803c71cffa3f6ea0f41704738.tar.bz2
Merge pull request #8074 from albert-github/feature/bug_RCS
Incorrect recognition as RCS tag
-rw-r--r--src/doctokenizer.l3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index c20ae1a..c91b31e 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -439,6 +439,7 @@ REFWORD4_NOCV (({SCOPEPRE}*"operator"{OPMASKOP2})|(("::"|"#"){SCOPEPRE}*"operat
REFWORD4 {REFWORD4_NOCV}{CVSPEC}?
REFWORD {FILEMASK}|{LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
+RCSID "$"("Author"|"Date"|"Header"|"Id"|"Locker"|"Log"|"Name"|"RCSfile"|"Revision"|"Source"|"State")":"[^:\n$][^\n$]*"$"
%option noyywrap
%option yylineno
@@ -681,7 +682,7 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
g_token->name=yytext;
return TK_WORD;
}
-<St_Para>"$"{ID}":"[^:\n$][^\n$]*"$" { /* RCS tag */
+<St_Para>{RCSID} { /* RCS tag */
QCString tagName(yytext+1);
int index=tagName.find(':');
g_token->name = tagName.left(index);