From 3c5dc9341005e128957e5ea5d6aa199d4011c30c Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Tue, 11 Oct 2011 09:39:56 -0400 Subject: [PATCH] PR3823: fix accidental whitespace included in type mismatch messages for i18n * elaborate.cxx (typeresolution_info::mismatch): eliminate excess space. Reported-by: Petr Muller and the fine fujitsu testsuite --- elaborate.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/elaborate.cxx b/elaborate.cxx index 194460f12..5655444d3 100644 --- a/elaborate.cxx +++ b/elaborate.cxx @@ -4912,7 +4912,7 @@ typeresolution_info::mismatch (const token* tok, exp_type t1, exp_type t2) } if (!tok_resolved) { - msg << _F("type mismatch ( %s vs. %s )", + msg << _F("type mismatch (%s vs. %s)", lex_cast(t1).c_str(), lex_cast(t2).c_str()); } else @@ -4926,14 +4926,14 @@ typeresolution_info::mismatch (const token* tok, exp_type t1, exp_type t2) break; } } - msg << _F("type mismatch ( %s vs. %s )", + msg << _F("type mismatch (%s vs. %s)", lex_cast(t1).c_str(), lex_cast(t2).c_str()); if (!tok_printed) { //error for possible mismatch in the earlier resolved token printed_toks.push_back (resolved_toks[i]); stringstream type_msg; - type_msg << _F("type was first inferred here ( %s )", lex_cast(t2).c_str()); + type_msg << _F("type was first inferred here (%s)", lex_cast(t2).c_str()); err1 = new semantic_error (type_msg.str(), resolved_toks[i]); } } -- 2.43.5