feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Minor cleanups in CompilerOptionsBuilder

Browse Source 
Change-Id: Iaf5af70136bceed52d19622c01d9d7147e5abeea
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-01-09 13:56:00 +01:00
parent 591cc5a8c4
commit 7109e8f050
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
View File

@@ -476,7 +476,7 @@ private:
} }
CppTools::CompilerOptionsBuilder builder(m_projectPart); CppTools::CompilerOptionsBuilder builder(m_projectPart);
builder.updateLanguageOption(fileKind); builder.updateFileLanguage(fileKind);
m_options.append(builder.options()); m_options.append(builder.options());
} }

2
src/plugins/clangcodemodel/clangutils.cpp
View File

@@ -316,7 +316,7 @@ static QJsonObject createFileObject(CompilerOptionsBuilder &optionsBuilder,
const ::Utils::FileName &buildDir) const ::Utils::FileName &buildDir)
{ {
const ProjectFile::Kind kind = ProjectFile::classify(projFile.path); const ProjectFile::Kind kind = ProjectFile::classify(projFile.path);
optionsBuilder.updateLanguageOption(kind); optionsBuilder.updateFileLanguage(kind);
QJsonObject fileObject; QJsonObject fileObject;
fileObject["file"] = projFile.path; fileObject["file"] = projFile.path;

10
src/plugins/cpptools/compileroptionsbuilder.cpp
View File

@@ -110,8 +110,8 @@ QStringList CompilerOptionsBuilder::build(ProjectFile::Kind fileKind,
addTargetTriple(); addTargetTriple();
addExtraCodeModelFlags(); addExtraCodeModelFlags();
updateLanguageOption(fileKind); updateFileLanguage(fileKind);
addOptionsForLanguage(/*checkForBorlandExtensions*/ true); addLanguageVersionAndExtensions();
addToolchainAndProjectMacros(); addToolchainAndProjectMacros();
undefineClangVersionMacrosForMsvc(); undefineClangVersionMacrosForMsvc();
@@ -316,7 +316,7 @@ void CompilerOptionsBuilder::addMacros(const ProjectExplorer::Macros &macros)
m_options.append(options); m_options.append(options);
} }
void CompilerOptionsBuilder::updateLanguageOption(ProjectFile::Kind fileKind) void CompilerOptionsBuilder::updateFileLanguage(ProjectFile::Kind fileKind)
{ {
const bool objcExt = m_projectPart.languageExtensions const bool objcExt = m_projectPart.languageExtensions
& ProjectExplorer::LanguageExtension::ObjectiveC; & ProjectExplorer::LanguageExtension::ObjectiveC;
@@ -332,7 +332,7 @@ void CompilerOptionsBuilder::updateLanguageOption(ProjectFile::Kind fileKind)
m_options[langOptIndex + 1] = options[1]; m_options[langOptIndex + 1] = options[1];
} }
void CompilerOptionsBuilder::addOptionsForLanguage(bool checkForBorlandExtensions) void CompilerOptionsBuilder::addLanguageVersionAndExtensions()
{ {
using ProjectExplorer::LanguageExtension; using ProjectExplorer::LanguageExtension;
using ProjectExplorer::LanguageVersion; using ProjectExplorer::LanguageVersion;
@@ -381,7 +381,7 @@ void CompilerOptionsBuilder::addOptionsForLanguage(bool checkForBorlandExtension
if (languageExtensions & LanguageExtension::OpenMP) if (languageExtensions & LanguageExtension::OpenMP)
options << "-fopenmp"; options << "-fopenmp";
if (checkForBorlandExtensions && (languageExtensions & LanguageExtension::Borland)) if (languageExtensions & LanguageExtension::Borland)
options << "-fborland-extensions"; options << "-fborland-extensions";
m_options.append(options); m_options.append(options);

4
src/plugins/cpptools/compileroptionsbuilder.h
View File

@@ -62,8 +62,8 @@ public:
void addTargetTriple(); void addTargetTriple();
void addExtraCodeModelFlags(); void addExtraCodeModelFlags();
void insertWrappedQtHeaders(); void insertWrappedQtHeaders();
void addOptionsForLanguage(bool checkForBorlandExtensions = true); void addLanguageVersionAndExtensions();
void updateLanguageOption(ProjectFile::Kind fileKind); void updateFileLanguage(ProjectFile::Kind fileKind);
void addMsvcCompatibilityVersion(); void addMsvcCompatibilityVersion();
void undefineCppLanguageFeatureMacrosForMsvc2015(); void undefineCppLanguageFeatureMacrosForMsvc2015();

8
tests/unit/unittest/compileroptionsbuilder-test.cpp
View File

@@ -364,7 +364,7 @@ TEST_F(CompilerOptionsBuilder, InsertWrappedQtHeaders)
TEST_F(CompilerOptionsBuilder, SetLanguageVersion) TEST_F(CompilerOptionsBuilder, SetLanguageVersion)
{ {
compilerOptionsBuilder.updateLanguageOption(ProjectFile::CXXSource); compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource);
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-x", "c++")); ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-x", "c++"));
} }
@@ -373,16 +373,16 @@ TEST_F(CompilerOptionsBuilder, HandleLanguageExtension)
{ {
projectPart.languageExtensions = ProjectExplorer::LanguageExtension::ObjectiveC; projectPart.languageExtensions = ProjectExplorer::LanguageExtension::ObjectiveC;
compilerOptionsBuilder.updateLanguageOption(ProjectFile::CXXSource); compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource);
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-x", "objective-c++")); ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-x", "objective-c++"));
} }
TEST_F(CompilerOptionsBuilder, UpdateLanguageVersion) TEST_F(CompilerOptionsBuilder, UpdateLanguageVersion)
{ {
compilerOptionsBuilder.updateLanguageOption(ProjectFile::CXXSource); compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource);
compilerOptionsBuilder.updateLanguageOption(ProjectFile::CXXHeader); compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXHeader);
ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-x", "c++-header")); ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-x", "c++-header"));
} }