From a06e660406d655568635521f6df161e3a7e5734b Mon Sep 17 00:00:00 2001 From: albert-github Date: Thu, 20 Dec 2018 12:10:04 +0100 Subject: 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. --- src/doctokenizer.l | 8 ++++---- 1 file 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; } -{EMOJI} { /* emoji symbol */ +{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; } -{EMOJI} { /* emoji */ +{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; } -{EMOJI} { /* emoji */ +{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; } -{EMOJI} { /* emoji */ +{EMOJI}/[^:] { /* emoji */ if (g_fileName == CiteConsts::fileName) { REJECT; -- cgit v0.12