Skip to content

C
core
Kaydet (Commit) cc26cfd3 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

use more hasPathnamePrefix 

Change-Id: I539e6aedad61d80b6ebe80104b77d720072395bd
üst b289cf8d
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 66 deletions
compilerplugins/clang/constparams.cxx
Dosyayı görüntüle @ cc26cfd3
......@@ -27,10 +27,6 @@
namespace
{
static bool startswith(const std::string& rStr, const char* pSubStr) {
return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
}
class ConstParams:
public loplugin::FunctionAddress<ConstParams>
{
......@@ -40,29 +36,29 @@ public:
virtual void run() override {
std::string fn(handler.getMainFileName());
loplugin::normalizeDotDotInFilePath(fn);
if (startswith(fn, SRCDIR "/sal/")
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sal/")
|| fn == SRCDIR "/jurt/source/pipe/staticsalhack.cxx"
|| startswith(fn, SRCDIR "/bridges/")
|| startswith(fn, SRCDIR "/binaryurp/")
|| startswith(fn, SRCDIR "/stoc/")
|| startswith(fn, WORKDIR "/YaccTarget/unoidl/source/sourceprovider-parser.cxx")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/bridges/")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/binaryurp/")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/stoc/")
|| loplugin::hasPathnamePrefix(fn, WORKDIR "/YaccTarget/unoidl/source/sourceprovider-parser.cxx")
// some weird calling through a function pointer
|| startswith(fn, SRCDIR "/svtools/source/table/defaultinputhandler.cxx")
|| startswith(fn, SRCDIR "/sdext/source/pdfimport/test/pdfunzip.cxx")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/svtools/source/table/defaultinputhandler.cxx")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/sdext/source/pdfimport/test/pdfunzip.cxx")
// windows only
|| startswith(fn, SRCDIR "/basic/source/sbx/sbxdec.cxx")
|| startswith(fn, SRCDIR "/sfx2/source/doc/syspath.cxx")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/basic/source/sbx/sbxdec.cxx")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/sfx2/source/doc/syspath.cxx")
// ignore this for now
|| startswith(fn, SRCDIR "/libreofficekit")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/libreofficekit")
// I end up with a
// CXXMemberCallExpr
// to a
// BuiltinType '<bound member function type>'
// and the AST gives me no further useful information.
|| startswith(fn, SRCDIR "/sw/source/core/doc/docfly.cxx")
|| startswith(fn, SRCDIR "/sw/source/core/doc/DocumentContentOperationsManager.cxx")
|| startswith(fn, SRCDIR "/sw/source/core/fields/cellfml.cxx")
|| startswith(fn, SRCDIR "/sw/source/filter/ww8/ww8par6.cxx")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/sw/source/core/doc/docfly.cxx")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/sw/source/core/doc/DocumentContentOperationsManager.cxx")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/sw/source/core/fields/cellfml.cxx")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/sw/source/filter/ww8/ww8par6.cxx")
)
return;
......
compilerplugins/clang/expressionalwayszero.cxx
Dosyayı görüntüle @ cc26cfd3
......@@ -23,10 +23,6 @@
namespace {
static bool startswith(const std::string& rStr, const char* pSubStr) {
return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
}
class ExpressionAlwaysZero:
public loplugin::FilteringPlugin<ExpressionAlwaysZero>
{
......@@ -40,23 +36,23 @@ public:
loplugin::normalizeDotDotInFilePath(fn);
// encoding of constant value for binary file format
if (startswith(fn, SRCDIR "/package/source/zipapi/ZipFile.cxx"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/package/source/zipapi/ZipFile.cxx"))
return;
// some auto-generated static data
if (startswith(fn, SRCDIR "/sal/textenc/tables.cxx"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sal/textenc/tables.cxx"))
return;
// nested conditional defines that are not worth cleaning up
if (startswith(fn, SRCDIR "/opencl/source/openclwrapper.cxx"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/opencl/source/openclwrapper.cxx"))
return;
// some kind of matrix calculation, the compiler will optimise it out anyway
if (startswith(fn, SRCDIR "/vcl/source/gdi/bitmap4.cxx"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/source/gdi/bitmap4.cxx"))
return;
// code follows a pattern
if (startswith(fn, SRCDIR "/svx/source/svdraw/svdhdl.cxx"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/svx/source/svdraw/svdhdl.cxx"))
return;
// looks like some kind of TODO marker
if (startswith(fn, SRCDIR "/chart2/source/view/main/PropertyMapper.cxx")
|| startswith(fn, SRCDIR "/sc/source/core/data/formulacell.cxx"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/chart2/source/view/main/PropertyMapper.cxx")
|| loplugin::hasPathnamePrefix(fn, SRCDIR "/sc/source/core/data/formulacell.cxx"))
return;
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
}
......
compilerplugins/clang/oncevar.cxx
Dosyayı görüntüle @ cc26cfd3
......@@ -25,10 +25,6 @@
namespace
{
bool startsWith(const std::string& rStr, const char* pSubStr) {
return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
}
Expr const * lookThroughInitListExpr(Expr const * expr) {
if (auto const ile = dyn_cast<InitListExpr>(expr->IgnoreParenImpCasts())) {
if (ile->getNumInits() == 1) {
......@@ -94,9 +90,9 @@ public:
|| fn == SRCDIR "/embeddedobj/source/msole/oleembed.cxx")
return;
// some of this is necessary
if (startsWith( fn, SRCDIR "/sal/qa/"))
if (loplugin::hasPathnamePrefix( fn, SRCDIR "/sal/qa/"))
return;
if (startsWith( fn, SRCDIR "/comphelper/qa/"))
if (loplugin::hasPathnamePrefix( fn, SRCDIR "/comphelper/qa/"))
return;
// TODO need to check calls via function pointer
if (fn == SRCDIR "/i18npool/source/textconversion/textconversion_zh.cxx"
......
compilerplugins/clang/unusedvariablemore.cxx
Dosyayı görüntüle @ cc26cfd3
......@@ -56,22 +56,17 @@ UnusedVariableMore::UnusedVariableMore(const InstantiationData& data)
{
}
static bool startswith(const std::string& rStr, const char* pSubStr)
{
return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
}
void UnusedVariableMore::run()
{
std::string fn(handler.getMainFileName());
loplugin::normalizeDotDotInFilePath(fn);
// ignore QA folders
if (startswith(fn, SRCDIR "/sal/qa/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sal/qa/"))
return;
if (startswith(fn, SRCDIR "/i18npool/qa/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/i18npool/qa/"))
return;
if (startswith(fn, SRCDIR "/sc/qa/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sc/qa/"))
return;
// vector of shared_ptr used to delay destruction
......
compilerplugins/clang/useuniqueptr.cxx
Dosyayı görüntüle @ cc26cfd3
......@@ -156,10 +156,6 @@ private:
std::string fn;
};
static bool startswith(const std::string& rStr, const char* pSubStr) {
return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
}
bool UseUniquePtr::VisitFunctionDecl(const FunctionDecl* functionDecl)
{
if (ignoreLocation(functionDecl))
......@@ -326,23 +322,23 @@ void UseUniquePtr::CheckDeleteLocalVar(const FunctionDecl* functionDecl, const C
}
}
if (startswith(fn, SRCDIR "/sal/qa/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sal/qa/"))
return;
if (startswith(fn, SRCDIR "/comphelper/qa/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/comphelper/qa/"))
return;
if (startswith(fn, SRCDIR "/cppuhelper/qa/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/cppuhelper/qa/"))
return;
if (startswith(fn, SRCDIR "/libreofficekit/qa/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/libreofficekit/qa/"))
return;
if (startswith(fn, SRCDIR "/vcl/qa/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/qa/"))
return;
if (startswith(fn, SRCDIR "/sc/qa/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sc/qa/"))
return;
if (startswith(fn, SRCDIR "/sfx2/qa/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sfx2/qa/"))
return;
if (startswith(fn, SRCDIR "/smoketest/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/smoketest/"))
return;
if (startswith(fn, WORKDIR))
if (loplugin::hasPathnamePrefix(fn, WORKDIR))
return;
// linked lists
if (fn == SRCDIR "/vcl/source/gdi/regband.cxx")
......@@ -442,13 +438,13 @@ void UseUniquePtr::CheckDeleteLocalVar(const FunctionDecl* functionDecl, const C
// alloc/free routines for the hand constructed virtual function table
if (fn == SRCDIR "/sal/textenc/convertisciidevangari.cxx")
return;
if (startswith(fn, SRCDIR "/bridges/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/bridges/"))
return;
// bootstrap_map
if (fn == SRCDIR "/sal/rtl/bootstrap.cxx")
return;
// too complicated for my small brain
if (startswith(fn, SRCDIR "/cppu/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/cppu/"))
return;
// linked list
if (fn == SRCDIR "/vcl/source/gdi/octree.cxx")
......@@ -475,10 +471,10 @@ void UseUniquePtr::CheckDeleteLocalVar(const FunctionDecl* functionDecl, const C
if (fn == SRCDIR "/lotuswordpro/source/filter/lwpfribptr.cxx")
return;
// complicated
if (startswith(fn, SRCDIR "/connectivity/source/drivers/file/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/connectivity/source/drivers/file/"))
return;
// complicated
if (startswith(fn, SRCDIR "/unodevtools/source/skeletonmaker/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/unodevtools/source/skeletonmaker/"))
return;
llvm::StringRef parentName;
......@@ -730,7 +726,7 @@ void UseUniquePtr::CheckLoopDelete(const FunctionDecl* functionDecl, const CXXDe
if (varDecl->hasInit() && isa<ExplicitCastExpr>(varDecl->getInit()->IgnoreImpCasts()))
return;
if (startswith(fn, SRCDIR "/vcl/qa/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/qa/"))
return;
// linked list
if (fn == SRCDIR "/registry/source/reflwrit.cxx")
......@@ -939,7 +935,7 @@ void UseUniquePtr::CheckMemberDeleteExpr(const FunctionDecl* functionDecl, const
if (ignoreLocation(fieldDecl))
return;
// to ignore things like the CPPUNIT macros
if (startswith(fn, WORKDIR "/"))
if (loplugin::hasPathnamePrefix(fn, WORKDIR "/"))
return;
// passes and stores pointers to member fields
if (fn == SRCDIR "/sot/source/sdstor/stgdir.hxx")
......@@ -960,14 +956,14 @@ void UseUniquePtr::CheckMemberDeleteExpr(const FunctionDecl* functionDecl, const
if (fn == SRCDIR "/sc/inc/formulacell.hxx")
return;
// some weird stuff going on here around struct Entity
if (startswith(fn, SRCDIR "/sax/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sax/"))
return;
if (startswith(fn, SRCDIR "/include/sax/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/include/sax/"))
return;
// manipulation of tree structures ie. StgAvlNode, don't lend themselves to std::unique_ptr
if (startswith(fn, SRCDIR "/sot/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sot/"))
return;
if (startswith(fn, SRCDIR "/include/sot/"))
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/include/sot/"))
return;
// the std::vector is being passed to another class
if (fn == SRCDIR "/sfx2/source/explorer/nochaos.cxx")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment