Renamed non-const make_top/clear_top

Changed to set_top/set_not_top, and the
make_top_internal/clear-top_internal helpers to
set_top_internal/set_not_top_internal, to disambiguate from the const
make_top/clear_top.

Author: jezhiggins

src/analyses/variable-sensitivity/abstract_object.cpp

@@ -68,7 +68,7 @@ abstract_object_pointert abstract_objectt::abstract_object_merge(
     return this->abstract_object_merge_internal(other);
 
   internal_abstract_object_pointert merged = mutable_clone();
-  merged->make_top();
+  merged->set_top();
   merged->bottom = false;
   return merged->abstract_object_merge_internal(other);
 }

src/analyses/variable-sensitivity/abstract_object.h

@@ -318,7 +318,7 @@ class abstract_objectt : public std::enable_shared_from_this<abstract_objectt>
       return shared_from_this();
 
     internal_abstract_object_pointert clone = mutable_clone();
-    clone->make_top();
+    clone->set_top();
     return clone;
   }
 
@@ -328,7 +328,7 @@ class abstract_objectt : public std::enable_shared_from_this<abstract_objectt>
       return shared_from_this();
 
     internal_abstract_object_pointert clone = mutable_clone();
-    clone->clear_top();
+    clone->set_not_top();
     return clone;
   }
 
@@ -379,10 +379,10 @@ class abstract_objectt : public std::enable_shared_from_this<abstract_objectt>
 
   // Hooks to allow a sub-class to perform its own operations on
   // setting/clearing top
-  virtual void make_top_internal()
+  virtual void set_top_internal()
   {
   }
-  virtual void clear_top_internal()
+  virtual void set_not_top_internal()
   {
   }
 
@@ -473,15 +473,15 @@ class abstract_objectt : public std::enable_shared_from_this<abstract_objectt>
     sharing_mapt<keyt, abstract_object_pointert, false, hash> &out_map);
 
   // The one exception is merge in descendant classes, which needs this
-  void make_top()
+  void set_top()
   {
     top = true;
-    this->make_top_internal();
+    this->set_top_internal();
   }
-  void clear_top()
+  void set_not_top()
   {
     top = false;
-    this->clear_top_internal();
+    this->set_not_top_internal();
   }
 };
 

src/analyses/variable-sensitivity/constant_array_abstract_object.cpp

@@ -43,7 +43,7 @@ constant_array_abstract_objectt::constant_array_abstract_objectt(
       map.insert(mp_integer(index), environment.eval(entry, ns));
       ++index;
     }
-    clear_top();
+    set_not_top();
   }
   DATA_INVARIANT(verify(), "Structural invariants maintained");
 }
@@ -56,7 +56,7 @@ bool constant_array_abstract_objectt::verify() const
          (is_top() || is_bottom()) == map.empty();
 }
 
-void constant_array_abstract_objectt::make_top_internal()
+void constant_array_abstract_objectt::set_top_internal()
 {
   // A structural invariant of constant_array_abstract_objectt is that
   // (is_top() || is_bottom()) => map.empty()
@@ -231,7 +231,7 @@ constant_array_abstract_objectt::write_index(
             old_value.value(), value, stack, ns, merging_write));
       }
 
-      result->clear_top();
+      result->set_not_top();
       DATA_INVARIANT(result->verify(), "Structural invariants maintained");
       return result;
     }
@@ -248,7 +248,7 @@ constant_array_abstract_objectt::write_index(
           starting_value.first,
           environment.write(starting_value.second, value, stack, ns, true));
 
-        result->clear_top();
+        result->set_not_top();
       }
 
       DATA_INVARIANT(result->verify(), "Structural invariants maintained");
@@ -303,7 +303,7 @@ constant_array_abstract_objectt::write_index(
         {
           result->map.insert(index_value, value);
         }
-        result->clear_top();
+        result->set_not_top();
         DATA_INVARIANT(result->verify(), "Structural invariants maintained");
         return result;
       }

src/analyses/variable-sensitivity/constant_array_abstract_object.h

@@ -138,7 +138,7 @@ class constant_array_abstract_objectt : public array_abstract_objectt
 
   /// \brief Perform any additional structural modifications when setting this
   /// object to TOP
-  void make_top_internal() override;
+  void set_top_internal() override;
 
   /// Evaluates the index and tries to convert it to a constant integer
   ///

src/analyses/variable-sensitivity/constant_pointer_abstract_object.cpp

@@ -46,11 +46,11 @@ constant_pointer_abstract_objectt::constant_pointer_abstract_objectt(
   PRECONDITION(expr.type().id() == ID_pointer);
   if(value_stack.is_top_value())
   {
-    make_top();
+    set_top();
   }
   else
   {
-    clear_top();
+    set_not_top();
   }
 }
 

src/analyses/variable-sensitivity/context_abstract_object.cpp

@@ -18,13 +18,13 @@ void context_abstract_objectt::set_child(const abstract_object_pointert &child)
   child_abstract_object = child;
 }
 
-void context_abstract_objectt::make_top_internal()
+void context_abstract_objectt::set_top_internal()
 {
   if(!child_abstract_object->is_top())
     set_child(child_abstract_object->make_top());
 }
 
-void context_abstract_objectt::clear_top_internal()
+void context_abstract_objectt::set_not_top_internal()
 {
   if(child_abstract_object->is_top())
     set_child(child_abstract_object->clear_top());

src/analyses/variable-sensitivity/context_abstract_object.h

@@ -104,8 +104,8 @@ class context_abstract_objectt : public abstract_objectt
 
   // These are internal hooks that allow sub-classes to perform additional
   // actions when an abstract_object is set/unset to TOP
-  void make_top_internal() override;
-  void clear_top_internal() override;
+  void set_top_internal() override;
+  void set_not_top_internal() override;
 
   abstract_object_pointert read(
     const abstract_environmentt &env,

src/analyses/variable-sensitivity/full_struct_abstract_object.cpp

@@ -66,7 +66,7 @@ full_struct_abstract_objectt::full_struct_abstract_objectt(
 
   if(did_initialize_values)
   {
-    clear_top();
+    set_not_top();
   }
 
   DATA_INVARIANT(verify(), "Structural invariants maintained");
@@ -145,7 +145,7 @@ full_struct_abstract_objectt::write_component(
         environment.write(old_value.value(), value, stack, ns, merging_write));
     }
 
-    result->clear_top();
+    result->set_not_top();
     DATA_INVARIANT(result->verify(), "Structural invariants maintained");
     return result;
   }
@@ -189,7 +189,7 @@ full_struct_abstract_objectt::write_component(
       {
         result->map.insert(c, value);
       }
-      result->clear_top();
+      result->set_not_top();
       INVARIANT(!result->is_bottom(), "top != bottom");
     }
 

src/analyses/variable-sensitivity/value_set_abstract_object.cpp

@@ -174,7 +174,7 @@ abstract_object_pointert value_set_abstract_objectt::resolve_new_values(
     unwrapped_values.size() > max_value_set_size ||
     new_type == abstract_typet::UNSUPPORTED)
   {
-    result->make_top();
+    result->set_top();
   }
   else
   {