Fix all of the linting errors

Author: martin

src/analyses/variable-sensitivity/abstract_enviroment.cpp

@@ -491,8 +491,6 @@ Function: abstract_environmentt::merge
 
 \*******************************************************************/
 
-#include <iostream>
-
 bool abstract_environmentt::merge(const abstract_environmentt &env)
 {
   // Use the sharing_map's "iterative over all differences" functionality

src/analyses/variable-sensitivity/abstract_object.h

@@ -43,7 +43,7 @@ class abstract_environmentt;
 class namespacet;
 
 #define CLONE                                                                  \
-  virtual internal_abstract_object_pointert mutable_clone() const override     \
+  internal_abstract_object_pointert mutable_clone() const override             \
   {                                                                            \
     typedef std::remove_const<                                                 \
       std::remove_reference<decltype(*this)>::type>::type current_typet;       \

src/analyses/variable-sensitivity/abstract_object_statistics.h

@@ -1,3 +1,11 @@
+/*******************************************************************\
+
+Module: Variable Sensitivity Domain
+
+Author: Hannes Steffenhagen
+
+\*******************************************************************/
+
 #ifndef CPROVER_ANALYSES_VARIABLE_SENSITIVITY_ABSTRACT_OBJECT_STATISTICS_H
 #define CPROVER_ANALYSES_VARIABLE_SENSITIVITY_ABSTRACT_OBJECT_STATISTICS_H
 

src/analyses/variable-sensitivity/array_abstract_object.h

@@ -24,12 +24,12 @@ class array_abstract_objectt : public abstract_objectt
     const abstract_environmentt &environment,
     const namespacet &ns);
 
-  virtual abstract_object_pointert read(
+  abstract_object_pointert read(
     const abstract_environmentt &env,
     const exprt &specifier,
     const namespacet &ns) const override;
 
-  virtual abstract_object_pointert write(
+  abstract_object_pointert write(
     abstract_environmentt &environment,
     const namespacet &ns,
     const std::stack<exprt> stack,

src/analyses/variable-sensitivity/constant_abstract_value.cpp

@@ -48,7 +48,7 @@ abstract_object_pointert constant_abstract_valuet::expression_transform(
   // try finding the rounding mode. If it's not constant, try
   // seeing if we can get the same result with all rounding modes
   auto rounding_mode_symbol =
-    symbol_exprt("__CPROVER_rounding_mode", signedbv_typet(32));
+    symbol_exprt(CPROVER_PREFIX "rounding_mode", signedbv_typet(32));
   auto rounding_mode_value = environment.eval(rounding_mode_symbol, ns);
   auto rounding_mode_constant = rounding_mode_value->to_constant();
   if(rounding_mode_constant.is_nil())
@@ -103,7 +103,7 @@ constant_abstract_valuet::try_transform_expr_with_all_rounding_modes(
   const namespacet &ns) const
 {
   const symbol_exprt rounding_mode_symbol =
-    symbol_exprt("__CPROVER_rounding_mode", signedbv_typet(32));
+    symbol_exprt(CPROVER_PREFIX "rounding_mode", signedbv_typet(32));
   // NOLINTNEXTLINE (whitespace/braces)
   auto rounding_modes = std::array<ieee_floatt::rounding_modet, 4>{
     // NOLINTNEXTLINE (whitespace/braces)

src/analyses/variable-sensitivity/constant_abstract_value.h

@@ -31,15 +31,15 @@ class constant_abstract_valuet : public abstract_valuet
   {
   }
 
-  virtual abstract_object_pointert expression_transform(
+  abstract_object_pointert expression_transform(
     const exprt &expr,
     const std::vector<abstract_object_pointert> &operands,
     const abstract_environmentt &environment,
     const namespacet &ns) const override;
 
-  virtual exprt to_constant() const override;
+  exprt to_constant() const override;
 
-  virtual void output(
+  void output(
     std::ostream &out,
     const class ai_baset &ai,
     const class namespacet &ns) const override;
@@ -64,8 +64,7 @@ class constant_abstract_valuet : public abstract_valuet
 
 protected:
   CLONE
-  virtual abstract_object_pointert
-  merge(abstract_object_pointert other) const override;
+  abstract_object_pointert merge(abstract_object_pointert other) const override;
 
   abstract_object_pointert try_transform_expr_with_all_rounding_modes(
     const exprt &expr,

src/analyses/variable-sensitivity/constant_array_abstract_object.cpp

@@ -183,7 +183,7 @@ abstract_object_pointert constant_array_abstract_objectt::constant_array_merge(
         mutable_clone());
 
     bool modified =
-      abstract_objectt::merge_shared_maps<mp_integer, mp_integer_hash>(
+      abstract_objectt::merge_shared_maps<mp_integer, mp_integer_hasht>(
         map, other->map, result->map);
 
     if(!modified)

src/analyses/variable-sensitivity/constant_array_abstract_object.h

@@ -37,7 +37,7 @@ class constant_array_abstract_objectt : public array_abstract_objectt
   void output(std::ostream &out, const ai_baset &ai, const namespacet &ns)
     const override;
 
-  virtual abstract_object_pointert
+  abstract_object_pointert
   visit_sub_elements(const abstract_object_visitort &visitor) const override;
 
   void get_statistics(
@@ -49,24 +49,23 @@ class constant_array_abstract_objectt : public array_abstract_objectt
 protected:
   CLONE
 
-  virtual abstract_object_pointert read_index(
+  abstract_object_pointert read_index(
     const abstract_environmentt &env,
     const index_exprt &index,
     const namespacet &ns) const override;
 
-  virtual sharing_ptrt<array_abstract_objectt> write_index(
+  sharing_ptrt<array_abstract_objectt> write_index(
     abstract_environmentt &environment,
     const namespacet &ns,
     const std::stack<exprt> stack,
     const index_exprt &index_expr,
     const abstract_object_pointert value,
     bool merging_write) const override;
 
-  virtual abstract_object_pointert
-  merge(abstract_object_pointert other) const override;
+  abstract_object_pointert merge(abstract_object_pointert other) const override;
 
-  virtual bool verify() const override;
-  virtual void make_top_internal() override;
+  bool verify() const override;
+  void make_top_internal() override;
 
   virtual bool eval_index(
     const index_exprt &index,
@@ -78,7 +77,7 @@ class constant_array_abstract_objectt : public array_abstract_objectt
   // Since we don't store for any index where the value is top
   // we don't use a regular array but instead a map of array indices
   // to the value at that index
-  struct mp_integer_hash
+  struct mp_integer_hasht
   {
     size_t operator()(const mp_integer &i) const
     {
@@ -90,7 +89,7 @@ class constant_array_abstract_objectt : public array_abstract_objectt
     mp_integer,
     abstract_object_pointert,
     false,
-    mp_integer_hash>
+    mp_integer_hasht>
     shared_array_mapt;
 
   shared_array_mapt map;

src/analyses/variable-sensitivity/constant_pointer_abstract_object.h

@@ -54,8 +54,7 @@ class constant_pointer_abstract_objectt : public pointer_abstract_objectt
     const namespacet &ns) const override;
 
 protected:
-  virtual abstract_object_pointert
-  merge(abstract_object_pointert op1) const override;
+  abstract_object_pointert merge(abstract_object_pointert op1) const override;
 
   CLONE
 

src/analyses/variable-sensitivity/context_abstract_object.h

@@ -59,17 +59,17 @@ class context_abstract_objectt : public abstract_objectt
     return child_abstract_object->type();
   }
 
-  virtual bool is_top() const override
+  bool is_top() const override
   {
     return child_abstract_object->is_top();
   }
 
-  virtual bool is_bottom() const override
+  bool is_bottom() const override
   {
     return child_abstract_object->is_bottom();
   }
 
-  virtual exprt to_constant() const override
+  exprt to_constant() const override
   {
     return child_abstract_object->to_constant();
   }
@@ -80,10 +80,8 @@ class context_abstract_objectt : public abstract_objectt
     const abstract_environmentt &environment,
     const namespacet &ns) const override;
 
-  virtual void output(
-    std::ostream &out,
-    const class ai_baset &ai,
-    const namespacet &ns) const override;
+  void output(std::ostream &out, const class ai_baset &ai, const namespacet &ns)
+    const override;
 
   abstract_object_pointert unwrap_context() const override;
 
@@ -105,24 +103,23 @@ 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
-  virtual void make_top_internal() override;
-  virtual void clear_top_internal() override;
+  void make_top_internal() override;
+  void clear_top_internal() override;
 
-  virtual abstract_object_pointert read(
+  abstract_object_pointert read(
     const abstract_environmentt &env,
     const exprt &specifier,
     const namespacet &ns) const override;
 
-  virtual abstract_object_pointert write(
+  abstract_object_pointert write(
     abstract_environmentt &environment,
     const namespacet &ns,
     const std::stack<exprt> stack,
     const exprt &specifier,
     const abstract_object_pointert value,
     bool merging_write) const override;
 
-  virtual bool
-  has_been_modified(const abstract_object_pointert before) const override;
+  bool has_been_modified(const abstract_object_pointert before) const override;
 };
 
 #endif // CPROVER_ANALYSES_VARIABLE_SENSITIVITY_CONTEXT_ABSTRACT_OBJECT_H