summaryrefslogtreecommitdiffstats
path: root/src/parsers_test.cc
diff options
context:
space:
mode:
authorEvan Jones <ej@evanjones.ca>2012-01-05 02:12:27 (GMT)
committerEvan Martin <martine@danga.com>2012-01-05 02:56:00 (GMT)
commit7311f3b583c739f862ae17c3925985ec3ea244f5 (patch)
treeb7fec70bee5e5416131145c46a7871be6eb1b519 /src/parsers_test.cc
parentff3e266da5430489c00b3b9b9a4eec930e54f402 (diff)
downloadNinja-7311f3b583c739f862ae17c3925985ec3ea244f5.zip
Ninja-7311f3b583c739f862ae17c3925985ec3ea244f5.tar.gz
Ninja-7311f3b583c739f862ae17c3925985ec3ea244f5.tar.bz2
Lexer: include leading whitespace in the comment token.
Indented comments are ignored rather than causing errors.
Diffstat (limited to 'src/parsers_test.cc')
-rw-r--r--src/parsers_test.cc25
1 files changed, 18 insertions, 7 deletions
diff --git a/src/parsers_test.cc b/src/parsers_test.cc
index e7047da..d6b3117 100644
--- a/src/parsers_test.cc
+++ b/src/parsers_test.cc
@@ -64,6 +64,24 @@ TEST_F(ParserTest, Rules) {
EXPECT_EQ("[cat ][$in][ > ][$out]", rule->command().Serialize());
}
+TEST_F(ParserTest, IgnoreIndentedComments) {
+ ASSERT_NO_FATAL_FAILURE(AssertParse(
+" #indented comment\n"
+"rule cat\n"
+" command = cat $in > $out\n"
+" #generator = 1\n"
+" restat = 1 # comment\n"
+" #comment\n"
+"build result: cat in_1.cc in-2.O\n"
+" #comment\n"));
+
+ ASSERT_EQ(2u, state.rules_.size());
+ const Rule* rule = state.rules_.begin()->second;
+ EXPECT_EQ("cat", rule->name());
+ EXPECT_TRUE(rule->restat());
+ EXPECT_FALSE(rule->generator());
+}
+
TEST_F(ParserTest, Variables) {
ASSERT_NO_FATAL_FAILURE(AssertParse(
"l = one-letter-test\n"
@@ -448,13 +466,6 @@ 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)