diff options
| author | Evan Jones <ej@evanjones.ca> | 2012-01-04 16:40:30 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-01-04 17:06:19 (GMT) |
| commit | b12139c13e8924ce4d0e634f5798274a5d87f5d7 (patch) | |
| tree | 1d74bac160533c619c9033209e4e91be52ccf18a /src | |
| parent | c11461a588456193d0a78cc550f595e4f1412bf3 (diff) | |
| download | Ninja-b12139c13e8924ce4d0e634f5798274a5d87f5d7.zip Ninja-b12139c13e8924ce4d0e634f5798274a5d87f5d7.tar.gz Ninja-b12139c13e8924ce4d0e634f5798274a5d87f5d7.tar.bz2 | |
Add a space to unexpected token errors.
Diffstat (limited to 'src')
| -rw-r--r-- | src/parsers.cc | 2 | ||||
| -rw-r--r-- | src/parsers_test.cc | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/parsers.cc b/src/parsers.cc index 506b209..afb097a 100644 --- a/src/parsers.cc +++ b/src/parsers.cc @@ -78,7 +78,7 @@ bool ManifestParser::Parse(const string& filename, const string& input, case Lexer::NEWLINE: break; default: - return lexer_.Error(string("unexpected") + Lexer::TokenName(token), + return lexer_.Error(string("unexpected ") + Lexer::TokenName(token), err); } } diff --git a/src/parsers_test.cc b/src/parsers_test.cc index 9d46beb..e7047da 100644 --- a/src/parsers_test.cc +++ b/src/parsers_test.cc @@ -448,6 +448,13 @@ TEST_F(ParserTest, Errors) { // as we see them, not after we've read them all! EXPECT_EQ("input:4: empty path\n", err); } + + { + ManifestParser parser(NULL, NULL); + string err; + EXPECT_FALSE(parser.ParseTest(" # bad indented comment\n", &err)); + EXPECT_EQ("input:1: unexpected indent\n", err); + } } TEST_F(ParserTest, MultipleOutputs) |