std_expr.h: remove commented-out validation steps

Commented-out checks obviously don't check anything, and the code that
was commented out wasn't particularly deep so that restoring it in
future is trivial anyway.

Author: tautschnig

src/util/std_expr.h

@@ -2445,11 +2445,6 @@ inline bool can_cast_expr<and_exprt>(const exprt &base)
   return base.id() == ID_and;
 }
 
-// inline void validate_expr(const and_exprt &value)
-// {
-//   validate_operands(value, 2, "And must have two or more operands", true);
-// }
-
 /// \brief Cast an exprt to a \ref and_exprt
 ///
 /// \a expr must be known to be \ref and_exprt.
@@ -2459,19 +2454,13 @@ inline bool can_cast_expr<and_exprt>(const exprt &base)
 inline const and_exprt &to_and_expr(const exprt &expr)
 {
   PRECONDITION(expr.id()==ID_and);
-  // DATA_INVARIANT(
-  //   expr.operands().size()>=2,
-  //   "And must have two or more operands");
   return static_cast<const and_exprt &>(expr);
 }
 
 /// \copydoc to_and_expr(const exprt &)
 inline and_exprt &to_and_expr(exprt &expr)
 {
   PRECONDITION(expr.id()==ID_and);
-  // DATA_INVARIANT(
-  //   expr.operands().size()>=2,
-  //   "And must have two or more operands");
   return static_cast<and_exprt &>(expr);
 }
 
@@ -2570,11 +2559,6 @@ inline bool can_cast_expr<or_exprt>(const exprt &base)
   return base.id() == ID_or;
 }
 
-// inline void validate_expr(const or_exprt &value)
-// {
-//   validate_operands(value, 2, "Or must have two or more operands", true);
-// }
-
 /// \brief Cast an exprt to a \ref or_exprt
 ///
 /// \a expr must be known to be \ref or_exprt.
@@ -2584,19 +2568,13 @@ inline bool can_cast_expr<or_exprt>(const exprt &base)
 inline const or_exprt &to_or_expr(const exprt &expr)
 {
   PRECONDITION(expr.id()==ID_or);
-  // DATA_INVARIANT(
-  //   expr.operands().size()>=2,
-  //   "Or must have two or more operands");
   return static_cast<const or_exprt &>(expr);
 }
 
 /// \copydoc to_or_expr(const exprt &)
 inline or_exprt &to_or_expr(exprt &expr)
 {
   PRECONDITION(expr.id()==ID_or);
-  // DATA_INVARIANT(
-  //   expr.operands().size()>=2,
-  //   "Or must have two or more operands");
   return static_cast<or_exprt &>(expr);
 }
 
@@ -2622,15 +2600,6 @@ inline bool can_cast_expr<xor_exprt>(const exprt &base)
   return base.id() == ID_xor;
 }
 
-// inline void validate_expr(const bitxor_exprt &value)
-// {
-//   validate_operands(
-//     value,
-//     2,
-//     "Bit-wise xor must have two or more operands",
-//     true);
-// }
-
 /// \brief Cast an exprt to a \ref xor_exprt
 ///
 /// \a expr must be known to be \ref xor_exprt.
@@ -2722,15 +2691,6 @@ inline bool can_cast_expr<bitor_exprt>(const exprt &base)
   return base.id() == ID_bitor;
 }
 
-// inline void validate_expr(const bitor_exprt &value)
-// {
-//   validate_operands(
-//     value,
-//     2,
-//     "Bit-wise or must have two or more operands",
-//     true);
-// }
-
 /// \brief Cast an exprt to a \ref bitor_exprt
 ///
 /// \a expr must be known to be \ref bitor_exprt.
@@ -2740,19 +2700,13 @@ inline bool can_cast_expr<bitor_exprt>(const exprt &base)
 inline const bitor_exprt &to_bitor_expr(const exprt &expr)
 {
   PRECONDITION(expr.id()==ID_bitor);
-  // DATA_INVARIANT(
-  //   expr.operands().size()>=2,
-  //   "Bit-wise or must have two or more operands");
   return static_cast<const bitor_exprt &>(expr);
 }
 
 /// \copydoc to_bitor_expr(const exprt &)
 inline bitor_exprt &to_bitor_expr(exprt &expr)
 {
   PRECONDITION(expr.id()==ID_bitor);
-  // DATA_INVARIANT(
-  //   expr.operands().size()>=2,
-  //   "Bit-wise or must have two or more operands");
   return static_cast<bitor_exprt &>(expr);
 }
 
