Merge pull request #5561 from tautschnig/remove-deprecated-move_to_operands

Remove deprecated exprt::move_to_operands

Author: NlightNFotis

src/util/expr.cpp

@@ -35,51 +35,6 @@ std::size_t exprt::size() const
   return size;
 }
 
-/// Move the given argument to the end of `exprt`'s operands.
-/// The argument is destroyed and mutated to a reference to a nil `irept`.
-/// \param expr: `exprt` to append to the operands
-void exprt::move_to_operands(exprt &expr)
-{
-  operandst &op=operands();
-  op.push_back(static_cast<const exprt &>(get_nil_irep()));
-  op.back().swap(expr);
-}
-
-/// Move the given arguments to the end of `exprt`'s operands.
-/// The arguments are destroyed and mutated to a reference to a nil `irept`.
-/// \param e1: first `exprt` to append to the operands
-/// \param e2: second `exprt` to append to the operands
-void exprt::move_to_operands(exprt &e1, exprt &e2)
-{
-  operandst &op=operands();
-  #ifndef USE_LIST
-  op.reserve(op.size()+2);
-  #endif
-  op.push_back(static_cast<const exprt &>(get_nil_irep()));
-  op.back().swap(e1);
-  op.push_back(static_cast<const exprt &>(get_nil_irep()));
-  op.back().swap(e2);
-}
-
-/// Move the given arguments to the end of `exprt`'s operands.
-/// The arguments are destroyed and mutated to a reference to a nil `irept`.
-/// \param e1: first `exprt` to append to the operands
-/// \param e2: second `exprt` to append to the operands
-/// \param e3: third `exprt` to append to the operands
-void exprt::move_to_operands(exprt &e1, exprt &e2, exprt &e3)
-{
-  operandst &op=operands();
-  #ifndef USE_LIST
-  op.reserve(op.size()+3);
-  #endif
-  op.push_back(static_cast<const exprt &>(get_nil_irep()));
-  op.back().swap(e1);
-  op.push_back(static_cast<const exprt &>(get_nil_irep()));
-  op.back().swap(e2);
-  op.push_back(static_cast<const exprt &>(get_nil_irep()));
-  op.back().swap(e3);
-}
-
 /// Return whether the expression is a constant.
 /// \return True if is a constant, false otherwise
 bool exprt::is_constant() const

src/util/expr.h

@@ -10,7 +10,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #define CPROVER_UTIL_EXPR_H
 
 #include "as_const.h"
-#include "deprecate.h"
 #include "type.h"
 #include "validate_expressions.h"
 #include "validate_types.h"
@@ -129,24 +128,6 @@ class exprt:public irept
   void reserve_operands(operandst::size_type n)
   { operands().reserve(n) ; }
 
-  DEPRECATED(SINCE(2018, 10, 1, "use add_to_operands(std::move(expr)) instead"))
-  void move_to_operands(exprt &expr);
-
-  DEPRECATED(SINCE(
-    2018,
-    10,
-    1,
-    "use add_to_operands(std::move(e1), std::move(e2)) instead"))
-  void move_to_operands(exprt &e1, exprt &e2);
-
-  DEPRECATED(SINCE(
-    2018,
-    10,
-    1,
-    "use add_to_operands(std::move(e1), std::move(e2), std::move(e3))"
-    "instead"))
-  void move_to_operands(exprt &e1, exprt &e2, exprt &e3);
-
   /// Copy the given argument to the end of `exprt`'s operands.
   /// \param expr: `exprt` to append to the operands
   void copy_to_operands(const exprt &expr)