jyapayne/cppast
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add database support to tool

Browse source
This commit is contained in:
Jonathan Müller 2017-07-03 17:59:50 +02:00
commit 592eb0284f
1 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
tool/main.cpp
View file

@ -170,7 +170,7 @@ void print_ast(std::ostream& out, const cppast::cpp_file& file)
// parse a file // parse a file
std::unique_ptr<cppast::cpp_file> parse_file(const cppast::libclang_compile_config& config, std::unique_ptr<cppast::cpp_file> parse_file(const cppast::libclang_compile_config& config,
const cppast::diagnostic_logger& logger, const cppast::diagnostic_logger& logger,
const std::string& filename, bool fatal_error) try const std::string& filename, bool fatal_error)
{ {
// the entity index is used to resolve cross references in the AST // the entity index is used to resolve cross references in the AST
// we don't need that, so it will not be needed afterwards // we don't need that, so it will not be needed afterwards
@ -184,13 +184,8 @@ std::unique_ptr<cppast::cpp_file> parse_file(const cppast::libclang_compile_conf
return nullptr; return nullptr;
return file; return file;
} }
catch (const cppast::libclang_error& ex)
{
print_error(std::string("[fatal parsing error] ") + ex.what());
return nullptr;
}
int main(int argc, char* argv[]) int main(int argc, char* argv[]) try
{ {
cxxopts::Options options("cppast", cxxopts::Options options("cppast",
"cppast - The commandline interface to the cppast library.\n"); "cppast - The commandline interface to the cppast library.\n");
@ -203,6 +198,10 @@ int main(int argc, char* argv[])
("file", "the file that is being parsed (last positional argument)", ("file", "the file that is being parsed (last positional argument)",
cxxopts::value<std::string>()); cxxopts::value<std::string>());
options.add_options("compilation") options.add_options("compilation")
("database_dir", "set the directory where a 'compile_commands.json' file is located containing build information",
cxxopts::value<std::string>())
("database_file", "set the file name whose configuration will be used regardless of the current file name",
cxxopts::value<std::string>())
("std", "set the C++ standard (c++98, c++03, c++11, c++14, c++1z (experimental))", ("std", "set the C++ standard (c++98, c++03, c++11, c++14, c++1z (experimental))",
cxxopts::value<std::string>()->default_value(cppast::to_string(cppast::cpp_standard::cpp_latest))) cxxopts::value<std::string>()->default_value(cppast::to_string(cppast::cpp_standard::cpp_latest)))
("I,include_directory", "add directory to include search path", ("I,include_directory", "add directory to include search path",
@ -236,6 +235,18 @@ int main(int argc, char* argv[])
{ {
// the compile config stores compilation flags // the compile config stores compilation flags
cppast::libclang_compile_config config; cppast::libclang_compile_config config;
if (options.count("database_dir"))
{
cppast::libclang_compilation_database database(
options["database_dir"].as<std::string>());
if (options.count("database_file"))
config =
cppast::libclang_compile_config(database,
options["database_file"].as<std::string>());
else
config =
cppast::libclang_compile_config(database, options["file"].as<std::string>());
}
if (options.count("include_directory")) if (options.count("include_directory"))
for (auto& include : options["include_directory"].as<std::vector<std::string>>()) for (auto& include : options["include_directory"].as<std::vector<std::string>>())
@ -289,3 +300,8 @@ int main(int argc, char* argv[])
print_ast(std::cout, *file); print_ast(std::cout, *file);
} }
} }
catch (const cppast::libclang_error& ex)
{
print_error(std::string("[fatal parsing error] ") + ex.what());
return 2;
}