summaryrefslogtreecommitdiffstats
path: root/src/parsers.cc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-01-05 04:58:44 (GMT)
committerEvan Martin <martine@danga.com>2012-01-05 04:58:44 (GMT)
commit4b019b3cebf40ca9b1b95741f6336b843a9dad55 (patch)
tree4c069ba1314805d8a052fa57c24a0f38f1570559 /src/parsers.cc
parenteeed724111402fb4746dbd2544c90ab946d03c67 (diff)
downloadNinja-4b019b3cebf40ca9b1b95741f6336b843a9dad55.zip
Ninja-4b019b3cebf40ca9b1b95741f6336b843a9dad55.tar.gz
Ninja-4b019b3cebf40ca9b1b95741f6336b843a9dad55.tar.bz2
test error message of ManifestParser::Load
Fixes the other half of issue #187.
Diffstat (limited to 'src/parsers.cc')
-rw-r--r--src/parsers.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/parsers.cc b/src/parsers.cc
index afb097a..e310c90 100644
--- a/src/parsers.cc
+++ b/src/parsers.cc
@@ -29,8 +29,11 @@ ManifestParser::ManifestParser(State* state, FileReader* file_reader)
}
bool ManifestParser::Load(const string& filename, string* err) {
string contents;
- if (!file_reader_->ReadFile(filename, &contents, err))
+ string read_err;
+ if (!file_reader_->ReadFile(filename, &contents, &read_err)) {
+ *err = "loading '" + filename + "': " + read_err;
return false;
+ }
contents.resize(contents.size() + 10);
return Parse(filename, contents, err);
}