From 4a48bedcd1d708a43d43dc6259a4e45c52ea3d00 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 3 Dec 2017 23:25:40 -0800 Subject: 4134 - 'input' = 'ingredient' --- html/055shape_shifting_container.cc.html | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'html/055shape_shifting_container.cc.html') diff --git a/html/055shape_shifting_container.cc.html b/html/055shape_shifting_container.cc.html index b7a86272..5fce35b6 100644 --- a/html/055shape_shifting_container.cc.html +++ b/html/055shape_shifting_container.cc.html @@ -100,7 +100,7 @@ if ('onhashchange' in window) { 34 const type_tree* get_base_type(const type_tree* t) { 35 const type_tree* result = t->atom ? t : t->left; 36 if (!result->atom) - 37 ¦ raise << "invalid type " << to_string(t) << '\n' << end(); + 37 ¦ raise << "invalid type " << to_string(t) << '\n' << end(); 38 return result; 39 } 40 @@ -240,14 +240,14 @@ if ('onhashchange' in window) { 174 // we haven't seen this container before 175 if (!contains_key(Type_ordinal, name) || get(Type_ordinal, name) == 0) 176 ¦ put(Type_ordinal, name, Next_type_ordinal++); -177 type_info& info = get_or_insert(Type, get(Type_ordinal, name)); +177 type_info& info = get_or_insert(Type, get(Type_ordinal, name)); 178 info.type_ingredient_names.swap(type_ingredient_names); 179 return true; 180 } 181 182 bool slurp_type_ingredients(istream& in, map<string, type_ordinal>& out, const string& container_name) { 183 int next_type_ordinal = START_TYPE_INGREDIENTS; -184 while (has_data(in)) { +184 while (has_data(in)) { 185 ¦ string curr = slurp_until(in, ':'); 186 ¦ if (curr.empty()) { 187 ¦ ¦ raise << container_name << ": empty type ingredients not permitted\n" << end(); @@ -494,7 +494,7 @@ if ('onhashchange' in window) { 428 ¦ ¦ "]\n"); 429 reagent callsite("x:foo:point"); 430 reagent element = element_type(callsite.type, 0); -431 CHECK_EQ(to_string(element), "{x: \"point\"}"); +431 CHECK_EQ(to_string(element), "{x: \"point\"}"); 432 } 433 434 void test_replace_type_ingredients_tail() { @@ -506,7 +506,7 @@ if ('onhashchange' in window) { 440 ¦ ¦ "]\n"); 441 reagent callsite("x:bar:point"); 442 reagent element = element_type(callsite.type, 0); -443 CHECK_EQ(to_string(element), "{x: (\"foo\" \"point\")}"); +443 CHECK_EQ(to_string(element), "{x: (\"foo\" \"point\")}"); 444 } 445 446 void test_replace_type_ingredients_head_tail_multiple() { @@ -518,7 +518,7 @@ if ('onhashchange' in window) { 452 ¦ ¦ "]\n"); 453 reagent callsite("x:bar:address:array:character"); 454 reagent element = element_type(callsite.type, 0); -455 CHECK_EQ(to_string(element), "{x: (\"foo\" \"address\" \"array\" \"character\")}"); +455 CHECK_EQ(to_string(element), "{x: (\"foo\" \"address\" \"array\" \"character\")}"); 456 } 457 458 void test_replace_type_ingredients_head_middle() { @@ -530,7 +530,7 @@ if ('onhashchange' in window) { 464 ¦ ¦ "]\n"); 465 reagent callsite("x:bar:address"); 466 reagent element = element_type(callsite.type, 0); -467 CHECK_EQ(to_string(element), "{x: (\"foo\" \"address\" \"number\")}"); +467 CHECK_EQ(to_string(element), "{x: (\"foo\" \"address\" \"number\")}"); 468 } 469 470 void test_replace_last_type_ingredient_with_multiple() { @@ -540,9 +540,9 @@ if ('onhashchange' in window) { 474 ¦ ¦ "]\n"); 475 reagent callsite("{f: (foo number (address array character))}"); 476 reagent element1 = element_type(callsite.type, 0); -477 CHECK_EQ(to_string(element1), "{x: \"number\"}"); +477 CHECK_EQ(to_string(element1), "{x: \"number\"}"); 478 reagent element2 = element_type(callsite.type, 1); -479 CHECK_EQ(to_string(element2), "{y: (\"address\" \"array\" \"character\")}"); +479 CHECK_EQ(to_string(element2), "{y: (\"address\" \"array\" \"character\")}"); 480 } 481 482 void test_replace_last_type_ingredient_inside_compound() { @@ -562,11 +562,11 @@ if ('onhashchange' in window) { 496 ¦ ¦ "]\n"); 497 reagent callsite("{f: (foo number (address array character) boolean)}"); 498 reagent element1 = element_type(callsite.type, 0); -499 CHECK_EQ(to_string(element1), "{x: \"number\"}"); +499 CHECK_EQ(to_string(element1), "{x: \"number\"}"); 500 reagent element2 = element_type(callsite.type, 1); -501 CHECK_EQ(to_string(element2), "{y: (\"address\" \"array\" \"character\")}"); +501 CHECK_EQ(to_string(element2), "{y: (\"address\" \"array\" \"character\")}"); 502 reagent element3 = element_type(callsite.type, 2); -503 CHECK_EQ(to_string(element3), "{z: \"boolean\"}"); +503 CHECK_EQ(to_string(element3), "{z: \"boolean\"}"); 504 } 505 506 void test_replace_middle_type_ingredient_with_multiple2() { @@ -576,7 +576,7 @@ if ('onhashchange' in window) { 510 ¦ ¦ "]\n"); 511 reagent callsite("{f: (foo (address array character) number)}"); 512 reagent element = element_type(callsite.type, 0); -513 CHECK_EQ(to_string(element), "{key: (\"address\" \"array\" \"character\")}"); +513 CHECK_EQ(to_string(element), "{key: (\"address\" \"array\" \"character\")}"); 514 } 515 516 void test_replace_middle_type_ingredient_with_multiple3() { @@ -590,7 +590,7 @@ if ('onhashchange' in window) { 524 ¦ ¦ "]\n"); 525 reagent callsite("{f: (foo_table (address array character) number)}"); 526 reagent element = element_type(callsite.type, 0); -527 CHECK_EQ(to_string(element), "{data: (\"address\" \"array\" \"foo_table_row\" (\"address\" \"array\" \"character\") \"number\")}"); +527 CHECK_EQ(to_string(element), "{data: (\"address\" \"array\" \"foo_table_row\" (\"address\" \"array\" \"character\") \"number\")}"); 528 } 529 530 :(code) -- cgit 1.4.1-2-gfad0