Small fixes in abstract_environmentt

Avoid shadowing member variable, make single-arg constructor explicit

Author: jezhiggins

src/analyses/variable-sensitivity/abstract_environment.cpp

@@ -66,7 +66,7 @@ abstract_environmentt::eval(const exprt &expr, const namespacet &ns) const
 
   // No special handling required by the abstract environment
   // delegate to the abstract object
-  if(simplified_expr.operands().size() > 0)
+  if(!simplified_expr.operands().empty())
   {
     return eval_expression(simplified_expr, ns);
   }
@@ -146,7 +146,7 @@ bool abstract_environmentt::assign(
     // to be none of that.
     if(s.id() != ID_symbol)
     {
-      throw "invalid l-value";
+      throw std::runtime_error("invalid l-value");
     }
     // We can assign the AO directly to the symbol
     final_value = value;
@@ -252,11 +252,11 @@ abstract_object_pointert abstract_environmentt::abstract_object_factory(
   const typet &type,
   const namespacet &ns,
   bool top,
-  bool bottom) const
+  bool bttm) const
 {
   exprt empty_constant_expr = nil_exprt();
   return abstract_object_factory(
-    type, top, bottom, empty_constant_expr, *this, ns);
+    type, top, bttm, empty_constant_expr, *this, ns);
 }
 
 abstract_object_pointert abstract_environmentt::abstract_object_factory(
@@ -270,13 +270,13 @@ abstract_object_pointert abstract_environmentt::abstract_object_factory(
 abstract_object_pointert abstract_environmentt::abstract_object_factory(
   const typet &type,
   bool top,
-  bool bottom,
+  bool bttm,
   const exprt &e,
   const abstract_environmentt &environment,
   const namespacet &ns) const
 {
   return object_factory->get_abstract_object(
-    type, top, bottom, e, environment, ns);
+    type, top, bttm, e, environment, ns);
 }
 
 abstract_object_pointert abstract_environmentt::add_object_context(

src/analyses/variable-sensitivity/abstract_environment.h

@@ -39,9 +39,9 @@ class abstract_environmentt
 
   abstract_environmentt() = delete;
 
-  abstract_environmentt(
+  explicit abstract_environmentt(
     variable_sensitivity_object_factory_ptrt _object_factory)
-    : bottom(true), object_factory(_object_factory)
+    : bottom(true), object_factory(std::move(_object_factory))
   {
   }