Use operator==(exprt, int) instead of is_zero

Avoids use the newly deprecated exprt method.

Author: tautschnig

jbmc/src/java_bytecode/expr2java.cpp

@@ -172,7 +172,7 @@ std::string expr2javat::convert_constant(
 {
   if(src.type().id()==ID_c_bool)
   {
-    if(!src.is_zero())
+    if(src != 0)
       return "true";
     else
       return "false";
@@ -187,7 +187,7 @@ std::string expr2javat::convert_constant(
   else if(src.type().id()==ID_pointer)
   {
     // Java writes 'null' for the null reference
-    if(src.is_zero())
+    if(src == 0)
       return "null";
   }
   else if(src.type()==java_char_type())

src/analyses/local_bitvector_analysis.cpp

@@ -115,7 +115,7 @@ local_bitvector_analysist::flagst local_bitvector_analysist::get_rec(
 {
   if(rhs.is_constant())
   {
-    if(rhs.is_zero())
+    if(rhs == 0)
       return flagst::mk_null();
     else
       return flagst::mk_integer_address();

src/analyses/local_may_alias.cpp

@@ -171,7 +171,7 @@ void local_may_aliast::get_rec(
 {
   if(rhs.is_constant())
   {
-    if(rhs.is_zero())
+    if(rhs == 0)
       dest.insert(objects.number(exprt(ID_null_object)));
     else
       dest.insert(objects.number(exprt(ID_integer_address_object)));

src/analyses/variable-sensitivity/interval_abstract_value.cpp

@@ -241,8 +241,7 @@ bool new_interval_is_top(const constant_interval_exprt &e)
 
   if(e.get_lower() == false && e.get_upper() == true)
     return true;
-  if(
-    e.type().id() == ID_c_bool && e.get_lower().is_zero() && e.get_upper() == 1)
+  if(e.type().id() == ID_c_bool && e.get_lower() == 0 && e.get_upper() == 1)
   {
     return true;
   }

src/analyses/variable-sensitivity/value_set_abstract_object.cpp

@@ -455,7 +455,7 @@ static bool is_set_extreme(const typet &type, const abstract_object_sett &set)
       set,
       [](const abstract_value_objectt &value) {
         auto c = value.to_constant();
-        return c.is_zero() || (c.id() == ID_min_value);
+        return c == 0 || (c.id() == ID_min_value);
       },
       [](const abstract_value_objectt &value) {
         auto c = value.to_constant();

src/ansi-c/c_typecast.cpp

@@ -567,11 +567,10 @@ void c_typecastt::implicit_typecast_followed(
   {
     // special case: 0 == NULL
 
-    if(simplify_expr(expr, ns).is_zero() && (
-       src_type.id()==ID_unsignedbv ||
-       src_type.id()==ID_signedbv ||
-       src_type.id()==ID_natural ||
-       src_type.id()==ID_integer))
+    if(
+      simplify_expr(expr, ns) == 0 &&
+      (src_type.id() == ID_unsignedbv || src_type.id() == ID_signedbv ||
+       src_type.id() == ID_natural || src_type.id() == ID_integer))
     {
       expr = null_pointer_exprt{to_pointer_type(orig_dest_type)};
       return; // ok

src/ansi-c/c_typecheck_base.cpp

@@ -312,7 +312,7 @@ static bool is_instantiation_of_flexible_array(
   return old_array_type.element_type() == new_array_type.element_type() &&
          old_array_type.get_bool(ID_C_flexible_array_member) &&
          new_array_type.get_bool(ID_C_flexible_array_member) &&
-         (old_array_type.size().is_nil() || old_array_type.size().is_zero());
+         (old_array_type.size().is_nil() || old_array_type.size() == 0);
 }
 
 void c_typecheck_baset::typecheck_redefinition_non_type(

src/ansi-c/c_typecheck_expr.cpp

@@ -1457,15 +1457,13 @@ void c_typecheck_baset::typecheck_expr_rel(
   else
   {
     // pointer and zero
-    if(type0.id()==ID_pointer &&
-       simplify_expr(op1, *this).is_zero())
+    if(type0.id() == ID_pointer && simplify_expr(op1, *this) == 0)
     {
       op1 = null_pointer_exprt{to_pointer_type(type0)};
       return;
     }
 
-    if(type1.id()==ID_pointer &&
-       simplify_expr(op0, *this).is_zero())
+    if(type1.id() == ID_pointer && simplify_expr(op0, *this) == 0)
     {
       op0 = null_pointer_exprt{to_pointer_type(type1)};
       return;

src/ansi-c/c_typecheck_initializer.cpp

@@ -405,7 +405,7 @@ exprt::operandst::const_iterator c_typecheck_baset::do_designated_initializer(
       if(index>=dest->operands().size())
       {
         if(
-          type.id() == ID_array && (to_array_type(type).size().is_zero() ||
+          type.id() == ID_array && (to_array_type(type).size() == 0 ||
                                     to_array_type(type).size().is_nil()))
         {
           const typet &element_type = to_array_type(type).element_type();
@@ -673,10 +673,10 @@ exprt::operandst::const_iterator c_typecheck_baset::do_designated_initializer(
 
       // in case of a variable-length array consume all remaining
       // initializer elements
-      if(vla_permitted &&
-         dest_type.id()==ID_array &&
-         (to_array_type(dest_type).size().is_zero() ||
-          to_array_type(dest_type).size().is_nil()))
+      if(
+        vla_permitted && dest_type.id() == ID_array &&
+        (to_array_type(dest_type).size() == 0 ||
+         to_array_type(dest_type).size().is_nil()))
       {
         value.id(ID_initializer_list);
         value.operands().clear();

src/ansi-c/expr2c.cpp

@@ -1286,7 +1286,7 @@ std::string expr2ct::convert_complex(
   unsigned precedence)
 {
   if(
-    src.operands().size() == 2 && to_binary_expr(src).op0().is_zero() &&
+    src.operands().size() == 2 && to_binary_expr(src).op0() == 0 &&
     to_binary_expr(src).op1().is_constant())
   {
     // This is believed to be gcc only; check if this is sensible
@@ -3783,7 +3783,7 @@ std::string expr2ct::convert_with_precedence(
 
     if(object.id() == ID_label)
       return "&&" + object.get_string(ID_identifier);
-    else if(object.id() == ID_index && to_index_expr(object).index().is_zero())
+    else if(object.id() == ID_index && to_index_expr(object).index() == 0)
       return convert(to_index_expr(object).array());
     else if(to_pointer_type(src.type()).base_type().id() == ID_code)
       return convert_unary(to_unary_expr(src), "", precedence = 15);