Commit fff03ab9 authored by albert-github's avatar albert-github
Browse files

Bug 735745 - Spurious ASSERT message 

The ASSERT message is replaced with a normal message.
The cmdName might be overwritten so we have to save the name cmdName first, also the first test should not try to read any further, but jump to the end as well )a push has already been performed so a pop etc. is necessary)
parent 32aa9f2a

src/docparser.cpp

+10 −1
Original line number Original line Diff line number Diff line
@@ -4670,12 +4670,15 @@ int DocParamList::parse(const QCString &cmdName) 
  DBG(("DocParamList::parse() start\n"));

  DBG(("DocParamList::parse() start\n"));

  g_nodeStack.push(this);

  g_nodeStack.push(this);

  DocPara *par=0;

  DocPara *par=0;

  QCString saveCmdName = cmdName;





  int tok=doctokenizerYYlex();

  int tok=doctokenizerYYlex();

  if (tok!=TK_WHITESPACE)

  if (tok!=TK_WHITESPACE)

  {

  {

    warn_doc_error(g_fileName,doctokenizerYYlineno,"expected whitespace after %s command",

    warn_doc_error(g_fileName,doctokenizerYYlineno,"expected whitespace after %s command",

        qPrint(cmdName));

        qPrint(cmdName));

    retval=0;

    goto endparamlist;

  }

  }

  doctokenizerYYsetStateParam();

  doctokenizerYYsetStateParam();

  tok=doctokenizerYYlex();

  tok=doctokenizerYYlex();
@@ -4715,7 +4718,13 @@ int DocParamList::parse(const QCString &cmdName) 
    retval=0;

    retval=0;

    goto endparamlist;

    goto endparamlist;

  }

  }

  ASSERT(tok==TK_WHITESPACE);

  if (tok!=TK_WHITESPACE) /* premature end of comment block */

  {

    warn_doc_error(g_fileName,doctokenizerYYlineno,"unexpected token in comment block while parsing the "

        "argument of command %s",qPrint(saveCmdName));

    retval=0;

    goto endparamlist;

  }





  par = new DocPara(this);

  par = new DocPara(this);

  m_paragraphs.append(par);

  m_paragraphs.append(par);