diff options
Diffstat (limited to '036call_reply.cc')
| -rw-r--r-- | 036call_reply.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/036call_reply.cc b/036call_reply.cc index 299abf10..f0f37137 100644 --- a/036call_reply.cc +++ b/036call_reply.cc @@ -36,7 +36,7 @@ case REPLY: { // just in case 'main' returns a value, drop it for now if (Current_routine->calls.empty()) goto stop_running_current_routine; const instruction& caller_instruction = current_instruction(); - for (long long int i = 0; i < SIZE(caller_instruction.products); ++i) + for (int i = 0; i < SIZE(caller_instruction.products); ++i) trace(9998, "run") << "result " << i << " is " << to_string(ingredients.at(i)) << end(); // make reply products available to caller @@ -67,13 +67,13 @@ Transform.push_back(check_types_of_reply_instructions); void check_types_of_reply_instructions(recipe_ordinal r) { const recipe& caller = get(Recipe, r); trace(9991, "transform") << "--- check types of reply instructions in recipe " << caller.name << end(); - for (long long int i = 0; i < SIZE(caller.steps); ++i) { + for (int i = 0; i < SIZE(caller.steps); ++i) { const instruction& caller_instruction = caller.steps.at(i); if (caller_instruction.is_label) continue; if (caller_instruction.products.empty()) continue; if (caller_instruction.operation < MAX_PRIMITIVE_RECIPES) continue; const recipe& callee = get(Recipe, caller_instruction.operation); - for (long long int i = 0; i < SIZE(callee.steps); ++i) { + for (int i = 0; i < SIZE(callee.steps); ++i) { const instruction& reply_inst = callee.steps.at(i); if (reply_inst.operation != REPLY) continue; // check types with the caller @@ -81,7 +81,7 @@ void check_types_of_reply_instructions(recipe_ordinal r) { raise << maybe(caller.name) << "too few values replied from " << callee.name << '\n' << end(); break; } - for (long long int i = 0; i < SIZE(caller_instruction.products); ++i) { + for (int i = 0; i < SIZE(caller_instruction.products); ++i) { reagent lhs = reply_inst.ingredients.at(i); canonize_type(lhs); reagent rhs = caller_instruction.products.at(i); @@ -94,14 +94,14 @@ void check_types_of_reply_instructions(recipe_ordinal r) { } // check that any reply ingredients with /same-as-ingredient connect up // the corresponding ingredient and product in the caller. - for (long long int i = 0; i < SIZE(caller_instruction.products); ++i) { + for (int i = 0; i < SIZE(caller_instruction.products); ++i) { if (has_property(reply_inst.ingredients.at(i), "same-as-ingredient")) { string_tree* tmp = property(reply_inst.ingredients.at(i), "same-as-ingredient"); if (!tmp || tmp->right) { raise << maybe(caller.name) << "'same-as-ingredient' metadata should take exactly one value in " << to_string(reply_inst) << '\n' << end(); goto finish_reply_check; } - long long int ingredient_index = to_integer(tmp->value); + int ingredient_index = to_integer(tmp->value); if (ingredient_index >= SIZE(caller_instruction.ingredients)) { raise << maybe(caller.name) << "too few ingredients in '" << to_string(caller_instruction) << "'\n" << end(); goto finish_reply_check; @@ -166,7 +166,7 @@ string to_string(const vector<double>& in) { return out.str(); } out << "["; - for (long long int i = 0; i < SIZE(in); ++i) { + for (int i = 0; i < SIZE(in); ++i) { if (i > 0) out << ", "; out << no_scientific(in.at(i)); } |