summaryrefslogtreecommitdiffstats
path: root/src/manifest_parser.h
diff options
context:
space:
mode:
authorScott Graham <scottmg@chromium.org>2016-01-27 19:10:34 (GMT)
committerScott Graham <scottmg@chromium.org>2016-01-27 19:10:34 (GMT)
commit56bab441b70e6f09f3faf7936118c309f9ce48cb (patch)
tree1b71d58b91645b4e770ad5bbf2a40d635a0069d5 /src/manifest_parser.h
parent233acbad4dea6410b567f077ecc8699525a46683 (diff)
downloadNinja-56bab441b70e6f09f3faf7936118c309f9ce48cb.zip
Ninja-56bab441b70e6f09f3faf7936118c309f9ce48cb.tar.gz
Ninja-56bab441b70e6f09f3faf7936118c309f9ce48cb.tar.bz2
dupe_edge_should_err from bool to enum
Diffstat (limited to 'src/manifest_parser.h')
-rw-r--r--src/manifest_parser.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/manifest_parser.h b/src/manifest_parser.h
index 0883349..41d388c 100644
--- a/src/manifest_parser.h
+++ b/src/manifest_parser.h
@@ -25,6 +25,11 @@ struct BindingEnv;
struct EvalString;
struct State;
+enum DupeEdgeAction {
+ kDupeEdgeActionWarn,
+ kDupeEdgeActionError,
+};
+
/// Parses .ninja files.
struct ManifestParser {
struct FileReader {
@@ -33,7 +38,7 @@ struct ManifestParser {
};
ManifestParser(State* state, FileReader* file_reader,
- bool dupe_edge_should_err);
+ DupeEdgeAction dupe_edge_action);
/// Load and parse a file.
bool Load(const string& filename, string* err, Lexer* parent = NULL);
@@ -66,7 +71,7 @@ private:
BindingEnv* env_;
FileReader* file_reader_;
Lexer lexer_;
- bool dupe_edge_should_err_;
+ DupeEdgeAction dupe_edge_action_;
bool quiet_;
};