Apply clang-format
This commit is contained in:
parent
add8ddaeec
commit
69d4fa193f
|
@ -25,7 +25,8 @@ CodeFactory::ToolInvocation::ToolInvocation(CodeFactory &factory)
|
|||
fileManager.Retain();
|
||||
}
|
||||
|
||||
CodeFactory::CodeFactory(const char *applicationPath, const std::vector<const char *> &sourceFiles, const std::vector<string> &clangOptions, std::ostream &os)
|
||||
CodeFactory::CodeFactory(
|
||||
const char *applicationPath, const std::vector<const char *> &sourceFiles, const std::vector<string> &clangOptions, std::ostream &os)
|
||||
: m_applicationPath(applicationPath)
|
||||
, m_sourceFiles(sourceFiles)
|
||||
, m_clangOptions(clangOptions)
|
||||
|
|
|
@ -67,21 +67,20 @@ int main(int argc, char *argv[])
|
|||
|
||||
// compose options passed to the clang tool invocation
|
||||
vector<string> clangOptions;
|
||||
if(clangOptionsArg.isPresent()) {
|
||||
if (clangOptionsArg.isPresent()) {
|
||||
// add additional options specified via CLI argument
|
||||
for(const auto *const value : clangOptionsArg.values(0)) {
|
||||
for (const auto *const value : clangOptionsArg.values(0)) {
|
||||
// split options by ";" - not nice but this eases using CMake generator expressions
|
||||
const auto splittedValues(splitString<vector<string>>(value, ";", EmptyPartsTreat::Omit));
|
||||
clangOptions.reserve(clangOptions.size() + splittedValues.size());
|
||||
for(const auto &splittedValue : splittedValues) {
|
||||
for (const auto &splittedValue : splittedValues) {
|
||||
clangOptions.emplace_back(move(splittedValue));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// configure code generator
|
||||
CodeFactory factory(
|
||||
parser.executable(), inputFileArg.values(0), clangOptions, *os);
|
||||
CodeFactory factory(parser.executable(), inputFileArg.values(0), clangOptions, *os);
|
||||
// add only specified generators if the --generator argument is present
|
||||
if (generatorsArg.isPresent()) {
|
||||
// find and construct generators by name
|
||||
|
|
|
@ -65,7 +65,7 @@ void JsonGeneratorTests::testGeneratorItself()
|
|||
{
|
||||
const string inputFilePath(testFilePath("some_structs.h"));
|
||||
const vector<const char *> inputFiles{ inputFilePath.data() };
|
||||
const vector<string> clangOptions{"-I" CPP_UTILITIES_INCLUDE_DIRS, "-I" RAPIDJSON_INCLUDE_DIRS};
|
||||
const vector<string> clangOptions{ "-I" CPP_UTILITIES_INCLUDE_DIRS, "-I" RAPIDJSON_INCLUDE_DIRS };
|
||||
|
||||
stringstream buffer;
|
||||
JsonSerializationCodeGenerator::Options jsonOptions;
|
||||
|
@ -88,7 +88,8 @@ void JsonGeneratorTests::testCLI()
|
|||
string stdout, stderr;
|
||||
|
||||
const string inputFilePath(testFilePath("some_structs.h"));
|
||||
const char *const args1[] = { PROJECT_NAME, "-i", inputFilePath.data(), "--json-classes", "TestNamespace2::ThirdPartyStruct", "--clang-opt", "-I" CPP_UTILITIES_INCLUDE_DIRS, "-I" RAPIDJSON_INCLUDE_DIRS, nullptr };
|
||||
const char *const args1[] = { PROJECT_NAME, "-i", inputFilePath.data(), "--json-classes", "TestNamespace2::ThirdPartyStruct", "--clang-opt",
|
||||
"-I" CPP_UTILITIES_INCLUDE_DIRS, "-I" RAPIDJSON_INCLUDE_DIRS, nullptr };
|
||||
TESTUTILS_ASSERT_EXEC(args1);
|
||||
assertEqualityLinewise(m_expectedCode, toArrayOfLines(stdout));
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue