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

Handle circular includes, take 2

Browse source 
We can't rely on path equivalence to determine the old file, need to
count the level instead.

Fixes #150, again.
This commit is contained in:
Jonathan Müller 2022-11-24 21:45:53 +01:00
commit ba6fd12dce
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/libclang/preprocessor.cpp
View file

@ -505,7 +505,7 @@ class position
{ {
public: public:
position(ts::object_ref<std::string> result, const char* ptr) noexcept position(ts::object_ref<std::string> result, const char* ptr) noexcept
: result_(result), cur_line_(1u), cur_column_(0u), ptr_(ptr), write_(true) : result_(result), cur_line_(1u), cur_column_(0u), ptr_(ptr), write_disabled_count_(0)
{ {
// We strip all conditional defines and pragmas from the input, which includes the include // We strip all conditional defines and pragmas from the input, which includes the include
// guard. If the source includes a file, which includes itself again (for some reason), this // guard. If the source includes a file, which includes itself again (for some reason), this
@ -518,7 +518,7 @@ public:
void set_line(unsigned line) void set_line(unsigned line)
{ {
if (cur_line_ != line) if (write_enabled() && cur_line_ != line)
{ {
*result_ += "#line " + std::to_string(line) + "\n"; *result_ += "#line " + std::to_string(line) + "\n";
cur_line_ = line; cur_line_ = line;
@ -528,8 +528,9 @@ public:
void write_str(std::string str) void write_str(std::string str)
{ {
if (write_ == false) if (!write_enabled())
return; return;
for (auto c : str) for (auto c : str)
{ {
*result_ += c; *result_ += c;
@ -545,7 +546,7 @@ public:
void bump() noexcept void bump() noexcept
{ {
if (write_ == true) if (write_enabled())
{ {
result_->push_back(*ptr_); result_->push_back(*ptr_);
++cur_column_; ++cur_column_;
@ -561,13 +562,15 @@ public:
void bump(std::size_t offset) noexcept void bump(std::size_t offset) noexcept
{ {
if (write_ == true) if (write_enabled())
{ {
for (std::size_t i = 0u; i != offset; ++i) for (std::size_t i = 0u; i != offset; ++i)
bump(); bump();
} }
else else
{
skip(offset); skip(offset);
}
} }
// no write, no newline detection // no write, no newline detection
@ -578,7 +581,7 @@ public:
void skip_with_linecount() noexcept void skip_with_linecount() noexcept
{ {
if (write_ == true) if (write_enabled())
{ {
++cur_column_; ++cur_column_;
if (*ptr_ == '\n') if (*ptr_ == '\n')
@ -594,17 +597,18 @@ public:
void enable_write() noexcept void enable_write() noexcept
{ {
write_.set(); DEBUG_ASSERT(write_disabled_count_ > 0, detail::assert_handler{});
--write_disabled_count_;
} }
void disable_write() noexcept void disable_write() noexcept
{ {
write_.try_reset(); ++write_disabled_count_;
} }
bool write_enabled() const noexcept bool write_enabled() const noexcept
{ {
return write_ == true; return write_disabled_count_ == 0;
} }
explicit operator bool() const noexcept explicit operator bool() const noexcept
@ -636,7 +640,7 @@ private:
ts::object_ref<std::string> result_; ts::object_ref<std::string> result_;
unsigned cur_line_, cur_column_; unsigned cur_line_, cur_column_;
const char* ptr_; const char* ptr_;
ts::flag write_; unsigned write_disabled_count_;
}; };
bool starts_with(const position& p, const char* str, std::size_t len) bool starts_with(const position& p, const char* str, std::size_t len)
@ -1204,11 +1208,8 @@ detail::preprocessor_output detail::preprocess(const libclang_compile_config& co
} }
else if (lm.value().flag == linemarker::enter_old) else if (lm.value().flag == linemarker::enter_old)
{ {
if (lm.value().file == path) p.enable_write();
{ p.set_line(lm.value().line);
p.enable_write();
p.set_line(lm.value().line);
}
} }
else if (lm.value().flag == linemarker::line_directive && p.write_enabled()) else if (lm.value().flag == linemarker::line_directive && p.write_enabled())
{ {