upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 20:44:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

made preprocess_file() function modify the passed in defines map...

Browse Source 
...so the caller can see the definitions
This commit is contained in:
Dave White 2005-06-23 23:10:54 +00:00
parent 78a8e14a0a
commit 1e32e22ca9
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/serialization/preprocessor.cpp
View File

@ -68,6 +68,7 @@ class preprocessor_streambuf: public std::streambuf
std::ostringstream buffer_;
preprocessor *current_;
preproc_map *defines_;
preproc_map default_defines_;
std::string textdomain_;
std::string location_;
int linenum_;
@ -86,10 +87,13 @@ preprocessor_streambuf::preprocessor_streambuf(preproc_map *def)
: current_(NULL), defines_(def), textdomain_(PACKAGE),
depth_(0), quoted_(false)
{
if(defines_ == NULL) {
defines_ = &default_defines_;
}
}
preprocessor_streambuf::preprocessor_streambuf(preprocessor_streambuf const &t)
: std::streambuf(), current_(NULL), defines_(t.defines_),
: current_(NULL), defines_(t.defines_),
textdomain_(PACKAGE), depth_(t.depth_), quoted_(t.quoted_)
{
}
@ -711,17 +715,14 @@ struct preprocessor_deleter: std::basic_istream<char>
{
preprocessor_streambuf *buf_;
preprocessor_deleter(preprocessor_streambuf *buf) : std::basic_istream<char>(buf), buf_(buf) {}
~preprocessor_deleter() { rdbuf(NULL); delete buf_->defines_; delete buf_; }
~preprocessor_deleter() { rdbuf(NULL); delete buf_; }
};
std::istream *preprocess_file(std::string const &fname,
preproc_map const *defines)
preproc_map *defines)
{
log_scope("preprocessing file...");
preproc_map *defines_copy = new preproc_map;
if (defines)
*defines_copy = *defines;
preprocessor_streambuf *buf = new preprocessor_streambuf(defines_copy);
preprocessor_streambuf *buf = new preprocessor_streambuf(defines);
new preprocessor_file(*buf, fname);
return new preprocessor_deleter(buf);
}

2
src/serialization/preprocessor.hpp
View File

@ -40,6 +40,6 @@ typedef std::map< std::string, preproc_define > preproc_map;
//function to use the WML preprocessor on a file, and returns the resulting
//preprocessed file data. defines is a map of symbols defined.
std::istream *preprocess_file(std::string const &fname,
preproc_map const *defines = NULL);
preproc_map *defines = NULL);
#endif