From 1c2d788b454670bf8fa1cb65c6251a8ff6ddcaf7 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Mon, 19 Jun 2017 11:29:20 -0700 Subject: 3927 --- html/028call_return.cc.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'html/028call_return.cc.html') diff --git a/html/028call_return.cc.html b/html/028call_return.cc.html index 57915f2e..75d5f20b 100644 --- a/html/028call_return.cc.html +++ b/html/028call_return.cc.html @@ -100,7 +100,7 @@ if ('onhashchange' in window) { 37 case RETURN: { 38 // Starting Reply 39 if (Trace_stream) { - 40 ¦ trace(9999, "trace") << current_instruction().name << ": decrementing callstack depth from " << Trace_stream->callstack_depth << end(); + 40 ¦ trace(9999, "trace") << current_instruction().name << ": decrementing callstack depth from " << Trace_stream->callstack_depth << end(); 41 ¦ --Trace_stream->callstack_depth; 42 ¦ if (Trace_stream->callstack_depth < 0) { 43 ¦ ¦ Current_routine->calls.clear(); @@ -111,9 +111,9 @@ if ('onhashchange' in window) { 48 // just in case 'main' returns a value, drop it for now 49 if (Current_routine->calls.empty()) goto stop_running_current_routine; 50 for (int i = 0; i < SIZE(ingredients); ++i) - 51 ¦ trace(9998, "run") << "result " << i << " is " << to_string(ingredients.at(i)) << end(); + 51 ¦ trace(9998, "run") << "result " << i << " is " << to_string(ingredients.at(i)) << end(); 52 // make return products available to caller - 53 copy(ingredients.begin(), ingredients.end(), inserter(products, products.begin())); + 53 copy(ingredients.begin(), ingredients.end(), inserter(products, products.begin())); 54 // End Reply 55 break; // continue to process rest of *caller* instruction 56 } @@ -125,7 +125,7 @@ if ('onhashchange' in window) { 62 :(code) 63 void check_types_of_return_instructions(const recipe_ordinal r) { 64 const recipe& caller = get(Recipe, r); - 65 trace(9991, "transform") << "--- check types of return instructions in recipe " << caller.name << end(); + 65 trace(9991, "transform") << "--- check types of return instructions in recipe " << caller.name << end(); 66 for (int i = 0; i < SIZE(caller.steps); ++i) { 67 ¦ const instruction& caller_instruction = caller.steps.at(i); 68 ¦ if (caller_instruction.is_label) continue; @@ -137,7 +137,7 @@ if ('onhashchange' in window) { 74 ¦ ¦ if (return_inst.operation != RETURN) continue; 75 ¦ ¦ // check types with the caller 76 ¦ ¦ if (SIZE(caller_instruction.products) > SIZE(return_inst.ingredients)) { - 77 ¦ ¦ ¦ raise << maybe(caller.name) << "too few values returned from " << callee.name << '\n' << end(); + 77 ¦ ¦ ¦ raise << maybe(caller.name) << "too few values returned from " << callee.name << '\n' << end(); 78 ¦ ¦ ¦ break; 79 ¦ ¦ } 80 ¦ ¦ for (int i = 0; i < SIZE(caller_instruction.products); ++i) { @@ -146,7 +146,7 @@ if ('onhashchange' in window) { 83 ¦ ¦ ¦ // End Check RETURN Copy(lhs, rhs) 84 ¦ ¦ ¦ if (!types_coercible(rhs, lhs)) { 85 ¦ ¦ ¦ ¦ raise << maybe(callee.name) << return_inst.name << " ingredient '" << lhs.original_string << "' can't be saved in '" << rhs.original_string << "'\n" << end(); - 86 ¦ ¦ ¦ ¦ raise << " ['" << to_string(lhs.type) << "' vs '" << to_string(rhs.type) << "']\n" << end(); + 86 ¦ ¦ ¦ ¦ raise << " ['" << to_string(lhs.type) << "' vs '" << to_string(rhs.type) << "']\n" << end(); 87 ¦ ¦ ¦ ¦ goto finish_return_check; 88 ¦ ¦ ¦ } 89 ¦ ¦ } @@ -156,16 +156,16 @@ if ('onhashchange' in window) { 93 ¦ ¦ ¦ if (has_property(return_inst.ingredients.at(i), "same-as-ingredient")) { 94 ¦ ¦ ¦ ¦ string_tree* tmp = property(return_inst.ingredients.at(i), "same-as-ingredient"); 95 ¦ ¦ ¦ ¦ if (!tmp || !tmp->atom) { - 96 ¦ ¦ ¦ ¦ ¦ raise << maybe(caller.name) << "'same-as-ingredient' metadata should take exactly one value in '" << to_original_string(return_inst) << "'\n" << end(); + 96 ¦ ¦ ¦ ¦ ¦ raise << maybe(caller.name) << "'same-as-ingredient' metadata should take exactly one value in '" << to_original_string(return_inst) << "'\n" << end(); 97 ¦ ¦ ¦ ¦ ¦ goto finish_return_check; 98 ¦ ¦ ¦ ¦ } 99 ¦ ¦ ¦ ¦ int ingredient_index = to_integer(tmp->value); 100 ¦ ¦ ¦ ¦ if (ingredient_index >= SIZE(caller_instruction.ingredients)) { -101 ¦ ¦ ¦ ¦ ¦ raise << maybe(caller.name) << "too few ingredients in '" << to_original_string(caller_instruction) << "'\n" << end(); +101 ¦ ¦ ¦ ¦ ¦ raise << maybe(caller.name) << "too few ingredients in '" << to_original_string(caller_instruction) << "'\n" << end(); 102 ¦ ¦ ¦ ¦ ¦ goto finish_return_check; 103 ¦ ¦ ¦ ¦ } 104 ¦ ¦ ¦ ¦ if (!is_dummy(caller_instruction.products.at(i)) && !is_literal(caller_instruction.ingredients.at(ingredient_index)) && caller_instruction.products.at(i).name != caller_instruction.ingredients.at(ingredient_index).name) { -105 ¦ ¦ ¦ ¦ ¦ raise << maybe(caller.name) << "'" << to_original_string(caller_instruction) << "' should write to '" << caller_instruction.ingredients.at(ingredient_index).original_string << "' rather than '" << caller_instruction.products.at(i).original_string << "'\n" << end(); +105 ¦ ¦ ¦ ¦ ¦ raise << maybe(caller.name) << "'" << to_original_string(caller_instruction) << "' should write to '" << caller_instruction.ingredients.at(ingredient_index).original_string << "' rather than '" << caller_instruction.products.at(i).original_string << "'\n" << end(); 106 ¦ ¦ ¦ ¦ } 107 ¦ ¦ ¦ } 108 ¦ ¦ } -- cgit 1.4.1-2-gfad0