Tokenizer::syntaxError: put the character that we have an invalid number of into singlequotes instead of parentheses.

matthiaskrgr · matthiaskrgr · commit 83ee64097703 · 2015-07-31T15:28:59.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8253,7 +8253,7 @@ void Tokenizer::syntaxError(const Token *tok, char c) const
 {
     printDebugOutput(0);
     throw InternalError(tok,
-                        std::string("Invalid number of character (") + c + ") " +
+                        std::string("Invalid number of character '") + c + "' " +
                         "when these macros are defined: '" + _configuration + "'.",
                         InternalError::SYNTAX);
 }
diff --git a/samples/syntaxError/out.txt b/samples/syntaxError/out.txt
@@ -1 +1 @@
-[samples\syntaxError\bad.c:2]: (error) Invalid number of character ({) when these macros are defined: 'A'.
+[samples\syntaxError\bad.c:2]: (error) Invalid number of character '{' when these macros are defined: 'A'.
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -4190,7 +4190,7 @@ class TestTokenizer : public TestFixture {
                 tokenizer.tokenize(istr, "test.cpp");
                 assertThrowFail(__FILE__, __LINE__);
             } catch (InternalError& e) {
-                ASSERT_EQUALS("Invalid number of character (() when these macros are defined: ''.", e.errorMessage);
+                ASSERT_EQUALS("Invalid number of character '(' when these macros are defined: ''.", e.errorMessage);
                 ASSERT_EQUALS("syntaxError", e.id);
                 ASSERT_EQUALS(2, e.token->linenr());
             }

Original file line number	Diff line number	Diff line change
`@@ -8253,7 +8253,7 @@ void Tokenizer::syntaxError(const Token *tok, char c) const`
`8253`	`8253`	`{`
`8254`	`8254`	`printDebugOutput(0);`
`8255`	`8255`	`throw InternalError(tok,`
`8256`		`- std::string("Invalid number of character (") + c + ") " +`
	`8256`	`+ std::string("Invalid number of character '") + c + "' " +`
`8257`	`8257`	`"when these macros are defined: '" + _configuration + "'.",`
`8258`	`8258`	`InternalError::SYNTAX);`
`8259`	`8259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-[samples\syntaxError\bad.c:2]: (error) Invalid number of character ({) when these macros are defined: 'A'.`
	`1`	`+[samples\syntaxError\bad.c:2]: (error) Invalid number of character '{' when these macros are defined: 'A'.`
Original file line number	Diff line number	Diff line change
`@@ -4190,7 +4190,7 @@ class TestTokenizer : public TestFixture {`
`4190`	`4190`	`tokenizer.tokenize(istr, "test.cpp");`
`4191`	`4191`	`assertThrowFail(__FILE__, __LINE__);`
`4192`	`4192`	`} catch (InternalError& e) {`
`4193`		`- ASSERT_EQUALS("Invalid number of character (() when these macros are defined: ''.", e.errorMessage);`
	`4193`	`+ ASSERT_EQUALS("Invalid number of character '(' when these macros are defined: ''.", e.errorMessage);`
`4194`	`4194`	`ASSERT_EQUALS("syntaxError", e.id);`
`4195`	`4195`	`ASSERT_EQUALS(2, e.token->linenr());`
`4196`	`4196`	`}`