diff options
| author | Mohamed Bamakhrama <mohamed.bamakhrama@intel.com> | 2015-03-01 23:57:33 (GMT) |
|---|---|---|
| committer | Mohamed Bamakhrama <mohamed.bamakhrama@intel.com> | 2015-03-01 23:57:33 (GMT) |
| commit | f8f293730de2e12f6575c5d890a16504340f75fe (patch) | |
| tree | f4544bb3ab1fea478c57a2892616a5761c5769f6 /src/clean.cc | |
| parent | c406d1c8adfedc1982e2c08ab95d581f65eb65de (diff) | |
| download | Ninja-f8f293730de2e12f6575c5d890a16504340f75fe.zip Ninja-f8f293730de2e12f6575c5d890a16504340f75fe.tar.gz Ninja-f8f293730de2e12f6575c5d890a16504340f75fe.tar.bz2 | |
Allow scoping rules through subninja
Ninja didn't support scoping rules through subninja and assumed
a unique rule name in the whole namespace. With this change, this
behavior is changed to allow scoping rules. Two rules can have the
same name if they belong to two different scopes. However, two
rules can NOT have the same name in the same scope.
Diffstat (limited to 'src/clean.cc')
| -rw-r--r-- | src/clean.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/clean.cc b/src/clean.cc index 98c638c..7b044c5 100644 --- a/src/clean.cc +++ b/src/clean.cc @@ -220,7 +220,7 @@ int Cleaner::CleanRule(const char* rule) { assert(rule); Reset(); - const Rule* r = state_->LookupRule(rule); + const Rule* r = state_->bindings_.LookupRule(rule); if (r) { CleanRule(r); } else { @@ -237,7 +237,7 @@ int Cleaner::CleanRules(int rule_count, char* rules[]) { PrintHeader(); for (int i = 0; i < rule_count; ++i) { const char* rule_name = rules[i]; - const Rule* rule = state_->LookupRule(rule_name); + const Rule* rule = state_->bindings_.LookupRule(rule_name); if (rule) { if (IsVerbose()) printf("Rule %s\n", rule_name); |