From 850822ffbfd441d05161452be28b54f882b1b378 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Wed, 1 Nov 2017 03:41:16 -0700 Subject: 4102 --- html/033exclusive_container.cc.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'html/033exclusive_container.cc.html') diff --git a/html/033exclusive_container.cc.html b/html/033exclusive_container.cc.html index e0ce1f54..88d8d090 100644 --- a/html/033exclusive_container.cc.html +++ b/html/033exclusive_container.cc.html @@ -199,7 +199,7 @@ if ('onhashchange' in window) { 134 } 135 const reagent& variant = variant_type(base, offset.value); 136 if (!types_coercible(product, variant)) { -137 ¦ raise << maybe(caller.name) << "'maybe-convert " << base.original_string << ", " << inst.ingredients.at(1).original_string << "' should write to " << to_string(variant.type) << " but '" << product.name << "' has type " << to_string(product.type) << '\n' << end(); +137 ¦ raise << maybe(caller.name) << "'maybe-convert " << base.original_string << ", " << inst.ingredients.at(1).original_string << "' should write to " << to_string(variant.type) << " but '" << product.name << "' has type " << to_string(product.type) << '\n' << end(); 138 ¦ break; 139 } 140 reagent/*copy*/ status = inst.products.at(1); @@ -212,17 +212,17 @@ if ('onhashchange' in window) { 147 } 148 :(before "End Primitive Recipe Implementations") 149 case MAYBE_CONVERT: { -150 reagent/*copy*/ base = current_instruction().ingredients.at(0); +150 reagent/*copy*/ base = current_instruction().ingredients.at(0); 151 // Update MAYBE_CONVERT base in Run 152 int base_address = base.value; 153 if (base_address == 0) { -154 ¦ raise << maybe(current_recipe_name()) << "tried to access location 0 in '" << to_original_string(current_instruction()) << "'\n" << end(); +154 ¦ raise << maybe(current_recipe_name()) << "tried to access location 0 in '" << to_original_string(current_instruction()) << "'\n" << end(); 155 ¦ break; 156 } -157 int tag = current_instruction().ingredients.at(1).value; -158 reagent/*copy*/ product = current_instruction().products.at(0); +157 int tag = current_instruction().ingredients.at(1).value; +158 reagent/*copy*/ product = current_instruction().products.at(0); 159 // Update MAYBE_CONVERT product in Run -160 reagent/*copy*/ status = current_instruction().products.at(1); +160 reagent/*copy*/ status = current_instruction().products.at(1); 161 // Update MAYBE_CONVERT status in Run 162 // optimization: directly write results to only update first product when necessary 163 write_products = false; @@ -383,7 +383,7 @@ if ('onhashchange' in window) { 318 :(before "End check_merge_call Special-cases") 319 case EXCLUSIVE_CONTAINER: { 320 assert(state.data.top().container_element_index == 0); -321 trace(9999, "transform") << "checking exclusive container " << to_string(container) << " vs ingredient " << ingredient_index << end(); +321 trace(9999, "transform") << "checking exclusive container " << to_string(container) << " vs ingredient " << ingredient_index << end(); 322 // easy case: exact match 323 if (types_strictly_match(container, inst.ingredients.at(ingredient_index))) 324 ¦ return; @@ -502,11 +502,11 @@ if ('onhashchange' in window) { 437 //: Since the different variants of an exclusive-container might have 438 //: different sizes, relax the size mismatch check for 'merge' instructions. 439 :(before "End size_mismatch(x) Special-cases") -440 if (current_step_index() < SIZE(Current_routine->steps()) -441 ¦ && current_instruction().operation == MERGE +440 if (current_step_index() < SIZE(Current_routine->steps()) +441 ¦ && current_instruction().operation == MERGE 442 ¦ && !current_instruction().products.empty() -443 ¦ && current_instruction().products.at(0).type) { -444 reagent/*copy*/ x = current_instruction().products.at(0); +443 ¦ && current_instruction().products.at(0).type) { +444 reagent/*copy*/ x = current_instruction().products.at(0); 445 // Update size_mismatch Check for MERGE(x) 446 const type_tree* root_type = x.type->atom ? x.type : x.type->left; 447 assert(root_type->atom); -- cgit 1.4.1-2-gfad0