Renamed option to AUTOLINK_IGNORE_WORDS and modernized code a bit

Author: doxygen

src/config.xml

@@ -728,16 +728,17 @@ Go to the <a href="commands.html">next</a> section or return to the
  or namespaces to their corresponding documentation. Such a link can be
  prevented in individual cases by putting a \c % sign in front of the word or
  globally by setting \c AUTOLINK_SUPPORT to \c NO. Words listed in the
- \c AUTOLINK_IGNORED_TOKENS tag are excluded from automatic linking.
+ \c AUTOLINK_IGNORE_WORDS tag are excluded from automatic linking.
 ]]>
       </docs>
     </option>
-    <option type='list' id='AUTOLINK_IGNORED_TOKENS' format='string' depends='AUTOLINK_SUPPORT'>
+    <option type='list' id='AUTOLINK_IGNORE_WORDS' format='string' depends='AUTOLINK_SUPPORT'>
       <docs>
 <![CDATA[
-  This tag specifies a list of keywords that shall be ignored when generating
-  links via the AUTOLINK_SUPPORT. This list does not affect affect links
-  explictly created using the \# and the \\link ..  \\endlink commands.
+  This tag specifies a list of words that, when matching the start of a word in the documentation,
+  will suppress auto links generation, if it is enabled via AUTOLINK_SUPPORT. 
+  This list does not affect affect links explictly created using \# or 
+  the \ref cmdlink "\\link" or \ref cmdref "\\ref" commands.
 ]]>
       </docs>
     </option>

src/docparser.cpp

@@ -775,26 +775,19 @@ void DocParser::handleUnclosedStyleCommands()
   }
 }
 
-bool DocParser::matchWord(const QCString &word,const StringVector &l)
-{
-  for (const auto &s : l)
-  {
-    std::string prefix = s.substr(0,word.length());
-    if (qstrcmp(prefix.c_str(),word)==0)
-    {
-      return TRUE;
-    }
-  }
-  return FALSE;
-}
-
 void DocParser::handleLinkedWord(DocNodeVariant *parent,DocNodeList &children,bool ignoreAutoLinkFlag)
 {
+  // helper to check if word w starts with any of the words in AUTOLINK_IGNORE_WORDS
+  auto ignoreWord = [](const QCString &w) -> bool {
+    const auto &list = Config_getList(AUTOLINK_IGNORE_WORDS);
+    return std::find_if(list.begin(), list.end(),
+                       [&w](const auto &ignore) { return w.startsWith(ignore); }
+                      )!=list.end();
+  };
   QCString name = linkToText(context.lang,context.token->name,TRUE);
   AUTO_TRACE("word={}",name);
   bool autolinkSupport = Config_getBool(AUTOLINK_SUPPORT);
-  if ((!autolinkSupport && !ignoreAutoLinkFlag)
-      || matchWord(context.token->name,Config_getList(AUTOLINK_IGNORED_TOKENS))) // no autolinking -> add as normal word
+  if ((!autolinkSupport && !ignoreAutoLinkFlag) || ignoreWord(context.token->name)) // no autolinking -> add as normal word
   {
     children.append<DocWord>(this,parent,name);
     return;

src/docparser_p.h

@@ -134,7 +134,6 @@ class DocParser : public IDocParser
     void handleAnchor(DocNodeVariant *parent,DocNodeList &children);
     void handlePrefix(DocNodeVariant *parent,DocNodeList &children);
     void handleImage(DocNodeVariant *parent, DocNodeList &children);
-    bool matchWord(const QCString &word,const StringVector &l);
     void readTextFileByName(const QCString &file,QCString &text);
 
     std::stack< DocParserContext > contextStack;

src/qcstring.h

@@ -495,6 +495,11 @@ class QCString
       return m_rep.rfind(s,0)==0; // looking "backward" starting and ending at index 0
     }
 
+    bool startsWith( const std::string &s) const
+    {
+      return m_rep.rfind(s,0)==0; // looking "backward" starting and ending at index 0
+    }
+
     bool startsWith( const QCString &s ) const
     {
       if (m_rep.empty() || s.isEmpty()) return s.isEmpty();
@@ -508,6 +513,12 @@ class QCString
       return m_rep.length()>=l && m_rep.compare(m_rep.length()-l, l, s, l)==0;
     }
 
+    bool endsWith(const std::string &s) const
+    {
+      size_t l = s.length();
+      return m_rep.length()>=l && m_rep.compare(m_rep.length()-l, l, s)==0;
+    }
+
     bool endsWith(const QCString &s) const
     {
       size_t l = s.length();