From df40cb6e4d9d274b618682c315545d5c55508fa5 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Thu, 29 Oct 2015 13:01:04 -0700 Subject: 2316 - preparing for static dispatch --- 011load.cc | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to '011load.cc') diff --git a/011load.cc b/011load.cc index 93d30c22..2ac517c5 100644 --- a/011load.cc +++ b/011load.cc @@ -41,25 +41,26 @@ vector load(istream& in) { } long long int slurp_recipe(istream& in) { - string recipe_name = next_word(in); - if (recipe_name.empty()) - raise_error << "empty recipe name\n" << end(); - if (Recipe_ordinal.find(recipe_name) == Recipe_ordinal.end()) { - Recipe_ordinal[recipe_name] = Next_recipe_ordinal++; + recipe result; + result.name = next_word(in); + // End recipe Refinements + if (result.name.empty()) + raise_error << "empty result.name\n" << end(); + trace(9991, "parse") << "--- defining " << result.name << end(); + if (Recipe_ordinal.find(result.name) == Recipe_ordinal.end()) { + Recipe_ordinal[result.name] = Next_recipe_ordinal++; } - trace(9991, "parse") << "--- defining " << recipe_name << end(); - if (Recipe.find(Recipe_ordinal[recipe_name]) != Recipe.end()) { + if (Recipe.find(Recipe_ordinal[result.name]) != Recipe.end()) { trace(9991, "parse") << "already exists" << end(); - if (warn_on_redefine(recipe_name)) - raise << "redefining recipe " << Recipe[Recipe_ordinal[recipe_name]].name << "\n" << end(); - Recipe.erase(Recipe_ordinal[recipe_name]); + if (warn_on_redefine(result.name)) + raise << "redefining recipe " << Recipe[Recipe_ordinal[result.name]].name << "\n" << end(); + Recipe.erase(Recipe_ordinal[result.name]); } - recipe& result = Recipe[Recipe_ordinal[recipe_name]]; - result.name = recipe_name; slurp_body(in, result); + Recipe[Recipe_ordinal[result.name]] = result; // track added recipes because we may need to undo them in tests; see below - recently_added_recipes.push_back(Recipe_ordinal[recipe_name]); - return Recipe_ordinal[recipe_name]; + recently_added_recipes.push_back(Recipe_ordinal[result.name]); + return Recipe_ordinal[result.name]; } void slurp_body(istream& in, recipe& result) { -- cgit 1.4.1-2-gfad0