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

Skip strings when preprocessing

Browse source
This commit is contained in:
Jonathan Müller 2017-04-19 16:52:56 +02:00
commit 6e7a8c921c
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libclang/preprocessor.cpp
View file

@ -489,9 +489,6 @@ namespace
{ {
// format (at new line): #undef <name> // format (at new line): #undef <name>
// due to a clang bug (http://bugs.llvm.org/show_bug.cgi?id=32631) I'll also an undef in the middle of the line // due to a clang bug (http://bugs.llvm.org/show_bug.cgi?id=32631) I'll also an undef in the middle of the line
// the only issue is with string literals containing `#undef`.
// those will be stripped and evaluated
// however, this kind of usage should be rare™
if (/*!p.was_newl() ||*/ !starts_with(p, "#undef")) if (/*!p.was_newl() ||*/ !starts_with(p, "#undef"))
return ts::nullopt; return ts::nullopt;
p.bump(std::strlen("#undef")); p.bump(std::strlen("#undef"));
@ -653,9 +650,19 @@ detail::preprocessor_output detail::preprocess(const libclang_compile_config& co
position p(ts::ref(result.source), output.c_str()); position p(ts::ref(result.source), output.c_str());
std::size_t file_depth = 0u; std::size_t file_depth = 0u;
ts::flag in_string(false);
while (p) while (p)
{ {
if (auto macro = parse_macro(p, result, file_depth == 0u)) if (starts_with(p, "\\\"")) // starts with \"
p.bump(2u);
else if (starts_with(p, "\"")) // starts with "
{
p.bump();
in_string.toggle();
}
else if (in_string == true)
p.bump();
else if (auto macro = parse_macro(p, result, file_depth == 0u))
{ {
if (logger.is_verbose()) if (logger.is_verbose())
{ {