summaryrefslogtreecommitdiffstats
path: root/src/doctokenizer.l
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2018-12-20 11:10:04 (GMT)
committeralbert-github <albert.tests@gmail.com>2018-12-20 11:10:04 (GMT)
commita06e660406d655568635521f6df161e3a7e5734b (patch)
treebf61ea47dce220e0e89377ad5be2c835ca61a0cd /src/doctokenizer.l
parent449a7e2b4ff114a72be573013558bae19672ebbc (diff)
downloadDoxygen-a06e660406d655568635521f6df161e3a7e5734b.zip
Doxygen-a06e660406d655568635521f6df161e3a7e5734b.tar.gz
Doxygen-a06e660406d655568635521f6df161e3a7e5734b.tar.bz2
issue #6691 Multiple issues with emoji matching
This fix is regarding the false positive emoji detection of scope rules like: `Platform::*Application::viewportEvent(const Vector2i&)` In case the "emoji" is followed by and extra `:` it is not seen as an emoji anymore.
Diffstat (limited to 'src/doctokenizer.l')
-rw-r--r--src/doctokenizer.l8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index deac51c..4b513ab 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -689,7 +689,7 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
g_token->name = yytext;
return TK_SYMBOL;
}
-<St_Para,St_Text>{EMOJI} { /* emoji symbol */
+<St_Para,St_Text>{EMOJI}/[^:] { /* emoji symbol */
if (g_fileName == CiteConsts::fileName)
{
REJECT;
@@ -946,7 +946,7 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
g_token->name = yytext;
return TK_SYMBOL;
}
-<St_TitleN>{EMOJI} { /* emoji */
+<St_TitleN>{EMOJI}/[^:] { /* emoji */
if (g_fileName == CiteConsts::fileName)
{
REJECT;
@@ -993,7 +993,7 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
g_token->name = yytext;
return TK_SYMBOL;
}
-<St_TitleQ>{EMOJI} { /* emoji */
+<St_TitleQ>{EMOJI}/[^:] { /* emoji */
if (g_fileName == CiteConsts::fileName)
{
REJECT;
@@ -1143,7 +1143,7 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
g_token->name = yytext;
return TK_SYMBOL;
}
-<St_Ref2>{EMOJI} { /* emoji */
+<St_Ref2>{EMOJI}/[^:] { /* emoji */
if (g_fileName == CiteConsts::fileName)
{
REJECT;