diff --git a/082scenario_screen.cc b/082scenario_screen.cc index a82862c0..8df0a560 100644 --- a/082scenario_screen.cc +++ b/082scenario_screen.cc @@ -158,6 +158,8 @@ case SCREEN_SHOULD_CONTAIN: { } :(before "End Primitive Recipe Implementations") case SCREEN_SHOULD_CONTAIN: { +//? cerr << SIZE(get(Recipe_variants, "insert")) << '\n'; +//? cerr << debug_string(get(Recipe, get(Recipe_ordinal, "insert_4"))) << '\n'; if (!Passed) break; check_screen(current_instruction().ingredients.at(0).name, -1); break; diff --git a/998check_type_pointers.cc b/998check_type_pointers.cc index 36c548a9..da19cf3e 100644 --- a/998check_type_pointers.cc +++ b/998check_type_pointers.cc @@ -1,33 +1,36 @@ -:(before "End Transform All") -check_type_pointers(); - -:(code) -void check_type_pointers() { - for (map::iterator p = Recipe.begin(); p != Recipe.end(); ++p) { - if (any_type_ingredient_in_header(p->first)) continue; - const recipe& r = p->second; - for (long long int i = 0; i < SIZE(r.steps); ++i) { - const instruction& inst = r.steps.at(i); - for (long long int j = 0; j < SIZE(inst.ingredients); ++j) { - if (!inst.ingredients.at(j).type) { - raise_error << maybe(r.name) << " '" << inst.to_string() << "' -- " << inst.ingredients.at(j).to_string() << " has no type\n" << end(); - return; - } - if (!inst.ingredients.at(j).properties.at(0).second) { - raise_error << maybe(r.name) << " '" << inst.to_string() << "' -- " << inst.ingredients.at(j).to_string() << " has no type name\n" << end(); - return; - } - } - for (long long int j = 0; j < SIZE(inst.products); ++j) { - if (!inst.products.at(j).type) { - raise_error << maybe(r.name) << " '" << inst.to_string() << "' -- " << inst.products.at(j).to_string() << " has no type\n" << end(); - return; - } - if (!inst.products.at(j).properties.at(0).second) { - raise_error << maybe(r.name) << " '" << inst.to_string() << "' -- " << inst.products.at(j).to_string() << " has no type name\n" << end(); - return; - } - } - } - } -} +//: enable this when tracking down null types +//: (but it interferes with edit/; since recipes created in the environment +//: can raise warnings here which will stop running the entire environment) +//? :(before "End Transform All") +//? check_type_pointers(); +//? +//? :(code) +//? void check_type_pointers() { +//? for (map::iterator p = Recipe.begin(); p != Recipe.end(); ++p) { +//? if (any_type_ingredient_in_header(p->first)) continue; +//? const recipe& r = p->second; +//? for (long long int i = 0; i < SIZE(r.steps); ++i) { +//? const instruction& inst = r.steps.at(i); +//? for (long long int j = 0; j < SIZE(inst.ingredients); ++j) { +//? if (!inst.ingredients.at(j).type) { +//? raise_error << maybe(r.name) << " '" << inst.to_string() << "' -- " << inst.ingredients.at(j).to_string() << " has no type\n" << end(); +//? return; +//? } +//? if (!inst.ingredients.at(j).properties.at(0).second) { +//? raise_error << maybe(r.name) << " '" << inst.to_string() << "' -- " << inst.ingredients.at(j).to_string() << " has no type name\n" << end(); +//? return; +//? } +//? } +//? for (long long int j = 0; j < SIZE(inst.products); ++j) { +//? if (!inst.products.at(j).type) { +//? raise_error << maybe(r.name) << " '" << inst.to_string() << "' -- " << inst.products.at(j).to_string() << " has no type\n" << end(); +//? return; +//? } +//? if (!inst.products.at(j).properties.at(0).second) { +//? raise_error << maybe(r.name) << " '" << inst.to_string() << "' -- " << inst.products.at(j).to_string() << " has no type name\n" << end(); +//? return; +//? } +//? } +//? } +//? } +//? }