From 82c886d71c12ad902ea8b9c81c7993af7ddf2d2b Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 7 Nov 2015 22:31:35 -0800 Subject: 2392 - undo 2391 Yup, type ingredients were taking size 1 by default. --- 001help.cc | 5 -- 010vm.cc | 4 +- 012transform.cc | 2 +- 031address.cc | 3 +- 043new.cc | 5 +- 048check_type_by_name.cc | 19 ++++--- 057static_dispatch.cc | 2 +- 058generic_container.cc | 9 ++- 059generic_recipe.cc | 145 +++++++++++++---------------------------------- 9 files changed, 61 insertions(+), 133 deletions(-) diff --git a/001help.cc b/001help.cc index c193cf7d..e42dc6a7 100644 --- a/001help.cc +++ b/001help.cc @@ -96,11 +96,6 @@ template typename T::mapped_type& get(T& map, typename T::key_type c assert(iter != map.end()); return iter->second; } -template typename T::mapped_type const& get(const T& map, typename T::key_type const& key) { - typename T::const_iterator iter(map.find(key)); - assert(iter != map.end()); - return iter->second; -} template typename T::mapped_type const& put(T& map, typename T::key_type const& key, typename T::mapped_type const& value) { map[key] = value; return map[key]; diff --git a/010vm.cc b/010vm.cc index 9ac47f6f..a4c5eb54 100644 --- a/010vm.cc +++ b/010vm.cc @@ -278,10 +278,8 @@ type_tree* new_type_tree(const string_tree* properties) { result->value = get(Type_ordinal, type_name); else if (is_integer(type_name)) // sometimes types will contain non-type tags, like numbers for the size of an array result->value = 0; - else { - cerr << "AAAAAAAAAAAAAA "; dump_property(properties, cerr); cerr << '\n'; + else result->value = -1; // should never happen; will trigger errors later - } } result->left = new_type_tree(properties->left); result->right = new_type_tree(properties->right); diff --git a/012transform.cc b/012transform.cc index 7837ae67..b5266ed6 100644 --- a/012transform.cc +++ b/012transform.cc @@ -37,7 +37,7 @@ void transform_all() { recipe& r = p->second; if (r.steps.empty()) continue; if (r.transformed_until != t-1) continue; - // End Transform Checks +//? cerr << " recipe " << r.name << '\n'; (*Transform.at(t))(/*recipe_ordinal*/p->first); r.transformed_until = t; } diff --git a/031address.cc b/031address.cc index 79c951d0..c4b260d1 100644 --- a/031address.cc +++ b/031address.cc @@ -78,8 +78,7 @@ void lookup_memory(reagent& x) { bool canonize_type(reagent& r) { while (has_property(r, "lookup")) { if (!r.type || r.type->value != get(Type_ordinal, "address")) { - raise_error << "can't lookup non-address: " << r.to_string() << '\n' << end(); - dump_types(r.type, cerr); cerr << '\n'; + raise_error << "can't lookup non-address: " << r.original_string << '\n' << end(); return false; } drop_address_from_type(r); diff --git a/043new.cc b/043new.cc index 96b2fe37..bc552362 100644 --- a/043new.cc +++ b/043new.cc @@ -61,11 +61,14 @@ void transform_new_to_allocate(const recipe_ordinal r) { // Convert 'new' To 'allocate' if (inst.name == "new") { inst.operation = ALLOCATE; - cerr << inst.ingredients.at(0).name << '\n'; +//? istringstream in(inst.ingredients.at(0).name); +//? in >> std::noskipws; + cerr << "new: " << inst.ingredients.at(0).name << '\n'; string_tree* type_name = new string_tree(inst.ingredients.at(0).name); // End Post-processing(type_name) When Converting 'new' type_tree* type = new_type_tree(type_name); inst.ingredients.at(0).set_value(size_of(type)); + cerr << "=> " << inst.ingredients.at(0).value << '\n'; ostringstream out; dump_property(type_name, out); trace(9992, "new") << "size of " << out.str() << " is " << inst.ingredients.at(0).value << end(); diff --git a/048check_type_by_name.cc b/048check_type_by_name.cc index 27807103..8a83c5f4 100644 --- a/048check_type_by_name.cc +++ b/048check_type_by_name.cc @@ -36,15 +36,6 @@ void check_types_by_name(const recipe_ordinal r) { } } -void deduce_missing_type(map& type, map& type_name, reagent& x) { - if (x.type) return; - if (!contains_key(type, x.name)) return; - x.type = new type_tree(*type[x.name]); - trace(9992, "transform") << x.name << " <= " << dump_types(x) << end(); - assert(!x.properties.at(0).second); - x.properties.at(0).second = new string_tree(*type_name[x.name]); -} - void check_type(map& type, map& type_name, const reagent& x, const recipe_ordinal r) { if (is_literal(x)) return; if (is_raw(x)) return; // TODO: delete this @@ -68,6 +59,16 @@ recipe main [ y:number <- add x, 1 ] +:(code) +void deduce_missing_type(map& type, map& type_name, reagent& x) { + if (x.type) return; + if (!contains_key(type, x.name)) return; + x.type = new type_tree(*type[x.name]); + trace(9992, "transform") << x.name << " <= " << dump_types(x) << end(); + assert(!x.properties.at(0).second); + x.properties.at(0).second = new string_tree(*type_name[x.name]); +} + :(scenario transform_fills_in_missing_types_in_product) recipe main [ x:number <- copy 1 diff --git a/057static_dispatch.cc b/057static_dispatch.cc index a52cda9a..b8b663e2 100644 --- a/057static_dispatch.cc +++ b/057static_dispatch.cc @@ -112,7 +112,7 @@ Transform.push_back(resolve_ambiguous_calls); // idempotent void resolve_ambiguous_calls(recipe_ordinal r) { if (!get(Recipe, r).has_header) return; trace(9991, "transform") << "--- resolve ambiguous calls for recipe " << get(Recipe, r).name << end(); - cerr << "--- resolve ambiguous calls for recipe " << get(Recipe, r).name << '\n'; +//? cerr << "--- resolve ambiguous calls for recipe " << get(Recipe, r).name << '\n'; for (long long int index = 0; index < SIZE(get(Recipe, r).steps); ++index) { instruction& inst = get(Recipe, r).steps.at(index); if (inst.is_label) continue; diff --git a/058generic_container.cc b/058generic_container.cc index df9b63bc..44762f00 100644 --- a/058generic_container.cc +++ b/058generic_container.cc @@ -60,15 +60,15 @@ void read_type_ingredients(string& name) { raise_error << "can't repeat type ingredient names in a single container definition\n" << end(); return; } - put(info.type_ingredient_names, curr, next_type_ordinal++); + info.type_ingredient_names[curr] = next_type_ordinal++; } } :(before "End insert_container Special Uses(type_name)") // check for use of type ingredients if (type_name.at(0) == '_') { - *curr_type = new type_tree(get(info.type_ingredient_names, type_name)); - trace(9999, "parse") << " type: " << get(info.type_ingredient_names, type_name) << end(); + *curr_type = new type_tree(info.type_ingredient_names[type_name]); + trace(9999, "parse") << " type: " << info.type_ingredient_names[type_name] << end(); continue; } @@ -86,7 +86,7 @@ if (t.elements.at(i)->value >= START_TYPE_INGREDIENTS) { dump_types(type, out); raise_error << "illegal type '" << out.str() << "' seems to be missing a type ingredient or three\n" << end(); } - result += size; + result += size_of_type_ingredient(t.elements.at(i), type->right); continue; } @@ -103,7 +103,6 @@ long long int size_of_type_ingredient(const type_tree* element_template, const t } assert(curr); assert(!curr->left); // unimplemented - assert(contains_key(Type, curr->value)); trace(9999, "type") << "type deduced to be " << get(Type, curr->value).name << "$" << end(); type_tree tmp(curr->value); if (curr->right) diff --git a/059generic_recipe.cc b/059generic_recipe.cc index d94d2464..64dbf6a1 100644 --- a/059generic_recipe.cc +++ b/059generic_recipe.cc @@ -20,10 +20,19 @@ recipe foo a:_t -> result:_t [ +mem: storing 14 in location 11 +mem: storing 15 in location 12 -//: Before anything else, disable transforms for generic recipes. +//: Before anything else, disable all previous transforms which rely on +//: reagent.type if a recipe contains any type ingredients. -:(before "End Transform Checks") -if (any_type_ingredient_in_header(/*recipe_ordinal*/p->first)) continue; +:(after "void check_instruction(const recipe_ordinal r)") + if (any_type_ingredient_in_header(r)) return; +:(after "void check_or_set_invalid_types(const recipe_ordinal r)") + if (any_type_ingredient_in_header(r)) return; +:(after "void transform_names(const recipe_ordinal r)") + if (any_type_ingredient_in_header(r)) return; +:(after "void transform_new_to_allocate(const recipe_ordinal r)") + if (any_type_ingredient_in_header(r)) return; +:(after "void check_header_products(const recipe_ordinal r)") + if (any_type_ingredient_in_header(r)) return; //: We'll be creating recipes without loading them from anywhere by //: *specializing* existing recipes, so make sure we don't clear any of those @@ -41,9 +50,16 @@ if (best_score == -1) { variants.push_back(new_variant(exemplar, inst)); inst.name = get(Recipe, variants.back()).name; trace(9992, "transform") << "new specialization: " << inst.name << end(); +//? cerr << "new specialization: " << inst.name << '\n'; } } +//: Don't bother resolving ambiguous calls inside generic recipes. Just do +//: their specializations. + +:(after "void resolve_ambiguous_calls") +if (any_type_ingredient_in_header(r)) return; + :(code) recipe_ordinal pick_matching_generic_variant(vector& variants, const instruction& inst, long long int& best_score) { recipe_ordinal result = 0; @@ -124,95 +140,42 @@ recipe_ordinal new_variant(recipe_ordinal exemplar, const instruction& inst) { string new_name = next_unused_recipe_name(inst.name); trace(9993, "transform") << "switching " << inst.name << " to " << new_name << end(); assert(!contains_key(Recipe_ordinal, new_name)); - recipe_ordinal new_recipe_ordinal = put(Recipe_ordinal, new_name, Next_recipe_ordinal++); + recipe_ordinal result = put(Recipe_ordinal, new_name, Next_recipe_ordinal++); // make a copy assert(contains_key(Recipe, exemplar)); - assert(!contains_key(Recipe, new_recipe_ordinal)); - recently_added_recipes.push_back(new_recipe_ordinal); - put(Recipe, new_recipe_ordinal, get(Recipe, exemplar)); - recipe& new_recipe = get(Recipe, new_recipe_ordinal); - // Since the exemplar never ran any transforms, we have to redo some of the - // work of the check_types_by_name transform while supporting type-ingredients. - compute_type_names(new_recipe); - // that gives enough information to replace type-ingredients with concrete types + assert(!contains_key(Recipe, result)); + recently_added_recipes.push_back(result); + put(Recipe, result, get(Recipe, exemplar)); + recipe& new_recipe = get(Recipe, result); + // update its name new_recipe.name = new_name; - map mappings; + // update its contents + map mappings; // weak references compute_type_ingredient_mappings(get(Recipe, exemplar), inst, mappings); replace_type_ingredients(new_recipe, mappings); - ensure_all_concrete_types(new_recipe); - // finally, perform all transforms on the new specialization - cerr << "contents of " << new_recipe.name << '\n'; - for (long long int index = 0; index < SIZE(new_recipe.steps); ++index) { - instruction& inst = new_recipe.steps.at(index); - cerr << "inst: " << inst.to_string() << '\n'; - for (long long int i = 0; i < SIZE(inst.ingredients); ++i) { - cerr << " " << inst.ingredients.at(i).to_string() << " => " << dump_types(inst.ingredients.at(i)) << '\n'; - } - cerr << "--\n"; - for (long long int i = 0; i < SIZE(inst.products); ++i) - cerr << " " << inst.products.at(i).to_string() << " => " << dump_types(inst.products.at(i)) << '\n'; - } - for (long long int t = 0; t < SIZE(Transform); ++t) { - (*Transform.at(t))(new_recipe_ordinal); - } - new_recipe.transformed_until = SIZE(Transform)-1; - return new_recipe_ordinal; -} - -void compute_type_names(recipe& variant) { - map type_names; - for (long long int i = 0; i < SIZE(variant.ingredients); ++i) { - save_or_deduce_type_name(variant.ingredients.at(i), type_names); - } - for (long long int i = 0; i < SIZE(variant.products); ++i) { - save_or_deduce_type_name(variant.products.at(i), type_names); - } - for (long long int i = 0; i < SIZE(variant.steps); ++i) { - instruction& inst = variant.steps.at(i); - for (long long int in = 0; in < SIZE(inst.ingredients); ++in) { - save_or_deduce_type_name(inst.ingredients.at(in), type_names); - } - for (long long int out = 0; out < SIZE(inst.products); ++out) { - save_or_deduce_type_name(inst.products.at(out), type_names); - } - } -} - -void save_or_deduce_type_name(reagent& x, map& type_name) { - if (!x.properties.at(0).second && contains_key(type_name, x.name)) { - x.properties.at(0).second = new string_tree(*get(type_name, x.name)); - return; - } - if (!x.properties.at(0).second) { - raise << "unknown type for " << x.original_string << '\n' << end(); - return; - } - if (contains_key(type_name, x.name)) return; - if (x.properties.at(0).second->value == "offset" || x.properties.at(0).second->value == "variant") return; // hack for container-access instructions - put(type_name, x.name, x.properties.at(0).second); - ostringstream type_name_buf; - dump_property(x.properties.at(0).second, type_name_buf); - trace(9993, "transform") << "type of " << x.name << " is " << type_name_buf.str() << end(); + return result; } void compute_type_ingredient_mappings(const recipe& exemplar, const instruction& inst, map& mappings) { +//? cerr << "=== " << exemplar.name << " vs " << inst.to_string() << '\n'; for (long long int i = 0; i < SIZE(exemplar.ingredients); ++i) { - const reagent& base = exemplar.ingredients.at(i); reagent ingredient = inst.ingredients.at(i); - assert(ingredient.properties.at(0).second); canonize_type(ingredient); - accumulate_type_ingredients(base, ingredient, mappings, exemplar); + accumulate_type_ingredients(exemplar.ingredients.at(i), ingredient, mappings, exemplar); } for (long long int i = 0; i < SIZE(exemplar.products); ++i) { - const reagent& base = exemplar.products.at(i); reagent product = inst.products.at(i); - assert(product.properties.at(0).second); canonize_type(product); - accumulate_type_ingredients(base, product, mappings, exemplar); + accumulate_type_ingredients(exemplar.products.at(i), product, mappings, exemplar); } } -void accumulate_type_ingredients(const reagent& base, reagent& refinement, map& mappings, const recipe& exemplar) { +void accumulate_type_ingredients(const reagent& base, const reagent& refinement, map& mappings, const recipe& exemplar) { +//? cerr << base.to_string() << " vs " << refinement.to_string() << '\n'; + if (!refinement.properties.at(0).second) { + if (!Trace_stream) cerr << "Turn on START_TRACING_UNTIL_END_OF_SCOPE in 020run.cc for more details.\n"; + DUMP(""); + } assert(refinement.properties.at(0).second); accumulate_type_ingredients(base.properties.at(0).second, refinement.properties.at(0).second, mappings, exemplar, base); } @@ -227,10 +190,10 @@ void accumulate_type_ingredients(const string_tree* base, const string_tree* ref assert(!refinement->value.empty()); if (!contains_key(mappings, base->value)) { trace(9993, "transform") << "adding mapping from " << base->value << " to " << refinement->value << end(); - cerr << "adding mapping from " << base->value << " to " << refinement->value << '\n'; put(mappings, base->value, refinement->value); } else { +//? cerr << base->value << ": " << get(mappings, base->value) << " => " << refinement->value << '\n'; assert(get(mappings, base->value) == refinement->value); } } @@ -265,9 +228,9 @@ void replace_type_ingredients(recipe& new_recipe, const map& map } void replace_type_ingredients(reagent& x, const map& mappings) { + if (!x.type) return; trace(9993, "transform") << "replacing in ingredient " << x.original_string << end(); // replace properties - assert(x.properties.at(0).second); replace_type_ingredients(x.properties.at(0).second, mappings); // refresh types from properties delete x.type; @@ -280,42 +243,12 @@ void replace_type_ingredients(string_tree* type, const map& mapp if (!type) return; if (is_type_ingredient_name(type->value) && contains_key(mappings, type->value)) { trace(9993, "transform") << type->value << " => " << mappings.find(type->value)->second << end(); - cerr << type->value << " => " << mappings.find(type->value)->second << '\n'; type->value = mappings.find(type->value)->second; } replace_type_ingredients(type->left, mappings); replace_type_ingredients(type->right, mappings); } -void ensure_all_concrete_types(const recipe& new_recipe) { - for (long long int i = 0; i < SIZE(new_recipe.ingredients); ++i) { - ensure_all_concrete_types(new_recipe.ingredients.at(i).type); - } - for (long long int i = 0; i < SIZE(new_recipe.products); ++i) { - ensure_all_concrete_types(new_recipe.products.at(i).type); - } - for (long long int i = 0; i < SIZE(new_recipe.steps); ++i) { - const instruction& inst = new_recipe.steps.at(i); - for (long long int j = 0; j < SIZE(inst.ingredients); ++j) { - ensure_all_concrete_types(inst.ingredients.at(j).type); - } - for (long long int j = 0; j < SIZE(inst.products); ++j) { - ensure_all_concrete_types(inst.products.at(j).type); - } - } -} - -void ensure_all_concrete_types(const type_tree* x) { - if (!x) { - raise << "AAA null type\n" << end(); - return; - } - if (x->value == -1) { - raise << "AAA unknown type\n" << end(); - return; - } -} - :(scenario generic_recipe_2) recipe main [ 10:point <- merge 14, 15 -- cgit 1.4.1-2-gfad0