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

Optimize preprocessing string searching/comparing

Browse source
This commit is contained in:
Jonathan Müller 2017-06-14 22:38:14 +02:00
commit d6e993a7b2
1 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/libclang/preprocessor.cpp
View file

@ -209,10 +209,15 @@ namespace
} }
void bump(std::size_t offset) noexcept void bump(std::size_t offset) noexcept
{
if (write_ == true)
{ {
for (std::size_t i = 0u; i != offset; ++i) for (std::size_t i = 0u; i != offset; ++i)
bump(); bump();
} }
else
skip(offset);
}
// no write, no newline detection // no write, no newline detection
void skip(std::size_t offset = 1u) noexcept void skip(std::size_t offset = 1u) noexcept
@ -257,14 +262,20 @@ namespace
ts::flag write_; ts::flag write_;
}; };
bool starts_with(const position& p, const char* str) bool starts_with(const position& p, const char* str, std::size_t len)
{ {
return std::strncmp(p.ptr(), str, std::strlen(str)) == 0; return std::strncmp(p.ptr(), str, len) == 0;
}
template <std::size_t N>
bool starts_with(const position& p, const char (&str)[N])
{
return std::strncmp(p.ptr(), str, N - 1) == 0;
} }
void skip(position& p, const char* str) void skip(position& p, const char* str)
{ {
DEBUG_ASSERT(starts_with(p, str), detail::assert_handler{}); DEBUG_ASSERT(starts_with(p, str, std::strlen(str)), detail::assert_handler{});
p.skip(std::strlen(str)); p.skip(std::strlen(str));
} }
@ -498,9 +509,8 @@ namespace
} }
else else
{ {
while (!starts_with(p, "\n")) auto newline = std::strchr(p.ptr(), '\n');
p.skip(); p.skip(std::size_t(newline - p.ptr())); // don't skip newline
// don't skip newline
} }
return true; return true;
@ -609,7 +619,8 @@ namespace
std::string filename; std::string filename;
for (; !starts_with(p, "\"") && !starts_with(p, ">"); p.skip()) for (; !starts_with(p, "\"") && !starts_with(p, ">"); p.skip())
filename += *p.ptr(); filename += *p.ptr();
DEBUG_ASSERT(starts_with(p, end_str), detail::assert_handler{}, "bad termination"); DEBUG_ASSERT(starts_with(p, end_str, std::strlen(end_str)), detail::assert_handler{},
"bad termination");
p.skip(); p.skip();
skip(p, " /* clang -E -dI */"); skip(p, " /* clang -E -dI */");
DEBUG_ASSERT(starts_with(p, "\n"), detail::assert_handler{}); DEBUG_ASSERT(starts_with(p, "\n"), detail::assert_handler{});
@ -648,6 +659,10 @@ detail::preprocessor_output detail::preprocess(const libclang_compile_config& co
ts::flag in_string(false), in_char(false); ts::flag in_string(false), in_char(false);
while (p) while (p)
{ {
auto next = std::strpbrk(p.ptr(), "\"'#/"); // look for ", ', # or /
if (next && next > p.ptr())
p.bump(std::size_t(next - p.ptr() - 1)); // subtract one to get before that character
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 \'