0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preprocessor: consolidate queue and depth increment/decrement handling

Browse source
This commit is contained in:
Charles Dang 2017-08-30 13:14:29 +11:00
parent 81befcd121
commit cf5a1b46f8
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/serialization/preprocessor.cpp
View file

@ -296,9 +296,16 @@ public:
template<typename T, typename... A>
void add_preprocessor(A&&... args)
{
++depth_;
preprocessor_queue_.emplace_back(new T(*this, std::forward<A>(args)...));
}
void drop_preprocessor()
{
preprocessor_queue_.pop_back();
--depth_;
}
preprocessor* current() const
{
return preprocessor_queue_.empty() ? nullptr : preprocessor_queue_.back().get();
@ -361,7 +368,6 @@ preprocessor::preprocessor(preprocessor_streambuf& t)
, old_location_(t.location_)
, old_linenum_(t.linenum_)
{
++parent_.depth_;
}
/**
@ -445,9 +451,7 @@ void preprocessor_streambuf::restore_old_preprocessor()
textdomain_ = current->old_textdomain_;
// Drop the preprocessor from the queue.
preprocessor_queue_.pop_back();
--depth_;
drop_preprocessor();
}
std::string preprocessor_streambuf::get_current_file()