Merge pull request #1290 from tautschnig/no-integer_constant

Remove constant_exprt::integer_constant

Author: tautschnig

src/goto-programs/interpreter.cpp

@@ -890,8 +890,10 @@ typet interpretert::concretize_type(const typet &type)
     {
       result() << "Concretized array with size " << computed_size[0]
                << eom;
-      return array_typet(type.subtype(),
-             constant_exprt::integer_constant(computed_size[0].to_ulong()));
+      return
+        array_typet(
+          type.subtype(),
+          from_integer(computed_size[0], integer_typet()));
     }
     else
     {

src/util/std_expr.cpp

@@ -135,24 +135,19 @@ void object_descriptor_exprt::build(
   assert(root_object().type().id()!=ID_empty);
 }
 
-constant_exprt constant_exprt::integer_constant(unsigned v)
-{
-  return constant_exprt(std::to_string(v), integer_typet());
-}
-
 shift_exprt::shift_exprt(
   const exprt &_src,
   const irep_idt &_id,
   const std::size_t _distance):
-  binary_exprt(_src, _id, constant_exprt::integer_constant(_distance))
+  binary_exprt(_src, _id, from_integer(_distance, integer_typet()))
 {
 }
 
 extractbit_exprt::extractbit_exprt(
   const exprt &_src,
   const std::size_t _index):
   binary_predicate_exprt(
-    _src, ID_extractbit, constant_exprt::integer_constant(_index))
+    _src, ID_extractbit, from_integer(_index, integer_typet()))
 {
 }
 
@@ -166,8 +161,8 @@ extractbits_exprt::extractbits_exprt(
   assert(_upper>=_lower);
   operands().resize(3);
   src()=_src;
-  upper()=constant_exprt::integer_constant(_upper);
-  lower()=constant_exprt::integer_constant(_lower);
+  upper()=from_integer(_upper, integer_typet());
+  lower()=from_integer(_lower, integer_typet());
 }
 
 /*******************************************************************\

src/util/std_expr.h

@@ -3720,8 +3720,6 @@ class constant_exprt:public exprt
   }
 
   bool value_is_zero_string() const;
-
-  static constant_exprt integer_constant(unsigned v);
 };