diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2016-01-29 21:58:00 -0800 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2016-01-29 21:58:00 -0800 |
commit | e06dbec08d4b82af2478c288c9fe158a12ef3b1b (patch) | |
tree | f04cc2e23841b7b5c312c1dd3a7e93075f43e1fd /042name.cc | |
parent | 7eec783e6ef16722cfa7e5631bff724742cdefb0 (diff) | |
download | mu-e06dbec08d4b82af2478c288c9fe158a12ef3b1b.tar.gz |
2614
Diffstat (limited to '042name.cc')
-rw-r--r-- | 042name.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/042name.cc b/042name.cc index 4c855570..ef3a8bfc 100644 --- a/042name.cc +++ b/042name.cc @@ -44,7 +44,7 @@ void transform_names(const recipe_ordinal r) { // End transform_names(inst) Special-cases // map names to addresses for (long long int in = 0; in < SIZE(inst.ingredients); ++in) { - if (disqualified(inst.ingredients.at(in), inst, caller.name)) continue; + if (is_disqualified(inst.ingredients.at(in), inst, caller.name)) continue; if (is_numeric_location(inst.ingredients.at(in))) numeric_locations_used = true; if (is_named_location(inst.ingredients.at(in))) names_used = true; if (is_integer(inst.ingredients.at(in).name)) continue; @@ -54,7 +54,7 @@ void transform_names(const recipe_ordinal r) { inst.ingredients.at(in).set_value(lookup_name(inst.ingredients.at(in), r)); } for (long long int out = 0; out < SIZE(inst.products); ++out) { - if (disqualified(inst.products.at(out), inst, caller.name)) continue; + if (is_disqualified(inst.products.at(out), inst, caller.name)) continue; if (is_numeric_location(inst.products.at(out))) numeric_locations_used = true; if (is_named_location(inst.products.at(out))) names_used = true; if (is_integer(inst.products.at(out).name)) continue; @@ -70,15 +70,15 @@ void transform_names(const recipe_ordinal r) { raise_error << maybe(caller.name) << "mixing variable names and numeric addresses\n" << end(); } -bool disqualified(/*mutable*/ reagent& x, const instruction& inst, const string& recipe_name) { +bool is_disqualified(/*mutable*/ reagent& x, const instruction& inst, const string& recipe_name) { if (!x.type) { - // End transform_names Exceptions + // End Null-type is_disqualified Exceptions raise_error << maybe(recipe_name) << "missing type for " << x.original_string << " in '" << inst.to_string() << "'\n" << end(); return true; } if (is_raw(x)) return true; if (is_literal(x)) return true; - // End Disqualified Reagents + // End is_disqualified Cases if (x.initialized) return true; return false; } |