parse multiple rules

diff --git a/ninja.h b/ninja.h
index dbf722a..1f03642 100644 (file)
--- a/ninja.h
+++ b/ninja.h
@@ -325,10 +325,9 @@ bool ManifestParser::Parse(const string& input, string* err) {
     } else {
       return Error("unknown token: " + token_, err);
     }
+    SkipWhitespace(true);
   }
 
-  SkipWhitespace(true);
-
   if (cur_ < end_)
     return Error("expected eof", err);
 

diff --git a/ninja_test.cc b/ninja_test.cc
index 77c8347..9565698 100644 (file)
--- a/ninja_test.cc
+++ b/ninja_test.cc
@@ -65,17 +65,19 @@ TEST(Parser, Empty) {
   EXPECT_EQ("", err);
 }
 
-TEST(Parser, Rule) {
+TEST(Parser, Rules) {
   State state;
   ManifestParser parser(&state);
   string err;
   EXPECT_TRUE(parser.Parse(
       "rule cat\n"
-      "command cat @in > $out\n\n",
+      "command cat @in > $out\n\n"
+      "rule date\n"
+      "command date > $out\n\n",
       &err));
   EXPECT_EQ("", err);
 
-  ASSERT_EQ(1, state.rules_.size());
+  ASSERT_EQ(2, state.rules_.size());
   Rule* rule = state.rules_.begin()->second;
   EXPECT_EQ("cat", rule->name_);
   EXPECT_EQ("cat @in > $out", rule->command_.unparsed());