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

Handle string literals in macro definition

Browse source
This commit is contained in:
Jonathan Müller 2017-07-04 08:43:21 +02:00
commit 59c7ea31e1
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libclang/libclang_parser.cpp
View file

@ -231,8 +231,15 @@ libclang_compile_config::libclang_compile_config(const libclang_compilation_data
if (flag == "-I") if (flag == "-I")
add_flag(std::move(flag) + get_full_path(dir, args)); add_flag(std::move(flag) + get_full_path(dir, args));
else if (flag == "-D" || flag == "-U") else if (flag == "-D" || flag == "-U")
{
// preprocessor options // preprocessor options
add_flag(std::move(flag) + std::move(args)); for (auto c : args)
if (c == '"')
flag += "\\\"";
else
flag += c;
add_flag(std::move(flag));
}
else if (flag == "-std") else if (flag == "-std")
// standard // standard
add_flag(std::move(flag) + "=" + std::move(args)); add_flag(std::move(flag) + "=" + std::move(args));
@ -294,7 +301,16 @@ void libclang_compile_config::do_add_macro_definition(std::string name, std::str
{ {
auto str = "-D" + std::move(name); auto str = "-D" + std::move(name);
if (!definition.empty()) if (!definition.empty())
str += "=" + std::move(definition); {
str += "=";
for (auto c : definition)
{
if (c == '"')
str += "\\\"";
else
str += c;
}
}
add_flag(std::move(str)); add_flag(std::move(str));
} }