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

Add #error and #warning directives to the preprocessor

Browse source
This commit is contained in:
Alexander van Gessel 2010-07-06 14:39:58 +01:00
parent f126364f95
commit ff8498a0c0
2 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/scenario-test.cfg
View file

@ -187,13 +187,17 @@ Xu , Xu , Qxu , Qxu , Ql , Ql
[/event]
[event]
name=start
#warning if we're in debug mode, we'll die now
#ifdef DEBUG_MODE
#warning error imminent
#error debug mode
[message]
speaker=narrator
icon=wesnoth-icon.png
message="Debug mode is on"
[/message]
#endif
#warning debug mode must be off
[/event]
[side]

34
src/serialization/preprocessor.cpp
View file

@ -33,6 +33,7 @@
static lg::log_domain log_config("config");
#define ERR_CF LOG_STREAM(err, log_config)
#define WRN_CF LOG_STREAM(warn, log_config)
#define LOG_CF LOG_STREAM(info, log_config)
#define DBG_CF LOG_STREAM(debug, log_config)
@ -397,6 +398,7 @@ class preprocessor_data: preprocessor
std::string read_word();
std::string read_line();
std::string read_rest_of_line();
void skip_spaces();
void skip_eol();
void push_token(char);
@ -568,6 +570,17 @@ std::string preprocessor_data::read_line()
}
}
std::string preprocessor_data::read_rest_of_line()
{
std::string res;
while(in_->good() && in_->peek() != '\n') {
int c = in_->get();
if (c != '\r')
res += static_cast<char>(c);
}
return res;
}
void preprocessor_data::put(char c)
{
if (skipping_)
@ -814,6 +827,27 @@ bool preprocessor_data::get_chunk()
std::string const &symbol = read_word();
target_.defines_->erase(symbol);
LOG_CF << "undefine macro " << symbol << " (location " << target_.location_ << ")\n";
} else if (command == "error") {
DBG_CF << "Encountered an #error, we are currently at skipping_ level: " << skipping_ << '\n';
if(skipping_ == 0) {
skip_spaces();
std::string message = read_rest_of_line();
std::ostringstream error;
std::ostringstream location;
error << "#error: \"" << message << '"';
location<<linenum_<<' '<<target_.location_;
target_.error(error.str(), location.str());
} else
LOG_CF << "Skipped an error\n";
} else if (command == "warning") {
DBG_CF << "Encountered a #warning, we are currently at skipping_ level: " << skipping_ << '\n';
if(skipping_ == 0) {
skip_spaces();
std::string message = read_rest_of_line();
WRN_CF << "#warning: \"" << message << "\" at "
<< linenum_ << ' ' << target_.location_ << '\n';
} else
LOG_CF << "Skipped a warning\n";
} else
comment = token.type != '{';
skip_eol();