Skip to content

Commit

Permalink
Merge branch 'macro-argument-location' of https://github.com/halfspir…
Browse files Browse the repository at this point in the history
…al/wesnoth into staging/pr-434
  • Loading branch information
irydacea committed Jul 30, 2015
2 parents fcaa2ab + 0ce084e commit d7686f4
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/serialization/preprocessor.cpp
Expand Up @@ -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())
{
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_);
Expand Down

0 comments on commit d7686f4

Please sign in to comment.