diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2013-01-20 13:31:30 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-01-20 13:31:30 (GMT) |
commit | dcd4714c4413348d02eb7224dafee5d06be43dfb (patch) | |
tree | 3872f0367bbee22883a702d1d2f799c9a9c2e8ac /src/docparser.cpp | |
parent | 775ab3be95c02dd805aadc73ffbe3c18877c12a4 (diff) | |
download | Doxygen-dcd4714c4413348d02eb7224dafee5d06be43dfb.zip Doxygen-dcd4714c4413348d02eb7224dafee5d06be43dfb.tar.gz Doxygen-dcd4714c4413348d02eb7224dafee5d06be43dfb.tar.bz2 |
Release-1.8.3.1
Diffstat (limited to 'src/docparser.cpp')
-rw-r--r-- | src/docparser.cpp | 85 |
1 files changed, 53 insertions, 32 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp index c4f42f3..29b0030 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -3,7 +3,7 @@ * * * - * Copyright (C) 1997-2012 by Dimitri van Heesch. + * Copyright (C) 1997-2013 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -1517,6 +1517,39 @@ handlepara: return TRUE; } +//--------------------------------------------------------------------------- + +static int handleDocCopy(DocNode *parent,QList<DocNode> &children) +{ + int tok=doctokenizerYYlex(); + int cmdId = Mappers::cmdMapper->map(g_token->name); + if (tok!=TK_WHITESPACE) + { + warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: expected whitespace after %s command", + qPrint(g_token->name)); + return 0; + } + tok=doctokenizerYYlex(); + if (tok==0) + { + warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: unexpected end of comment block while parsing the " + "argument of command %s\n", qPrint(g_token->name)); + return 0; + } + else if (tok!=TK_WORD && tok!=TK_LNKWORD) + { + warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: unexpected token %s as the argument of %s", + tokToString(tok),qPrint(g_token->name)); + return 0; + } + DocCopy *cpy = new DocCopy(parent,g_token->name, + cmdId==CMD_COPYDOC || cmdId==CMD_COPYBRIEF, + cmdId==CMD_COPYDOC || cmdId==CMD_COPYDETAILS); + cpy->parse(children); + delete cpy; + return 0; +} + //--------------------------------------------------------------------------- @@ -1687,6 +1720,10 @@ static int internalValidatingParseDoc(DocNode *parent,QList<DocNode> &children, { delete par; } + if (retval==RetVal_CopyDoc) + { + retval=handleDocCopy(parent,children); + } } while (retval==TK_NEWPARA); if (lastPar) lastPar->markLast(); @@ -3164,6 +3201,10 @@ int DocInternal::parse(int level) { warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: Invalid list item found",doctokenizerYYlineno); } + else if (retval==RetVal_CopyDoc) + { + retval=handleDocCopy(this,m_children); + } } while (retval!=0 && retval!=RetVal_Section && retval!=RetVal_Subsection && @@ -5460,7 +5501,6 @@ int DocPara::handleCommand(const QCString &cmdName) m_children.append(new DocVerbatim(this,g_context,g_token->verb,DocVerbatim::Msc,g_isExample,g_exampleName)); if (retval==0) warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: msc section ended without end marker"); doctokenizerYYsetStatePara(); - VhdlDocGen::createFlowChart(g_memberDef); } break; case CMD_ENDCODE: @@ -5522,34 +5562,7 @@ int DocPara::handleCommand(const QCString &cmdName) case CMD_COPYDOC: // fall through case CMD_COPYBRIEF: // fall through case CMD_COPYDETAILS: - { - int tok=doctokenizerYYlex(); - if (tok!=TK_WHITESPACE) - { - warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: expected whitespace after %s command", - qPrint(cmdName)); - break; - } - tok=doctokenizerYYlex(); - if (tok==0) - { - warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: unexpected end of comment block while parsing the " - "argument of command %s\n", qPrint(cmdName)); - break; - } - else if (tok!=TK_WORD && tok!=TK_LNKWORD) - { - warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: unexpected token %s as the argument of %s", - tokToString(tok),qPrint(cmdName)); - break; - } - DocCopy *cpy = new DocCopy(this,g_token->name, - cmdId==CMD_COPYDOC || cmdId==CMD_COPYBRIEF, - cmdId==CMD_COPYDOC || cmdId==CMD_COPYDETAILS); - //m_children.append(cpy); - cpy->parse(m_children); - delete cpy; - } + retval = RetVal_CopyDoc; break; case CMD_INCLUDE: handleInclude(cmdName,DocInclude::Include); @@ -6442,7 +6455,7 @@ reparsetoken: } // handle the command - retval=handleCommand(g_token->name.copy()); + retval=handleCommand(g_token->name); DBG(("handleCommand returns %x\n",retval)); // check the return value @@ -6613,12 +6626,16 @@ int DocSection::parse() { warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: Invalid list item found"); } + else if (retval==RetVal_CopyDoc) + { + retval=handleDocCopy(this,m_children); + } } while (retval!=0 && retval!=RetVal_Internal && retval!=RetVal_Section && retval!=RetVal_Subsection && retval!=RetVal_Subsubsection && - retval!=RetVal_Paragraph + retval!=RetVal_Paragraph ); if (lastPar) lastPar->markLast(); @@ -6829,6 +6846,10 @@ void DocRoot::parse() { warn_doc_error(g_fileName,doctokenizerYYlineno,"warning: found paragraph command outside of subsubsection context!"); } + else if (retval==RetVal_CopyDoc) + { + retval=handleDocCopy(this,m_children); + } } while (retval!=0 && retval!=RetVal_Section && retval!=RetVal_Internal); if (lastPar) lastPar->markLast(); |