1fd27a7931
I seem to have missed quite a few in
commit 9f4d23c151
filter out some of the AST in the plugins
This nets me another 14% improvement
Change-Id: I39b980b49ced560f768045dbedd3ddfef29306c1
Reviewed-on: https://gerrit.libreoffice.org/59501
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
75 lines
2.1 KiB
C++
75 lines
2.1 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#include <cassert>
|
|
#include <string>
|
|
#include <iostream>
|
|
#include <fstream>
|
|
#include <set>
|
|
#include "plugin.hxx"
|
|
|
|
/**
|
|
Check for places where we declare a block directly inside a block
|
|
*/
|
|
namespace {
|
|
|
|
class BlockBlock:
|
|
public loplugin::FilteringRewritePlugin<BlockBlock>
|
|
{
|
|
public:
|
|
explicit BlockBlock(loplugin::InstantiationData const & data):
|
|
FilteringRewritePlugin(data) {}
|
|
|
|
virtual void run() override
|
|
{
|
|
StringRef fn(handler.getMainFileName());
|
|
if (loplugin::isSamePathname(fn, SRCDIR "/sal/osl/unx/file_misc.cxx"))
|
|
return;
|
|
|
|
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
|
|
}
|
|
|
|
bool VisitCompoundStmt(CompoundStmt const * );
|
|
};
|
|
|
|
bool BlockBlock::VisitCompoundStmt(CompoundStmt const * compound)
|
|
{
|
|
if (ignoreLocation(compound))
|
|
return true;
|
|
if (compound->size() != 1)
|
|
return true;
|
|
auto inner = *compound->body_begin();
|
|
if (!isa<CompoundStmt>(inner))
|
|
return true;
|
|
if (compiler.getSourceManager().isMacroBodyExpansion(compat::getBeginLoc(compound)))
|
|
return true;
|
|
if (compiler.getSourceManager().isMacroBodyExpansion(compat::getBeginLoc(inner)))
|
|
return true;
|
|
if (containsPreprocessingConditionalInclusion(compound->getSourceRange())) {
|
|
return true;
|
|
}
|
|
report(
|
|
DiagnosticsEngine::Warning,
|
|
"block directly inside block",
|
|
compat::getBeginLoc(compound))
|
|
<< compound->getSourceRange();
|
|
report(
|
|
DiagnosticsEngine::Note,
|
|
"inner block here",
|
|
compat::getBeginLoc(inner))
|
|
<< inner->getSourceRange();
|
|
return true;
|
|
}
|
|
|
|
loplugin::Plugin::Registration< BlockBlock > X("blockblock", true);
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|