2614

4 files changed, 9 insertions, 9 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;
 }
diff --git a/043space.cc b/043space.cc
index 5bbda699..f8e6881b 100644
--- a/043space.cc
+++ b/043space.cc
@@ -37,7 +37,7 @@ recipe main [
 +name: assign x 1
 -name: assign default-space 1
 
-:(before "End Disqualified Reagents")
+:(before "End is_disqualified Cases")
 if (x.name == "default-space")
   x.initialized = true;
 :(before "End is_special_name Cases")
@@ -166,7 +166,7 @@ recipe main [
 # allocate space for x and y, as well as the chaining slot at 0
 +mem: array size is 3
 
-:(before "End Disqualified Reagents")
+:(before "End is_disqualified Cases")
 if (x.name == "number-of-locals")
   x.initialized = true;
 :(before "End is_special_name Cases")
diff --git a/046global.cc b/046global.cc
index 87a39937..ff91c88d 100644
--- a/046global.cc
+++ b/046global.cc
@@ -23,7 +23,7 @@ recipe main [
 +mem: storing 24 in location 23
 
 //: to support it, create another special variable called global space
-:(before "End Disqualified Reagents")
+:(before "End is_disqualified Cases")
 if (x.name == "global-space")
   x.initialized = true;
 :(before "End is_special_name Cases")
diff --git a/061recipe.cc b/061recipe.cc
index c56b5e27..0b4686dc 100644
--- a/061recipe.cc
+++ b/061recipe.cc
@@ -31,7 +31,7 @@ put(Type_ordinal, "recipe-literal", 0);
 type_ordinal recipe = put(Type_ordinal, "recipe", Next_type_ordinal++);
 get_or_insert(Type, recipe).name = "recipe";
 
-:(before "End transform_names Exceptions")
+:(before "End Null-type is_disqualified Exceptions")
 if (!x.properties.at(0).second && contains_key(Recipe_ordinal, x.name)) {
   x.properties.at(0).second = new string_tree("recipe-literal");
   x.type = new type_tree(get(Type_ordinal, "recipe-literal"));