From 03fb8168b060f33fe6011604fb4b08549df36865 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 6 Nov 2019 12:37:28 +0100
Subject: Better warning message in case of illegal command

When having a problem like:
```
/** \file
  *
  * \link Something \see nothing2 \endlink
  *
  * \link Something @see nothing3 \endlink
  */
```
We will get a.o. the warnings:
```
.../aa.h:3: warning: Illegal command see as part of a \link
.../aa.h:5: warning: Illegal command see as part of a \link
```
it is not clear what the problem is. With this patch we get a little bit clearer warning:
```
.../aa.h:3: warning: Illegal command \see as part of a \link
.../aa.h:5: warning: Illegal command @see as part of a \link
```
---
 src/docparser.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/docparser.cpp b/src/docparser.cpp
index a22087e..568f7ed 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -803,14 +803,15 @@ static bool findDocsForMemberOrCompound(const char *commandName,
 inline void errorHandleDefaultToken(DocNode *parent,int tok,
                                QList<DocNode> &children,const char *txt)
 {
+  char *cmd_start = "\\";
   switch (tok)
   {
     case TK_COMMAND_AT:
-        // fall through
+      cmd_start = "@";
     case TK_COMMAND_BS:
       children.append(new DocWord(parent,TK_COMMAND_CHAR(tok) + g_token->name));
       warn_doc_error(g_fileName,doctokenizerYYlineno,"Illegal command %s as part of a %s",
-       qPrint(TK_COMMAND_CHAR(tok) + g_token->name), txt);
+       qPrint(cmd_start + g_token->name),txt);
       break;
     case TK_SYMBOL:
       warn_doc_error(g_fileName,doctokenizerYYlineno,"Unsupported symbol %s found found as part of a %s",
@@ -2312,6 +2313,7 @@ void DocSecRefList::parse()
   {
     if (tok==TK_COMMAND_AT || tok == TK_COMMAND_BS)
     {
+      char *cmd_start = (tok==TK_COMMAND_AT ? "@" : "\\");
       switch (Mappers::cmdMapper->map(g_token->name))
       {
         case CMD_SECREFITEM:
@@ -2339,7 +2341,7 @@ void DocSecRefList::parse()
           goto endsecreflist;
         default:
           warn_doc_error(g_fileName,doctokenizerYYlineno,"Illegal command %s as part of a \\secreflist",
-              qPrint(g_token->name));
+              qPrint(cmd_start + g_token->name));
           goto endsecreflist;
       }
     }
@@ -2646,9 +2648,11 @@ QCString DocLink::parse(bool isJavaLink,bool isXmlLink)
   {
     if (!defaultHandleToken(this,tok,m_children,FALSE))
     {
+      char *cmd_start = "\\";
       switch (tok)
       {
         case TK_COMMAND_AT:
+          cmd_start = "@";
         // fall through
         case TK_COMMAND_BS:
           switch (Mappers::cmdMapper->map(g_token->name))
@@ -2661,7 +2665,7 @@ QCString DocLink::parse(bool isJavaLink,bool isXmlLink)
               goto endlink;
             default:
               warn_doc_error(g_fileName,doctokenizerYYlineno,"Illegal command %s as part of a \\link",
-                  qPrint(g_token->name));
+                  qPrint(cmd_start + g_token->name));
               break;
           }
           break;
@@ -3793,9 +3797,11 @@ int DocHtmlDescTitle::parse()
   {
     if (!defaultHandleToken(this,tok,m_children))
     {
+      char *cmd_start = "\\";
       switch (tok)
       {
         case TK_COMMAND_AT:
+          cmd_start = "@";
         // fall through
         case TK_COMMAND_BS:
           {
@@ -3866,8 +3872,8 @@ int DocHtmlDescTitle::parse()
 
                 break;
               default:
-                warn_doc_error(g_fileName,doctokenizerYYlineno,"Illegal command \\%s found as part of a <dt> tag",
-                               qPrint(g_token->name));
+                warn_doc_error(g_fileName,doctokenizerYYlineno,"Illegal command %s found as part of a <dt> tag",
+                  qPrint(cmd_start + g_token->name));
             }
           }
           break;
-- 
cgit v0.12


From fa2e951d698c99feac64f5a480142482781ef8b8 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 6 Nov 2019 12:55:51 +0100
Subject: Better warning message in case of illegal command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Correcting compilation errors and warnings like:
```
 error: invalid conversion from ‘const char*’ to ‘char*’ [-fpermissive]

       char *cmd_start = (tok==TK_COMMAND_AT ? "@" : "\\");

warning: ISO C++ forbids converting a string constant to ‘char*’ [-Wwrite-strings]

       char *cmd_start = "\\";
```
---
 src/docparser.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/docparser.cpp b/src/docparser.cpp
index 568f7ed..ff21ce4 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -803,7 +803,7 @@ static bool findDocsForMemberOrCompound(const char *commandName,
 inline void errorHandleDefaultToken(DocNode *parent,int tok,
                                QList<DocNode> &children,const char *txt)
 {
-  char *cmd_start = "\\";
+  const char *cmd_start = "\\";
   switch (tok)
   {
     case TK_COMMAND_AT:
@@ -2313,7 +2313,7 @@ void DocSecRefList::parse()
   {
     if (tok==TK_COMMAND_AT || tok == TK_COMMAND_BS)
     {
-      char *cmd_start = (tok==TK_COMMAND_AT ? "@" : "\\");
+      const char *cmd_start = (tok==TK_COMMAND_AT ? "@" : "\\");
       switch (Mappers::cmdMapper->map(g_token->name))
       {
         case CMD_SECREFITEM:
@@ -2648,7 +2648,7 @@ QCString DocLink::parse(bool isJavaLink,bool isXmlLink)
   {
     if (!defaultHandleToken(this,tok,m_children,FALSE))
     {
-      char *cmd_start = "\\";
+      const char *cmd_start = "\\";
       switch (tok)
       {
         case TK_COMMAND_AT:
@@ -3797,7 +3797,7 @@ int DocHtmlDescTitle::parse()
   {
     if (!defaultHandleToken(this,tok,m_children))
     {
-      char *cmd_start = "\\";
+      const char *cmd_start = "\\";
       switch (tok)
       {
         case TK_COMMAND_AT:
-- 
cgit v0.12