From 7a2164d252a0cb5410ab13b0ca1611a8e94e3c99 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sun, 22 Nov 2015 19:22:28 +0100 Subject: Bug 758132 - Brief description of non documented functions In case a function or an other item is not documented and EXTRACT_ALL has not been specified it should not appear in the list with brief description of functions etc. (This patch supersedes the patch as proposed in pull request 411 based on the comments from Dimitri van Heesch) --- src/classdef.cpp | 2 +- src/dirdef.cpp | 2 ++ src/groupdef.cpp | 3 +++ src/memberdef.cpp | 1 + src/memberlist.cpp | 3 ++- src/namespacedef.cpp | 2 +- 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/classdef.cpp b/src/classdef.cpp index 88f9a70..7d9e118 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -1849,7 +1849,7 @@ void ClassDef::writeDeclarationLink(OutputList &ol,bool &found,const char *heade //static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); //static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); SrcLangExt lang = getLanguage(); - if (visibleInParentsDeclList()) + if (visibleInParentsDeclList() && hasDocumentation()) { if (!found) // first class { diff --git a/src/dirdef.cpp b/src/dirdef.cpp index 28c073e..8b7989d 100644 --- a/src/dirdef.cpp +++ b/src/dirdef.cpp @@ -228,6 +228,7 @@ void DirDef::writeSubDirList(OutputList &ol) DirDef *dd; for (;(dd=it.current());++it) { + if (!dd->hasDocumentation()) continue; ol.startMemberDeclaration(); ol.startMemberItem(dd->getOutputFileBase(),0); ol.parseText(theTranslator->trDir(FALSE,TRUE)+" "); @@ -266,6 +267,7 @@ void DirDef::writeFileList(OutputList &ol) FileDef *fd; for (;(fd=it.current());++it) { + if (!fd->hasDocumentation()) continue; ol.startMemberDeclaration(); ol.startMemberItem(fd->getOutputFileBase(),0); ol.docify(theTranslator->trFile(FALSE,TRUE)+" "); diff --git a/src/groupdef.cpp b/src/groupdef.cpp index 55d3733..7a74c65 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -824,6 +824,7 @@ void GroupDef::writeFiles(OutputList &ol,const QCString &title) FileDef *fd; for (;(fd=it.current());++it) { + if (!fd->hasDocumentation()) continue; ol.startMemberDeclaration(); ol.startMemberItem(fd->getOutputFileBase(),0); ol.docify(theTranslator->trFile(FALSE,TRUE)+" "); @@ -877,6 +878,7 @@ void GroupDef::writeNestedGroups(OutputList &ol,const QCString &title) { if (gd->isVisible()) { + if (!gd->hasDocumentation()) continue; ol.startMemberDeclaration(); ol.startMemberItem(gd->getOutputFileBase(),0); //ol.docify(theTranslator->trGroup(FALSE,TRUE)); @@ -910,6 +912,7 @@ void GroupDef::writeDirs(OutputList &ol,const QCString &title) DirDef *dd; for (;(dd=it.current());++it) { + if (!dd->hasDocumentation()) continue; ol.startMemberDeclaration(); ol.startMemberItem(dd->getOutputFileBase(),0); ol.parseText(theTranslator->trDir(FALSE,TRUE)); diff --git a/src/memberdef.cpp b/src/memberdef.cpp index a8e2692..c99bf3c 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -1422,6 +1422,7 @@ void MemberDef::writeDeclaration(OutputList &ol, Definition *d=0; ASSERT (cd!=0 || nd!=0 || fd!=0 || gd!=0); // member should belong to something if (cd) d=cd; else if (nd) d=nd; else if (fd) d=fd; else d=gd; + if (!hasDocumentation()) return; //_writeTagData(compoundType); _addToSearchIndex(); diff --git a/src/memberlist.cpp b/src/memberlist.cpp index b985412..b253682 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -387,7 +387,8 @@ void MemberList::writePlainDeclarations(OutputList &ol, } // if this is an anonymous enum and there are variables of this // enum type (i.e. enumVars>0), then we do not show the enum here. - if (enumVars==0) // show enum here + if ((enumVars==0) // show enum here + && md->hasDocumentation()) { //printf("Enum!!\n"); if (first) diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp index a2341c7..948c86a 100644 --- a/src/namespacedef.cpp +++ b/src/namespacedef.cpp @@ -984,7 +984,7 @@ void NamespaceSDict::writeDeclaration(OutputList &ol,const char *title, ol.startMemberList(); for (ni.toFirst();(nd=ni.current());++ni) { - if (nd->isLinkable()) + if (nd->isLinkable() && nd->hasDocumentation()) { SrcLangExt lang = nd->getLanguage(); if (lang==SrcLangExt_IDL && (isConstantGroup != nd->isConstantGroup())) -- cgit v0.12 From a8c73cdbe37cc53c398002d20e94037552a8fb55 Mon Sep 17 00:00:00 2001 From: lameventanas Date: Wed, 25 Nov 2015 20:18:54 +0900 Subject: Fixed preprocessor macros for flex version check --- src/code.l | 2 +- src/pycode.l | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/code.l b/src/code.l index f014924..5b8a084 100644 --- a/src/code.l +++ b/src/code.l @@ -3700,7 +3700,7 @@ void codeFreeScanner() extern "C" { // some bogus code to keep the compiler happy void codeYYdummy() { yy_flex_realloc(0,0); } } -#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 +#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." #endif diff --git a/src/pycode.l b/src/pycode.l index 2b2a668..c3219d9 100644 --- a/src/pycode.l +++ b/src/pycode.l @@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/, extern "C" { // some bogus code to keep the compiler happy void pycodeYYdummy() { yy_flex_realloc(0,0); } } -#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 +#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33 #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)." #endif -- cgit v0.12 From c6bf96520bcff56d3fd67d4277c05b8db9ac2128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=9Aniatowski?= Date: Thu, 3 Dec 2015 09:01:31 +0100 Subject: Fix computeCommonDirPrefix sometimes not finding the correct prefix The code in some cases would search backwards in a string starting from an offset beyond the string's length. Adjust so that doesn't happen and the code doesn't mistakenly assume there is no common dir prefix. This bug has in some scenarios led to absolute paths being used for dir_(md5).html links, making doxygen output needlessly depend on details of build-time paths. --- src/dirdef.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dirdef.cpp b/src/dirdef.cpp index 28c073e..10adcc9 100644 --- a/src/dirdef.cpp +++ b/src/dirdef.cpp @@ -836,6 +836,7 @@ static void computeCommonDirPrefix() else // dir is shorter than path -> take path of dir as new start { path=dir->name(); + l=path.length(); int i=path.findRev('/',l-2); if (i==-1) // no unique prefix -> stop { -- cgit v0.12