From da3faf6b93fd3eb4e751d2c0cbd4ed9ceae7922b Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 21 Mar 2015 17:52:12 +0100 Subject: [PATCH] Warnings without filename In a number of instances we don't get the filename of where the error occurs but a name or even unknown between <> e.g. :1: warning: parameters of member fie_p2 are not (all) documented :1: warning: parameters of member p1.error are not (all) documented :1: warning: Member fie_p3 (function) of class p3::int1_p3 is not documented. This patch tries to overcome this problem by providing the right file: .../p2.h:8: warning: parameters of member fie_p2 are not (all) documented .../p1.py:7: warning: parameters of member p1.error are not (all) documented .../p3.f90:3: warning: Member fie_p3 (function) of class p3::int1_p3 is not documented. --- src/docparser.cpp | 4 ++-- src/memberdef.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/docparser.cpp b/src/docparser.cpp index fa777841213..7944bf753ed 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -519,8 +519,8 @@ static void checkUndocumentedParams() } else { - warn_doc_error(g_memberDef->docFile(), - g_memberDef->docLine(), + warn_doc_error(g_memberDef->getDefFileName(), + g_memberDef->getDefLine(), substitute(errMsg,"%","%%")); } } diff --git a/src/memberdef.cpp b/src/memberdef.cpp index f27a579b457..43311817dfc 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -2991,13 +2991,13 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, { if (!hasDocumentedParams()) { - warn_doc_error(docFile(),docLine(), + warn_doc_error(getDefFileName(),getDefLine(), "parameters of member %s are not (all) documented", qPrint(qualifiedName())); } if (!hasDocumentedReturnType() && isFunction() && hasDocumentation()) { - warn_doc_error(docFile(),docLine(), + warn_doc_error(getDefFileName(),getDefLine(), "return type of member %s is not documented", qPrint(qualifiedName())); } @@ -3230,7 +3230,7 @@ void MemberDef::warnIfUndocumented() !isReference() ) { - warn_undoc(getDefFileName(),getDefLine(),"Member %s%s (%s) of %s %s is not documented.", + warn_undoc(d->getDefFileName(),d->getDefLine(),"Member %s%s (%s) of %s %s is not documented.", qPrint(name()),qPrint(argsString()),qPrint(memberTypeName()),t,qPrint(d->name())); } }