diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-09-11 15:29:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-11 15:29:00 (GMT) |
| commit | f6b28d1ddab0131947fe80ba6632946492c39894 (patch) | |
| tree | 9ceaf0702966cf0bf2a9e91648a4d9f4e97bcb5e /src | |
| parent | ab538a3b97ea82805c30025d6cf17077ac6b9de8 (diff) | |
| parent | 10269d433ec433898ec61755568033c99c3cd301 (diff) | |
| download | Doxygen-f6b28d1ddab0131947fe80ba6632946492c39894.zip Doxygen-f6b28d1ddab0131947fe80ba6632946492c39894.tar.gz Doxygen-f6b28d1ddab0131947fe80ba6632946492c39894.tar.bz2 | |
Merge pull request #7253 from albert-github/feature/bug_irc
Bogus explicit link warning message from irc protocol name
Diffstat (limited to 'src')
| -rw-r--r-- | src/doctokenizer.l | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 311e445..4527855 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -353,6 +353,7 @@ ATTRNAME [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF\-]* ATTRIB {ATTRNAME}{WS}*("="{WS}*(("\""[^\"]*"\"")|("'"[^\']*"'")|[^ \t\r\n'"><]+))? URLCHAR [a-z_A-Z0-9\!\~\,\:\;\'\$\?\@\&\%\#\.\-\+\/\=] URLMASK ({URLCHAR}+([({]{URLCHAR}*[)}])?)+ +URLPROTOCOL ("http:"|"https:"|"ftp:"|"file:"|"news:"|"irc") FILESCHAR [a-z_A-Z0-9\\:\\\/\-\+&#] FILEECHAR [a-z_A-Z0-9\-\+&#] HFILEMASK ("."{FILESCHAR}*{FILEECHAR}+)+ @@ -624,17 +625,17 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} } return TK_COMMAND_SEL(); } -<St_Para>("http:"|"https:"|"ftp:"|"file:"|"news:"){URLMASK}/\. { // URL. +<St_Para>{URLPROTOCOL}{URLMASK}/\. { // URL. g_token->name=yytext; g_token->isEMailAddr=FALSE; return TK_URL; } -<St_Para>("http:"|"https:"|"ftp:"|"file:"|"news:"){URLMASK} { // URL +<St_Para>{URLPROTOCOL}{URLMASK} { // URL g_token->name=yytext; g_token->isEMailAddr=FALSE; return TK_URL; } -<St_Para>"<"("http:"|"https:"|"ftp:"|"file:"|"news:"){URLMASK}">" { // URL +<St_Para>"<"{URLPROTOCOL}{URLMASK}">" { // URL g_token->name=yytext; g_token->name = g_token->name.mid(1,g_token->name.length()-2); g_token->isEMailAddr=FALSE; |