diff options
| author | Scott Graham <scottmg@chromium.org> | 2014-11-08 06:38:59 (GMT) |
|---|---|---|
| committer | Scott Graham <scottmg@chromium.org> | 2014-11-08 06:39:07 (GMT) |
| commit | aacfd606f463bc3a7c2cc92d961dbded7979051c (patch) | |
| tree | dac42a0635f199f39419c219ced98830b967d0e7 /src/manifest_parser.cc | |
| parent | e24d31901fc79aa7348be46bef5dea8d0dce6c4b (diff) | |
| download | Ninja-aacfd606f463bc3a7c2cc92d961dbded7979051c.zip Ninja-aacfd606f463bc3a7c2cc92d961dbded7979051c.tar.gz Ninja-aacfd606f463bc3a7c2cc92d961dbded7979051c.tar.bz2 | |
wip on adding tests at higher level, some not right
Diffstat (limited to 'src/manifest_parser.cc')
| -rw-r--r-- | src/manifest_parser.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/manifest_parser.cc b/src/manifest_parser.cc index 55d191f..81a191e 100644 --- a/src/manifest_parser.cc +++ b/src/manifest_parser.cc @@ -323,16 +323,18 @@ bool ManifestParser::ParseEdge(string* err) { for (vector<EvalString>::iterator i = ins.begin(); i != ins.end(); ++i) { string path = i->Evaluate(env); string path_err; - if (!CanonicalizePath(&path, &path_err)) + unsigned int slash_bits; + if (!CanonicalizePath(&path, &path_err, &slash_bits)) return lexer_.Error(path_err, err); - state_->AddIn(edge, path); + state_->AddIn(edge, path, slash_bits); } for (vector<EvalString>::iterator i = outs.begin(); i != outs.end(); ++i) { string path = i->Evaluate(env); string path_err; - if (!CanonicalizePath(&path, &path_err)) + unsigned int slash_bits; + if (!CanonicalizePath(&path, &path_err, &slash_bits)) return lexer_.Error(path_err, err); - state_->AddOut(edge, path); + state_->AddOut(edge, path, slash_bits); } edge->implicit_deps_ = implicit; edge->order_only_deps_ = order_only; |