mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve safety of loplugin inlinesimplememberfunctions

Browse Source 
don't try and move functions containing comments

Change-Id: I2de8fc8be851af979acf9d1a91e7cdd9a5dc6a32
This commit is contained in:
Noel Grandin
2014-06-09 09:37:32 +02:00
parent 184a00b962
commit 5d1e22d52a
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
compilerplugins/clang/inlinesimplememberfunctions.cxx
View File

@@ -171,6 +171,12 @@ bool InlineSimpleMemberFunctions::VisitCXXMethodDecl(const CXXMethodDecl * funct
"inlinesimpleaccessmethods", "inlinesimpleaccessmethods",
functionDecl->getSourceRange().getBegin()) functionDecl->getSourceRange().getBegin())
<< functionDecl->getSourceRange(); << functionDecl->getSourceRange();
// display the location of the class member declaration
report(
DiagnosticsEngine::Note,
"inlinesimpleaccessmethods",
functionDecl->getCanonicalDecl()->getSourceRange().getBegin())
<< functionDecl->getCanonicalDecl()->getSourceRange();
} }
return true; return true;
} }
@@ -197,6 +203,7 @@ bool InlineSimpleMemberFunctions::isInUnoIncludeFile(SourceLocation spellingLoca
|| name.startswith(SRCDIR "/include/systools/") || name.startswith(SRCDIR "/include/systools/")
|| name.startswith(SRCDIR "/include/typelib/") || name.startswith(SRCDIR "/include/typelib/")
|| name.startswith(SRCDIR "/include/uno/") || name.startswith(SRCDIR "/include/uno/")
|| name.startswith(SRCDIR "/workdir/")
|| name == SRCDIR "/include/comphelper/implbase_var.hxx"); || name == SRCDIR "/include/comphelper/implbase_var.hxx");
} }
@@ -239,6 +246,12 @@ bool InlineSimpleMemberFunctions::rewrite(const CXXMethodDecl * functionDecl) {
p1 = compiler.getSourceManager().getCharacterData( functionDecl->getBody()->getLocStart() ); p1 = compiler.getSourceManager().getCharacterData( functionDecl->getBody()->getLocStart() );
p2 = compiler.getSourceManager().getCharacterData( functionDecl->getBody()->getLocEnd() ); p2 = compiler.getSourceManager().getCharacterData( functionDecl->getBody()->getLocEnd() );
std::string s1( p1, p2 - p1 + 1); std::string s1( p1, p2 - p1 + 1);
/* we can't safely move around stuff containing comments, we mess up the resulting code */
if ( s1.find("/*") != std::string::npos || s1.find("//") != std::string::npos ) {
return false;
}
// strip linefeeds and any double-spaces, so we have a max of one space between tokens // strip linefeeds and any double-spaces, so we have a max of one space between tokens
s1 = ReplaceString(s1, "\r", ""); s1 = ReplaceString(s1, "\r", "");
s1 = ReplaceString(s1, "\n", ""); s1 = ReplaceString(s1, "\n", "");