Merge pull request #516 from diffblue/revert-438-support_ID_c_bool_in_exprt

Revert "direct support for ID_c_bool in exprt"

Author: Daniel Kroening

src/util/expr.cpp

@@ -245,18 +245,9 @@ Function: exprt::is_true
 
 bool exprt::is_true() const
 {
-  if(is_constant())
-  {
-    if(type().id()==ID_bool)
-      return get(ID_value)!=ID_false;
-    else if(type().id()==ID_c_bool)
-    {
-      mp_integer i;
-      to_integer(*this, i);
-      return i!=mp_integer(0);
-    }
-  }
-  return false;
+  return is_constant() &&
+         type().id()==ID_bool &&
+         get(ID_value)!=ID_false;
 }
 
 /*******************************************************************\
@@ -273,14 +264,9 @@ Function: exprt::is_false
 
 bool exprt::is_false() const
 {
-  if(is_constant())
-  {
-    if(type().id()==ID_bool)
-      return get(ID_value)==ID_false;
-    else if(type().id()==ID_c_bool)
-      return !is_true();
-  }
-  return false;
+  return is_constant() &&
+         type().id()==ID_bool &&
+         get(ID_value)==ID_false;
 }
 
 /*******************************************************************\