@@ -2778,15 +2732,6 @@ inline bool can_cast_expr<bitxor_exprt>(const exprt &base)
   return base.id() == ID_bitxor;
 }
 
-// inline void validate_expr(const bitxor_exprt &value)
-// {
-//   validate_operands(
-//     value,
-//     2,
-//     "Bit-wise xor must have two or more operands",
-//     true);
-// }
-
 /// \brief Cast an exprt to a \ref bitxor_exprt
 ///
 /// \a expr must be known to be \ref bitxor_exprt.
@@ -2796,19 +2741,13 @@ inline bool can_cast_expr<bitxor_exprt>(const exprt &base)
 inline const bitxor_exprt &to_bitxor_expr(const exprt &expr)
 {
   PRECONDITION(expr.id()==ID_bitxor);
-  // DATA_INVARIANT(
-  //   expr.operands().size()>=2,
-  //   "Bit-wise xor must have two or more operands");
   return static_cast<const bitxor_exprt &>(expr);
 }
 
 /// \copydoc to_bitxor_expr(const exprt &)
 inline bitxor_exprt &to_bitxor_expr(exprt &expr)
 {
   PRECONDITION(expr.id()==ID_bitxor);
-  // DATA_INVARIANT(
-  //   expr.operands().size()>=2,
-  //   "Bit-wise xor must have two or more operands");
   return static_cast<bitxor_exprt &>(expr);
 }
 
@@ -2834,15 +2773,6 @@ inline bool can_cast_expr<bitand_exprt>(const exprt &base)
   return base.id() == ID_bitand;
 }
 
-// inline void validate_expr(const bitand_exprt &value)
-// {
-//   validate_operands(
-//     value,
-//     2,
-//     "Bit-wise and must have two or more operands",
-//     true);
-// }
-
 /// \brief Cast an exprt to a \ref bitand_exprt
 ///
 /// \a expr must be known to be \ref bitand_exprt.
@@ -2852,19 +2782,13 @@ inline bool can_cast_expr<bitand_exprt>(const exprt &base)
 inline const bitand_exprt &to_bitand_expr(const exprt &expr)
 {
   PRECONDITION(expr.id()==ID_bitand);
-  // DATA_INVARIANT(
-  //   expr.operands().size()>=2,
-  //   "Bit-wise and must have two or more operands");
   return static_cast<const bitand_exprt &>(expr);
 }
 
 /// \copydoc to_bitand_expr(const exprt &)
 inline bitand_exprt &to_bitand_expr(exprt &expr)
 {
   PRECONDITION(expr.id()==ID_bitand);
-  // DATA_INVARIANT(
-  //   expr.operands().size()>=2,
-  //   "Bit-wise and must have two or more operands");
   return static_cast<bitand_exprt &>(expr);
 }
 
@@ -4566,17 +4490,6 @@ inline bool can_cast_expr<concatenation_exprt>(const exprt &base)
   return base.id() == ID_concatenation;
 }
 
-// template<>
-// inline void validate_expr<concatenation_exprt>(
-//   const concatenation_exprt &value)
-// {
-//   validate_operands(
-//     value,
-//     2,
-//     "Concatenation must have two or more operands",
-//     true);
-// }
-
 /// \brief Cast an exprt to a \ref concatenation_exprt
 ///
 /// \a expr must be known to be \ref concatenation_exprt.
@@ -4586,19 +4499,13 @@ inline bool can_cast_expr<concatenation_exprt>(const exprt &base)
 inline const concatenation_exprt &to_concatenation_expr(const exprt &expr)
 {
   PRECONDITION(expr.id()==ID_concatenation);
-  // DATA_INVARIANT(
-  //   expr.operands().size()>=2,
-  //   "Concatenation must have two or more operands");
   return static_cast<const concatenation_exprt &>(expr);
 }
 
 /// \copydoc to_concatenation_expr(const exprt &)
 inline concatenation_exprt &to_concatenation_expr(exprt &expr)
 {
   PRECONDITION(expr.id()==ID_concatenation);
-  // DATA_INVARIANT(
-  //   expr.operands().size()>=2,
-  //   "Concatenation must have two or more operands");
   return static_cast<concatenation_exprt &>(expr);
 }