diff options
| author | Nico Weber <thakis@chromium.org> | 2013-07-19 00:51:10 (GMT) |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2013-07-19 00:51:10 (GMT) |
| commit | a2df2c7d491ca530e16c90d8f9f7012f08c2e0ae (patch) | |
| tree | bd1134823e4f8c5aec2027c0a34c1ca403b8d235 /src/manifest_parser.h | |
| parent | 1f357a79984d9cae226ea73269ccabb500be2a31 (diff) | |
| download | Ninja-a2df2c7d491ca530e16c90d8f9f7012f08c2e0ae.zip Ninja-a2df2c7d491ca530e16c90d8f9f7012f08c2e0ae.tar.gz Ninja-a2df2c7d491ca530e16c90d8f9f7012f08c2e0ae.tar.bz2 | |
Fix diagnostic formatting regression caused by adaa91a33eb2cf23b88.
Ninja regressed to include a location for every file on the include stack for
nested diagnostics, i.e. it would print:
input:1: include.ninja:1: expected path
Fix this so that it prints only the current file location, like it used to:
include.ninja:1: expected path
Also add a test for this.
Diffstat (limited to 'src/manifest_parser.h')
| -rw-r--r-- | src/manifest_parser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/manifest_parser.h b/src/manifest_parser.h index 967dfdd..5212f72 100644 --- a/src/manifest_parser.h +++ b/src/manifest_parser.h @@ -35,7 +35,7 @@ struct ManifestParser { ManifestParser(State* state, FileReader* file_reader); /// Load and parse a file. - bool Load(const string& filename, string* err); + bool Load(const string& filename, string* err, Lexer* parent=NULL); /// Parse a text string of input. Used by tests. bool ParseTest(const string& input, string* err) { |