use get_identifier() instead of get(ID_identifier) on symbols

Author: Daniel Kroening

src/analyses/ai.cpp

@@ -462,7 +462,7 @@ bool ai_baset::do_function_call_rec(
 
   if(function.id()==ID_symbol)
   {
-    const irep_idt &identifier=function.get(ID_identifier);
+    const irep_idt &identifier=to_symbol_expr(function).get_identifier();
 
     goto_functionst::function_mapt::const_iterator it=
       goto_functions.function_map.find(identifier);

src/analyses/flow_insensitive_analysis.cpp

@@ -293,7 +293,7 @@ bool flow_insensitive_analysis_baset::do_function_call_rec(
 
   if(function.id()==ID_symbol)
   {
-    const irep_idt &identifier=function.get(ID_identifier);
+    const irep_idt &identifier=to_symbol_expr(function).get_identifier();
 
     if(recursion_set.find(identifier)!=recursion_set.end())
     {

src/analyses/invariant_set.cpp

@@ -143,7 +143,7 @@ std::string inv_object_storet::build_string(const exprt &expr) const
   }
 
   if(expr.id()==ID_symbol)
-    return expr.get_string(ID_identifier);
+    return id2string(to_symbol_expr(expr).get_identifier());
 
   return "";
 }

src/analyses/static_analysis.cpp

@@ -328,7 +328,7 @@ void static_analysis_baset::do_function_call_rec(
 
   if(function.id()==ID_symbol)
   {
-    const irep_idt &identifier=function.get(ID_identifier);
+    const irep_idt &identifier=to_symbol_expr(function).get_identifier();
 
     if(recursion_set.find(identifier)!=recursion_set.end())
     {

src/ansi-c/c_typecast.cpp

@@ -263,7 +263,7 @@ typet c_typecastt::follow_with_qualifiers(const typet &src_type)
   while(result_type.id()==ID_symbol)
   {
     const symbolt &followed_type_symbol=
-      ns.lookup(result_type.get(ID_identifier));
+      ns.lookup(to_symbol_type(result_type));
 
     result_type=followed_type_symbol.type;
     qualifiers+=c_qualifierst(followed_type_symbol.type);

src/ansi-c/expr2c.cpp

@@ -1663,7 +1663,7 @@ std::string expr2ct::convert_symbol(
   const symbol_exprt &src,
   unsigned &precedence)
 {
-  const irep_idt &id=src.get(ID_identifier);
+  const irep_idt &id=src.get_identifier();
   std::string dest;
 
   if(src.operands().size()==1 &&

src/ansi-c/type2name.cpp

@@ -15,6 +15,7 @@ Author: Daniel Kroening, [email protected]
 #include <util/invariant.h>
 #include <util/namespace.h>
 #include <util/pointer_offset_size.h>
+#include <util/std_expr.h>
 #include <util/std_types.h>
 #include <util/symbol_table.h>
 
@@ -25,12 +26,12 @@ static std::string type2name(
   const namespacet &ns,
   symbol_numbert &symbol_number);
 
-static std::string type2name_symbol(
-  const typet &type,
+static std::string type2name_tag(
+  const tag_typet &type,
   const namespacet &ns,
   symbol_numbert &symbol_number)
 {
-  const irep_idt &identifier=type.get(ID_identifier);
+  const irep_idt &identifier=type.get_identifier();
 
   const symbolt *symbol;
 
@@ -180,7 +181,7 @@ static std::string type2name(
     const array_typet &t=to_array_type(type);
     mp_integer size;
     if(t.size().id()==ID_symbol)
-      result+="ARR"+id2string(t.size().get(ID_identifier));
+      result+="ARR"+id2string(to_symbol_expr(t.size()).get_identifier());
     else if(to_integer(t.size(), size))
       result+="ARR?";
     else
@@ -192,7 +193,7 @@ static std::string type2name(
           type.id()==ID_union_tag)
   {
     parent_is_sym_check=true;
-    result+=type2name_symbol(type, ns, symbol_number);
+    result+=type2name_tag(to_tag_type(type), ns, symbol_number);
   }
   else if(type.id()==ID_struct ||
           type.id()==ID_union)

src/cpp/cpp_is_pod.cpp

@@ -82,8 +82,8 @@ bool cpp_typecheckt::cpp_is_pod(const typet &type) const
   }
   else if(type.id()==ID_symbol)
   {
-    const symbolt &symb=lookup(type.get(ID_identifier));
-    assert(symb.is_type);
+    const symbolt &symb=lookup(to_symbol_type(type));
+    DATA_INVARIANT(symb.is_type, "type symbol is a type");
     return cpp_is_pod(symb.type);
   }
 

src/cpp/cpp_typecheck_resolve.cpp

@@ -170,9 +170,9 @@ void cpp_typecheck_resolvet::remove_duplicates(
     irep_idt id;
 
     if(it->id()==ID_symbol)
-      id=it->get(ID_identifier);
+      id=to_symbol_expr(*it).get_identifier();
     else if(it->id()==ID_type && it->type().id()==ID_symbol)
-      id=it->type().get(ID_identifier);
+      id=to_symbol_type(it->type()).get_identifier();
 
     if(id=="")
     {
@@ -2042,7 +2042,7 @@ void cpp_typecheck_resolvet::apply_template_args(
     return; // templates are always symbols
 
   const symbolt &template_symbol=
-    cpp_typecheck.lookup(expr.get(ID_identifier));
+    cpp_typecheck.lookup(to_symbol_expr(expr).get_identifier());
 
   if(!template_symbol.type.get_bool(ID_is_template))
     return;
@@ -2239,7 +2239,7 @@ void cpp_typecheck_resolvet::filter_for_named_scopes(
         const typet &type=pcomp.type();
         assert(type.id()!=ID_struct);
         if(type.id()==ID_symbol)
-          identifier=type.get(ID_identifier);
+          identifier=to_symbol_type(type).get_identifier();
         else
           continue;
       }
@@ -2261,7 +2261,7 @@ void cpp_typecheck_resolvet::filter_for_named_scopes(
           break;
         }
         else if(symbol.type.id()==ID_symbol)
-          identifier=symbol.type.get(ID_identifier);
+          identifier=to_symbol_type(symbol.type).get_identifier();
         else
           break;
       }

src/cpp/template_map.cpp

@@ -14,6 +14,8 @@ Author: Daniel Kroening, [email protected]
 #include <ostream>
 
 #include <util/invariant.h>
+#include <util/std_expr.h>
+#include <util/std_types.h>
 
 void template_mapt::apply(typet &type) const
 {
@@ -40,7 +42,7 @@ void template_mapt::apply(typet &type) const
   else if(type.id()==ID_symbol)
   {
     type_mapt::const_iterator m_it=
-      type_map.find(type.get(ID_identifier));
+      type_map.find(to_symbol_type(type).get_identifier());
 
     if(m_it!=type_map.end())
     {
@@ -74,7 +76,7 @@ void template_mapt::apply(exprt &expr) const
   if(expr.id()==ID_symbol)
   {
     expr_mapt::const_iterator m_it=
-      expr_map.find(expr.get(ID_identifier));
+      expr_map.find(to_symbol_expr(expr).get_identifier());
 
     if(m_it!=expr_map.end())
     {