Merge pull request #997 from peterschrammel/clean-up-irep-id-empty

Clean up irep id emptyness checks

Author: kroening

src/analyses/goto_check.cpp

@@ -1689,21 +1689,21 @@ void goto_checkt::goto_check(
       {
         i_it->source_location.id(irep_idt());
 
-        if(it->source_location.get_file()!=irep_idt())
+        if(!it->source_location.get_file().empty())
           i_it->source_location.set_file(it->source_location.get_file());
 
-        if(it->source_location.get_line()!=irep_idt())
+        if(!it->source_location.get_line().empty())
           i_it->source_location.set_line(it->source_location.get_line());
 
-        if(it->source_location.get_function()!=irep_idt())
+        if(!it->source_location.get_function().empty())
           i_it->source_location.set_function(
             it->source_location.get_function());
 
-        if(it->source_location.get_column()!=irep_idt())
+        if(!it->source_location.get_column().empty())
           i_it->source_location.set_column(it->source_location.get_column());
       }
 
-      if(i_it->function==irep_idt())
+      if(i_it->function.empty())
         i_it->function=it->function;
     }
 

src/ansi-c/ansi_c_declaration.cpp

@@ -33,7 +33,7 @@ void ansi_c_declaratort::build(irept &src)
       t.make_nil();
       break;
     }
-    else if(t.id()==irep_idt() ||
+    else if(t.id().empty() ||
             t.is_nil())
     {
       assert(0);

src/ansi-c/c_typecheck_base.cpp

@@ -539,7 +539,7 @@ void c_typecheck_baset::typecheck_function_body(symbolt &symbol)
       p_it++)
   {
     // may be anonymous
-    if(p_it->get_base_name()==irep_idt())
+    if(p_it->get_base_name().empty())
     {
       irep_idt base_name="#anon"+std::to_string(anon_counter++);
       p_it->set_base_name(base_name);

src/ansi-c/c_typecheck_expr.cpp

@@ -1522,7 +1522,7 @@ void c_typecheck_baset::typecheck_expr_member(exprt &expr)
   // copy method identifier
   const irep_idt &identifier=component.get(ID_C_identifier);
 
-  if(identifier!=irep_idt())
+  if(!identifier.empty())
     expr.set(ID_C_identifier, identifier);
 
   const irep_idt &access=component.get_access();

src/ansi-c/c_typecheck_type.cpp

@@ -428,7 +428,7 @@ void c_typecheck_baset::typecheck_code_type(code_typet &type)
         irep_idt identifier=declaration.declarator().get_name();
 
         // abstract or not?
-        if(identifier==irep_idt())
+        if(identifier.empty())
         {
           // abstract
           parameter.add_source_location()=declaration.type().source_location();
@@ -550,7 +550,7 @@ void c_typecheck_baset::typecheck_array_type(array_typet &type)
     {
       // not a constant and not infinity
 
-      assert(current_symbol_id!=irep_idt());
+      assert(!current_symbol_id.empty());
 
       const symbolt &base_symbol=lookup(current_symbol_id);
 
@@ -862,7 +862,7 @@ void c_typecheck_baset::typecheck_compound_body(
   // scan for anonymous members, and name them
   for(auto &member : components)
   {
-    if(member.get_name()!=irep_idt())
+    if(!member.get_name().empty())
       continue;
 
     member.set_name("$anon"+std::to_string(anon_member_counter++));

src/ansi-c/type2name.cpp

@@ -110,7 +110,7 @@ static std::string type2name(
   if(!type.source_location().get_function().empty())
     result+='l';
 
-  if(type.id()==irep_idt())
+  if(type.id().empty())
     throw "empty type encountered";
   else if(type.id()==ID_empty)
     result+='V';

src/cpp/cpp_declarator.cpp

@@ -49,7 +49,7 @@ typet cpp_declaratort::merge_type(const typet &declaration_type) const
     }
     else
     {
-      assert(t.id()!=irep_idt());
+      assert(!t.id().empty());
       p=&t.subtype();
     }
   }

src/cpp/cpp_exception_id.cpp

@@ -59,7 +59,7 @@ void cpp_exception_list_rec(
     // grab C/C++ type
     irep_idt c_type=src.get(ID_C_c_type);
 
-    if(c_type!=irep_idt())
+    if(!c_type.empty())
     {
       dest.push_back(id2string(c_type)+suffix);
       return;

src/cpp/cpp_instantiate_template.cpp

@@ -485,7 +485,7 @@ const symbolt &cpp_typecheckt::instantiate_template(
     bool is_static=new_decl.storage_spec().is_static();
     irep_idt access = new_decl.get(ID_C_access);
 
-    assert(access != irep_idt());
+    assert(!access.empty());
     assert(symb.type.id()==ID_struct);
 
     typecheck_compound_declarator(

src/cpp/cpp_type2name.cpp

@@ -119,7 +119,7 @@ std::string cpp_type2name(const typet &type)
     // we try to use #c_type
     const irep_idt c_type=type.get(ID_C_c_type);
 
-    if(c_type!=irep_idt())
+    if(!c_type.empty())
       result+=id2string(c_type);
     else if(type.id()==ID_unsignedbv)
       result+="unsigned_int";
@@ -131,7 +131,7 @@ std::string cpp_type2name(const typet &type)
     // we try to use #c_type
     const irep_idt c_type=type.get(ID_C_c_type);
 
-    if(c_type!=irep_idt())
+    if(!c_type.empty())
       result+=id2string(c_type);
     else
       result+="double";