diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2015-11-05 00:20:25 -0800 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2015-11-05 00:20:25 -0800 |
commit | 46b160df5e5780a68962f8b4e0b63b6dc811ef8c (patch) | |
tree | b389e087f55b008a65888c8bc410ae528357e934 /059generic_recipe.cc | |
parent | c8cbda012f9aaa5f15198ce670ff951b3ca018fe (diff) | |
download | mu-46b160df5e5780a68962f8b4e0b63b6dc811ef8c.tar.gz |
2365
Diffstat (limited to '059generic_recipe.cc')
-rw-r--r-- | 059generic_recipe.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/059generic_recipe.cc b/059generic_recipe.cc index 4881c4b4..8044bb79 100644 --- a/059generic_recipe.cc +++ b/059generic_recipe.cc @@ -148,27 +148,27 @@ void compute_type_ingredient_mappings(const recipe& exemplar, const instruction& } } -void accumulate_type_ingredients(const reagent& base, const reagent& refinements, map<string, string>& mappings) { - accumulate_type_ingredients(base.properties.at(0).second, refinements.properties.at(0).second, mappings); +void accumulate_type_ingredients(const reagent& base, const reagent& refinement, map<string, string>& mappings) { + accumulate_type_ingredients(base.properties.at(0).second, refinement.properties.at(0).second, mappings); } -void accumulate_type_ingredients(const string_tree* base, const string_tree* refinements, map<string, string>& mappings) { +void accumulate_type_ingredients(const string_tree* base, const string_tree* refinement, map<string, string>& mappings) { if (!base) return; - assert(refinements); + assert(refinement); if (!base->value.empty() && base->value.at(0) == '_') { - assert(!refinements->value.empty()); + assert(!refinement->value.empty()); if (mappings.find(base->value) == mappings.end()) { - trace(9993, "transform") << "adding mapping from " << base->value << " to " << refinements->value << end(); - mappings[base->value] = refinements->value; + trace(9993, "transform") << "adding mapping from " << base->value << " to " << refinement->value << end(); + mappings[base->value] = refinement->value; } else { - assert(mappings[base->value] == refinements->value); + assert(mappings[base->value] == refinement->value); } } else { - accumulate_type_ingredients(base->left, refinements->left, mappings); + accumulate_type_ingredients(base->left, refinement->left, mappings); } - accumulate_type_ingredients(base->right, refinements->right, mappings); + accumulate_type_ingredients(base->right, refinement->right, mappings); } void replace_type_ingredients(recipe& new_recipe, const map<string, string>& mappings) { |