Factor ManifestParser options into a structure

This will allow more options to be added without updating everywhere
that constructs a ManifestParser.  Also extend the AssertParse function
to take the options so tests can control them.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/ninja.cc b/src/ninja.cc
index 54de7b9..586e8dc 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -1144,10 +1144,11 @@ int real_main(int argc, char** argv) {
   for (int cycle = 1; cycle <= kCycleLimit; ++cycle) {
     NinjaMain ninja(ninja_command, config);
 
-    ManifestParser parser(&ninja.state_, &ninja.disk_interface_,
-                          options.dupe_edges_should_err
-                              ? kDupeEdgeActionError
-                              : kDupeEdgeActionWarn);
+    ManifestParserOptions parser_opts;
+    if (options.dupe_edges_should_err) {
+      parser_opts.dupe_edge_action_ = kDupeEdgeActionError;
+    }
+    ManifestParser parser(&ninja.state_, &ninja.disk_interface_, parser_opts);
     string err;
     if (!parser.Load(options.input_file, &err)) {
       Error("%s", err.c_str());