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

Merge branch 'staging/pr-434' (PR #434)

Browse source
This commit is contained in:
Ignacio R. Morelle 2015-07-30 02:58:19 -03:00
commit a16cc24d8c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/serialization/preprocessor.cpp
View file

@ -1075,8 +1075,10 @@ bool preprocessor_data::get_chunk()
size_t nb_arg = strings_.size() - token.stack_pos - 1;
if (nb_arg != val.arguments.size())
{
const std::vector<std::string>& locations = utils::quoted_split(val.location, ' ');
std::ostringstream error;
error << "Preprocessor symbol '" << symbol << "' expects "
error << "Preprocessor symbol '" << symbol << "' defined at "
<< get_filename(locations[0]) << ":" << val.linenum << " expects "
<< val.arguments.size() << " arguments, but has "
<< nb_arg << " arguments";
target_.error(error.str(), linenum_);