Merge pull request #3151 from tautschnig/forall_macros-cleanup

guardt: Remove commented-out code (and clang-format specification cleanup)

Author: tautschnig

.clang-format

@@ -31,13 +31,9 @@ DisableFormat: 'false'
 ExperimentalAutoDetectBinPacking: 'false'
 ForEachMacros: [
   'forall_rw_range_set_r_objects',
-  'Forall_rw_range_set_r_objects',
   'forall_rw_range_set_w_objects',
-  'Forall_rw_range_set_w_objects',
   'forall_rw_set_r_entries',
-  'Forall_rw_set_r_entries',
   'forall_rw_set_w_entries',
-  'Forall_rw_set_w_entries',
   'forall_goto_functions',
   'Forall_goto_functions',
   'forall_goto_program_instructions',
@@ -47,31 +43,20 @@ ForEachMacros: [
   'forall_valid_objects',
   'Forall_valid_objects',
   'forall_nodes',
-  'Forall_nodes',
   'forall_literals',
   'Forall_literals',
   'forall_operands',
   'Forall_operands',
   'forall_expr',
   'Forall_expr',
-  'forall_expr_list',
-  'Forall_expr_list',
   'forall_symbolptr_list',
   'Forall_symbolptr_list',
-  'forall_guard',
-  'Forall_guard',
   'forall_irep',
   'Forall_irep',
   'forall_named_irep',
   'Forall_named_irep',
   'forall_value_list',
-  'Forall_value_list',
-  'forall_symbols',
-  'Forall_symbols',
   'forall_symbol_base_map',
-  'Forall_symbol_base_map',
-  'forall_symbol_module_map',
-  'Forall_symbol_module_map',
   'forall_subtypes',
   'Forall_subtypes']
 IndentCaseLabels: 'false'

src/util/guard.cpp

@@ -40,27 +40,6 @@ void guardt::guard_expr(exprt &dest) const
   }
 }
 
-#if 0
-exprt guardt::as_expr(guard_listt::const_iterator it) const
-{
-  if(it==guard_list.end())
-    return true_exprt();
-  else if(it==--guard_list.end())
-    return guard_list.back();
-
-  exprt dest;
-  dest=exprt(ID_and, typet(ID_bool));
-  dest.reserve_operands(guard_list.size());
-  for(; it!=guard_list.end(); it++)
-  {
-    PRECONDITION(it->is_boolean());
-    dest.copy_to_operands(*it);
-  }
-
-  return dest;
-}
-#endif
-
 void guardt::add(const exprt &expr)
 {
   PRECONDITION(expr.type().id() == ID_bool);
@@ -202,32 +181,3 @@ guardt &operator |= (guardt &g1, const guardt &g2)
 
   return g1;
 }
-
-#if 0
-std::ostream &operator << (std::ostream &out, const guardt &g)
-{
-  forall_expr_list(it, g.guard_list)
-    out << "*** " << it->pretty() << '\n';
-  return out;
-}
-
-#define forall_guard(it, guard_list) \
-  for(guardt::guard_listt::const_iterator it=(guard_list).begin(); \
-      it!=(guard_list).end(); ++it)
-
-bool guardt::is_false() const
-{
-  forall_guard(it, guard_list)
-    if(it->is_false())
-      return true;
-
-  return false;
-}
-
-void guardt::make_false()
-{
-  guard_list.clear();
-  guard_list.push_back(exprt());
-  guard_list.back()=false_exprt();
-}
-#endif

src/util/guard.h

@@ -38,55 +38,15 @@ class guardt:public exprt
     add(guard);
   }
 
-  // exprt as_expr(guard_listt::const_iterator it) const;
-
   exprt as_expr() const
   {
     return *this;
   }
 
   void guard_expr(exprt &dest) const;
 
-#if 0
-  bool empty() const { return guard_list.empty(); }
-  bool is_true() const { return empty(); }
-  bool is_false() const;
-
-  void make_true()
-  {
-    guard_list.clear();
-  }
-
-  void make_false();
-#endif
-
   friend guardt &operator -= (guardt &g1, const guardt &g2);
   friend guardt &operator |= (guardt &g1, const guardt &g2);
-
-#if 0
-  void swap(guardt &g)
-  {
-    guard_list.swap(g.guard_list);
-  }
-
-  size_type size() const
-  {
-    return guard_list.size();
-  }
-
-  void resize(size_type s)
-  {
-    guard_list.resize(s);
-  }
-
-  const guard_listt &get_guard_list() const
-  {
-    return guard_list;
-  }
-
-protected:
-  guard_listt guard_list;
-#endif
 };
 
 #endif // CPROVER_UTIL_GUARD_H