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, 7 insertions, 2 deletions

diff --git a/src/manifest_parser.h b/src/manifest_parser.h
index 043e4b2..4ae21c4 100644
--- a/src/manifest_parser.h
+++ b/src/manifest_parser.h
@@ -31,10 +31,15 @@ enum DupeEdgeAction {
   kDupeEdgeActionError,
 };
 
+struct ManifestParserOptions {
+  ManifestParserOptions(): dupe_edge_action_(kDupeEdgeActionWarn) {}
+  DupeEdgeAction dupe_edge_action_;
+};
+
 /// Parses .ninja files.
 struct ManifestParser {
   ManifestParser(State* state, FileReader* file_reader,
-                 DupeEdgeAction dupe_edge_action);
+                 ManifestParserOptions options = ManifestParserOptions());
 
   /// Load and parse a file.
   bool Load(const string& filename, string* err, Lexer* parent = NULL);
@@ -67,7 +72,7 @@ private:
   BindingEnv* env_;
   FileReader* file_reader_;
   Lexer lexer_;
-  DupeEdgeAction dupe_edge_action_;
+  ManifestParserOptions options_;
   bool quiet_;
 };