Make variable_sensitivity_object_factoryt member functions const

Deleted constructors
Removed redundant initialised flag

Author: jezhiggins

src/analyses/variable-sensitivity/variable_sensitivity_object_factory.cpp

@@ -145,7 +145,7 @@ abstract_object_pointert initialize_abstract_object(
 }
 
 ABSTRACT_OBJECT_TYPET
-variable_sensitivity_object_factoryt::get_abstract_object_type(const typet type)
+variable_sensitivity_object_factoryt::get_abstract_object_type(const typet& type) const
 {
   ABSTRACT_OBJECT_TYPET abstract_object_type = TWO_VALUE;
 
@@ -183,21 +183,14 @@ variable_sensitivity_object_factoryt::get_abstract_object_type(const typet type)
 
 abstract_object_pointert
 variable_sensitivity_object_factoryt::get_abstract_object(
-  const typet type,
+  const typet &type,
   bool top,
   bool bottom,
   const exprt &e,
   const abstract_environmentt &environment,
-  const namespacet &ns)
+  const namespacet &ns) const
 {
-  if(!initialized)
-  {
-    throw "variable_sensitivity_object_factoryt::get_abstract_object() " \
-      "called without first calling " \
-      "variable_sensitivity_object_factoryt::set_options()\n";
-  }
-
-  typet followed_type = ns.follow(type);
+  const typet& followed_type = ns.follow(type);
   ABSTRACT_OBJECT_TYPET abstract_object_type =
     get_abstract_object_type(followed_type);
 

src/analyses/variable-sensitivity/variable_sensitivity_object_factory.h

@@ -188,7 +188,7 @@ class variable_sensitivity_object_factoryt
   }
 
   explicit variable_sensitivity_object_factoryt(const vsd_configt &options)
-    : configuration(options), initialized(true)
+    : configuration(options)
   {
   }
 
@@ -207,28 +207,26 @@ class variable_sensitivity_object_factoryt
   ///
   /// \return An abstract object of the appropriate type.
   abstract_object_pointert get_abstract_object(
-    const typet type,
+    const typet &type,
     bool top,
     bool bottom,
     const exprt &e,
     const abstract_environmentt &environment,
-    const namespacet &ns);
+    const namespacet &ns) const;
 
-private:
-  variable_sensitivity_object_factoryt() : initialized(false)
-  {
-  }
+  variable_sensitivity_object_factoryt() = delete;
+  variable_sensitivity_object_factoryt(const variable_sensitivity_object_factoryt&) = delete;
 
+private:
   /// Decide which abstract object type to use for the variable in question.
   ///
   /// \param type: the type of the variable the abstract object is
   ///              meant to represent
   ///
   /// \return An enum indicating the abstract object type to use.
-  ABSTRACT_OBJECT_TYPET get_abstract_object_type(const typet type);
+  ABSTRACT_OBJECT_TYPET get_abstract_object_type(const typet& type) const;
 
   vsd_configt configuration;
-  bool initialized;
 };
 
 #endif // CPROVER_ANALYSES_VARIABLE_SENSITIVITY_VARIABLE_SENSITIVITY_OBJECT_FACTORY_H // NOLINT(*)