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

Skip character literals when preprocessing

Browse source
This commit is contained in:
Jonathan Müller 2017-04-21 11:52:30 +02:00
commit bc9b8433c8
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libclang/preprocessor.cpp
View file

@ -651,17 +651,24 @@ 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); ts::flag in_string(false), in_char(false);
while (p) while (p)
{ {
if (starts_with(p, "\\\"")) // starts with \" if (starts_with(p, "\\\"")) // starts with \"
p.bump(2u); p.bump(2u);
else if (starts_with(p, "\"")) // starts with " else if (starts_with(p, "\\'")) // starts with \'
p.bump(2u);
else if (in_char == false && starts_with(p, "\"")) // starts with "
{ {
p.bump(); p.bump();
in_string.toggle(); in_string.toggle();
} }
else if (in_string == true) else if (in_string == false && starts_with(p, "'"))
{
p.bump();
in_char.toggle();
}
else if (in_string == true || in_char == true)
p.bump(); p.bump();
else if (auto macro = parse_macro(p, result, file_depth == 0u)) else if (auto macro = parse_macro(p, result, file_depth == 0u))
{ {

5
test/cpp_preprocessor.cpp
View file

@ -145,7 +145,10 @@ struct a {};
/// u /// u
/** b /** b
* b */ * b */
void b(int, float); void b(int, float)
{
auto c = '#';
}
/** u */ /** u */
//! c //! c