From 2001c933292d3dd25ebc6634dab62aab7389c5bc Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 6 Nov 2019 18:46:24 +0100
Subject: Output of unknown xml/html tag

When having a problem like:
```
/** \file

- Just name <name>
- name plus subname <name subname>
- name plus twice subname <name subname subname>
- name plus subname subname="" <name subname subname="">
 */
```
we get correctly the warnings:
```
.../aa.h:3: warning: Unsupported xml/html tag <name> found
.../aa.h:4: warning: Unsupported xml/html tag <name> found
.../aa.h:5: warning: Unsupported xml/html tag <name> found
.../aa.h:6: warning: Unsupported xml/html tag <name> found
```
but the output doesn't look good as there is `=""` added:
```
    Just name <name>
    name plus subname <name subname="">
    name plus twice subname <name subname="" subname="">
    name plus subname subname="" <name subname="" subname="">
```

This patch fixes this output.
---
 src/docparser.cpp  |  2 +-
 src/doctokenizer.h |  1 +
 src/doctokenizer.l | 31 +++++++++++++++++++++----------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/docparser.cpp b/src/docparser.cpp
index a22087e..f3ccbf5 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -6286,7 +6286,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
       break;
     case HTML_UNKNOWN:
       warn_doc_error(g_fileName,doctokenizerYYlineno,"Unsupported xml/html tag <%s> found", qPrint(tagName));
-      m_children.append(new DocWord(this, "<"+tagName+tagHtmlAttribs.toString()+">"));
+      m_children.append(new DocWord(this, "<"+tagName+g_token->attribsStr+">"));
       break;
   case XML_INHERITDOC:
       handleInheritDoc();
diff --git a/src/doctokenizer.h b/src/doctokenizer.h
index f89069c..e95c4c0 100644
--- a/src/doctokenizer.h
+++ b/src/doctokenizer.h
@@ -100,6 +100,7 @@ struct TokenInfo
   HtmlAttribList attribs;
   bool endTag;
   bool emptyTag;
+  QCString attribsStr;
 
   // whitespace
   QCString chars;
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index 22b14a0..016b621 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -39,6 +39,7 @@
 #include "doxygen.h"
 #include "portable.h"
 #include "cite.h"
+#include "growbuf.h"
 
 #define YY_NO_INPUT 1
 #define YY_NO_UNISTD_H 1
@@ -177,6 +178,10 @@ static void processSection()
 
 static void handleHtmlTag()
 {
+  static GrowBuf growBuf;
+  growBuf.clear();
+  g_token->attribsStr="";
+
   QCString tagText=yytext;
   g_token->attribs.clear();
   g_token->endTag = FALSE;
@@ -207,54 +212,58 @@ static void handleHtmlTag()
   {
     char c=tagText.at(i);
     // skip spaces
-    while (i<(int)yyleng && isspace((uchar)c)) { c=tagText.at(++i); }
+    while (i<(int)yyleng && isspace((uchar)c)) { growBuf.addChar(c);c=tagText.at(++i); }
     // check for end of the tag
     if (c == '>') break;
     // Check for XML style "empty" tag.
     if (c == '/') 
     {
+      growBuf.addChar(c);
       g_token->emptyTag = TRUE;
       break;
     }
     startName=i;
     // search for end of name
-    while (i<(int)yyleng && !isspace((uchar)c) && c!='=' && c!= '>') { c=tagText.at(++i); }
+    while (i<(int)yyleng && !isspace((uchar)c) && c!='=' && c!= '>') { growBuf.addChar(c);c=tagText.at(++i); }
     endName=i;
     HtmlAttrib opt;
     opt.name  = tagText.mid(startName,endName-startName).lower(); 
     // skip spaces
-    while (i<(int)yyleng && isspace((uchar)c)) { c=tagText.at(++i); } 
+    while (i<(int)yyleng && isspace((uchar)c)) { growBuf.addChar(c);c=tagText.at(++i); } 
     if (tagText.at(i)=='=') // option has value
     {
+      growBuf.addChar(c);
       c=tagText.at(++i);
       // skip spaces
-      while (i<(int)yyleng && isspace((uchar)c)) { c=tagText.at(++i); } 
+      while (i<(int)yyleng && isspace((uchar)c)) { growBuf.addChar(c);c=tagText.at(++i); } 
       if (tagText.at(i)=='\'') // option '...'
       {
+        growBuf.addChar(c);
         c=tagText.at(++i);
 	startAttrib=i;
 	
 	// search for matching quote 
-        while (i<(int)yyleng && c!='\'') { c=tagText.at(++i); } 
+        while (i<(int)yyleng && c!='\'') { growBuf.addChar(c);c=tagText.at(++i); } 
 	endAttrib=i;
-        if (i<(int)yyleng) c=tagText.at(++i);
+        if (i<(int)yyleng) {growBuf.addChar(c);c=tagText.at(++i);}
       }
       else if (tagText.at(i)=='"') // option "..."
       {
+        growBuf.addChar(c);
         c=tagText.at(++i);
 	startAttrib=i;
 	// search for matching quote 
-        while (i<(int)yyleng && c!='"') { c=tagText.at(++i); } 
+        while (i<(int)yyleng && c!='"') { growBuf.addChar(c);c=tagText.at(++i); } 
 	endAttrib=i;
-        if (i<(int)yyleng) c=tagText.at(++i);
+        if (i<(int)yyleng) {growBuf.addChar(c);c=tagText.at(++i);}
       }
       else // value without any quotes
       {
 	startAttrib=i;
 	// search for separator or end symbol
-        while (i<(int)yyleng && !isspace((uchar)c) && c!='>') { c=tagText.at(++i); } 
+        while (i<(int)yyleng && !isspace((uchar)c) && c!='>') { growBuf.addChar(c);c=tagText.at(++i); } 
 	endAttrib=i;
-	if (i<(int)yyleng) c=tagText.at(++i);
+        if (i<(int)yyleng) {growBuf.addChar(c);c=tagText.at(++i);}
       }
       opt.value  = tagText.mid(startAttrib,endAttrib-startAttrib); 
       if (opt.name == "align") opt.value = opt.value.lower();
@@ -271,6 +280,8 @@ static void handleHtmlTag()
     //    opt.name.data(),opt.value.data());
     g_token->attribs.append(&opt);
   }
+  growBuf.addChar(0);
+  g_token->attribsStr = growBuf.get();
 }
   
 static QCString stripEmptyLines(const QCString &s)
-- 
cgit v0.12