diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-08-06 16:43:59 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-08-06 16:43:59 (GMT) |
| commit | 533c5cadfad41763f294c49f8cb7a19fbc5a19d8 (patch) | |
| tree | f4e4c9cdf1466a8fad1b6c3192859f47671190a7 /src | |
| parent | f96507054f1af54bee57734ec3d9a25b821feb27 (diff) | |
| parent | 69f51747c37bb24b7e296ff01bb7e45a624f6225 (diff) | |
| download | Doxygen-533c5cadfad41763f294c49f8cb7a19fbc5a19d8.zip Doxygen-533c5cadfad41763f294c49f8cb7a19fbc5a19d8.tar.gz Doxygen-533c5cadfad41763f294c49f8cb7a19fbc5a19d8.tar.bz2 | |
Merge branch 'master' of https://github.com/analizo/doxygen into analizo-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/code.l | 16 | ||||
| -rw-r--r-- | src/memberdef.cpp | 11 | ||||
| -rw-r--r-- | src/memberdef.h | 5 |
3 files changed, 32 insertions, 0 deletions
@@ -2472,6 +2472,10 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" BEGIN(FuncCall); } <Body>{FLOWCONDITION}/{BN}*"(" { + if (g_currentMemberDef && g_currentMemberDef->isFunction()) + { + g_currentMemberDef->addFlowKeyWord(); + } startFontClass("keywordflow"); codifyLines(yytext); endFontClass(); @@ -2489,6 +2493,10 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } } <Body>{FLOWCONDITION}/([^a-z_A-Z0-9]) { + if (g_currentMemberDef && g_currentMemberDef->isFunction()) + { + g_currentMemberDef->addFlowKeyWord(); + } startFontClass("keywordflow"); codifyLines(yytext); endFontClass(); @@ -2503,6 +2511,10 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" endFontClass(); } <Body>{FLOWCONDITION}/{B}* { + if (g_currentMemberDef && g_currentMemberDef->isFunction()) + { + g_currentMemberDef->addFlowKeyWord(); + } startFontClass("keywordflow"); codifyLines(yytext); endFontClass(); @@ -3038,6 +3050,10 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" endFontClass(); } <MemberCall2,FuncCall>{FLOWCONDITION}/([^a-z_A-Z0-9]) { + if (g_currentMemberDef && g_currentMemberDef->isFunction()) + { + g_currentMemberDef->addFlowKeyWord(); + } addParmType(); g_parmName=yytext; startFontClass("keywordflow"); diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 4693bdb..d0b70bb 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -1581,6 +1581,7 @@ MemberDefImpl::MemberDefImpl(const char *df,int dl,int dc, //printf("MemberDefImpl::MemberDef(%s)\n",na); m_impl = new MemberDefImpl::IMPL; m_impl->init(this,t,a,e,p,v,s,r,mt,tal,al,meta); + number_of_flowkw = 1; m_isLinkableCached = 0; m_isConstructorCached = 0; m_isDestructorCached = 0; @@ -5970,6 +5971,16 @@ void MemberDefImpl::invalidateCachedArgumentTypes() invalidateCachedTypesInArgumentList(m_impl->declArgList); } +void MemberDef::addFlowKeyWord() +{ + number_of_flowkw++; +} + +int MemberDef::numberOfFlowKeyWords() +{ + return number_of_flowkw; +} + //---------------- QCString MemberDefImpl::displayName(bool) const diff --git a/src/memberdef.h b/src/memberdef.h index af4fb0a..a94005f 100644 --- a/src/memberdef.h +++ b/src/memberdef.h @@ -183,6 +183,7 @@ class MemberDef : virtual public Definition virtual bool isSliceLocal() const = 0; virtual bool isConstExpr() const = 0; + int numberOfFlowKeyWords(); // derived getters virtual bool isFriendToHide() const = 0; virtual bool isNotFriend() const = 0; @@ -280,6 +281,8 @@ class MemberDef : virtual public Definition // ---- setters ----- //----------------------------------------------------------------------------------- + void addFlowKeyWord(); + // set functions virtual void setMemberType(MemberType t) = 0; virtual void setDefinition(const char *d) = 0; @@ -405,6 +408,8 @@ class MemberDef : virtual public Definition const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd, bool onlyText=FALSE) const = 0; + int number_of_flowkw; + // write helpers virtual void warnIfUndocumented() const = 0; virtual void warnIfUndocumentedParams() const = 0; |