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

kroening · kroening · commit dcec926cad0e · 2018-05-30T19:52:24.000+01:00
diff --git a/src/analyses/ai.cpp b/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);
diff --git a/src/analyses/flow_insensitive_analysis.cpp b/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())
     {
diff --git a/src/analyses/invariant_set.cpp b/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 "";
 }
diff --git a/src/analyses/static_analysis.cpp b/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())
     {
diff --git a/src/ansi-c/c_typecast.cpp b/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);
diff --git a/src/ansi-c/type2name.cpp b/src/ansi-c/type2name.cpp
@@ -15,6 +15,7 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 #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>
 
@@ -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
diff --git a/src/cpp/cpp_is_pod.cpp b/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);
   }
 
diff --git a/src/cpp/cpp_typecheck_resolve.cpp b/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;
       }
diff --git a/src/cpp/template_map.cpp b/src/cpp/template_map.cpp
@@ -14,6 +14,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 #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())
     {
diff --git a/src/goto-programs/builtin_functions.cpp b/src/goto-programs/builtin_functions.cpp
@@ -29,11 +29,11 @@ Author: Daniel Kroening, kroening@kroening.com
 
 void goto_convertt::do_prob_uniform(
   const exprt &lhs,
-  const exprt &function,
+  const symbol_exprt &function,
   const exprt::operandst &arguments,
   goto_programt &dest)
 {
-  const irep_idt &identifier=function.get(ID_identifier);
+  const irep_idt &identifier=function.get_identifier();
 
   // make it a side effect if there is an LHS
   if(arguments.size()!=2)
@@ -107,11 +107,11 @@ void goto_convertt::do_prob_uniform(
 
 void goto_convertt::do_prob_coin(
   const exprt &lhs,
-  const exprt &function,
+  const symbol_exprt &function,
   const exprt::operandst &arguments,
   goto_programt &dest)
 {
-  const irep_idt &identifier=function.get(ID_identifier);
+  const irep_idt &identifier=function.get_identifier();
 
   // make it a side effect if there is an LHS
   if(arguments.size()!=2)
@@ -184,11 +184,11 @@ void goto_convertt::do_prob_coin(
 
 void goto_convertt::do_printf(
   const exprt &lhs,
-  const exprt &function,
+  const symbol_exprt &function,
   const exprt::operandst &arguments,
   goto_programt &dest)
 {
-  const irep_idt &f_id=function.get(ID_identifier);
+  const irep_idt &f_id=function.get_identifier();
 
   if(f_id==CPROVER_PREFIX "printf" ||
      f_id=="printf")
@@ -219,11 +219,11 @@ void goto_convertt::do_printf(
 
 void goto_convertt::do_scanf(
   const exprt &lhs,
-  const exprt &function,
+  const symbol_exprt &function,
   const exprt::operandst &arguments,
   goto_programt &dest)
 {
-  const irep_idt &f_id=function.get(ID_identifier);
+  const irep_idt &f_id=function.get_identifier();
 
   if(f_id==CPROVER_PREFIX "scanf")
   {
@@ -364,7 +364,7 @@ void goto_convertt::do_output(
 
 void goto_convertt::do_atomic_begin(
   const exprt &lhs,
-  const exprt &function,
+  const symbol_exprt &function,
   const exprt::operandst &arguments,
   goto_programt &dest)
 {
@@ -388,7 +388,7 @@ void goto_convertt::do_atomic_begin(
 
 void goto_convertt::do_atomic_end(
   const exprt &lhs,
-  const exprt &function,
+  const symbol_exprt &function,
   const exprt::operandst &arguments,
   goto_programt &dest)
 {
@@ -597,7 +597,7 @@ exprt goto_convertt::get_array_argument(const exprt &src)
 void goto_convertt::do_array_op(
   const irep_idt &id,
   const exprt &lhs,
-  const exprt &function,
+  const symbol_exprt &function,
   const exprt::operandst &arguments,
   goto_programt &dest)
 {
diff --git a/src/goto-programs/goto_convert.cpp b/src/goto-programs/goto_convert.cpp
@@ -658,16 +658,17 @@ void goto_convertt::convert_decl(
   goto_programt &dest,
   const irep_idt &mode)
 {
-  const exprt &op0=code.op0();
+  const exprt &op=code.symbol();
 
-  if(op0.id()!=ID_symbol)
+  if(op.id()!=ID_symbol)
   {
-    error().source_location=op0.find_source_location();
-    error() << "decl statement expects symbol as first operand" << eom;
+    error().source_location=op.find_source_location();
+    error() << "decl statement expects symbol as operand" << eom;
     throw 0;
   }
 
-  const irep_idt &identifier=op0.get(ID_identifier);
+  const irep_idt &identifier=
+    to_symbol_expr(op).get_identifier();
 
   const symbolt &symbol=lookup(identifier);
 
diff --git a/src/goto-programs/goto_convert_class.h b/src/goto-programs/goto_convert_class.h
@@ -609,38 +609,38 @@ class goto_convertt:public messaget
   // some built-in functions
   void do_atomic_begin(
     const exprt &lhs,
-    const exprt &rhs,
+    const symbol_exprt &function,
     const exprt::operandst &arguments,
     goto_programt &dest);
   void do_atomic_end(
     const exprt &lhs,
-    const exprt &rhs,
+    const symbol_exprt &function,
     const exprt::operandst &arguments,
     goto_programt &dest);
   void do_create_thread(
     const exprt &lhs,
-    const exprt &rhs,
+    const symbol_exprt &function,
     const exprt::operandst &arguments,
     goto_programt &dest);
   void do_array_equal(
     const exprt &lhs,
-    const exprt &rhs,
+    const symbol_exprt &rhs,
     const exprt::operandst &arguments,
     goto_programt &dest);
   void do_array_op(
     const irep_idt &id,
     const exprt &lhs,
-    const exprt &function,
+    const symbol_exprt &function,
     const exprt::operandst &arguments,
     goto_programt &dest);
   void do_printf(
     const exprt &lhs,
-    const exprt &rhs,
+    const symbol_exprt &function,
     const exprt::operandst &arguments,
     goto_programt &dest);
   void do_scanf(
     const exprt &lhs,
-    const exprt &rhs,
+    const symbol_exprt &function,
     const exprt::operandst &arguments,
     goto_programt &dest);
   void do_input(
@@ -655,12 +655,12 @@ class goto_convertt:public messaget
     goto_programt &dest);
   void do_prob_coin(
     const exprt &lhs,
-    const exprt &rhs,
+    const symbol_exprt &function,
     const exprt::operandst &arguments,
     goto_programt &dest);
   void do_prob_uniform(
     const exprt &lhs,
-    const exprt &rhs,
+    const symbol_exprt &function,
     const exprt::operandst &arguments,
     goto_programt &dest);
 
diff --git a/src/goto-programs/goto_convert_side_effect.cpp b/src/goto-programs/goto_convert_side_effect.cpp
@@ -376,7 +376,7 @@ void goto_convertt::remove_function_call(
 
   if(expr.op0().id()==ID_symbol)
   {
-    const irep_idt &identifier=expr.op0().get(ID_identifier);
+    const irep_idt &identifier=to_symbol_expr(expr.op0()).get_identifier();
     const symbolt &symbol=lookup(identifier);
 
     std::string new_base_name=id2string(new_symbol.base_name);
diff --git a/src/goto-programs/interpreter.cpp b/src/goto-programs/interpreter.cpp
@@ -838,7 +838,9 @@ void interpretert::execute_function_call()
   else
   {
     list_input_varst::iterator it=
-        function_input_vars.find(function_call.function().get(ID_identifier));
+      function_input_vars.find(
+        to_symbol_expr(function_call.function()).get_identifier());
+
     if(it!=function_input_vars.end())
     {
       mp_vectort value;
@@ -852,6 +854,7 @@ void interpretert::execute_function_call()
       it->second.pop_front();
       return;
     }
+
     if(show)
       error() << "no body for "+id2string(identifier) << eom;
   }
diff --git a/src/goto-programs/interpreter_evaluate.cpp b/src/goto-programs/interpreter_evaluate.cpp
@@ -1086,7 +1086,7 @@ mp_integer interpretert::evaluate_address(
     const irep_idt &identifier=
       is_ssa_expr(expr) ?
       to_ssa_expr(expr).get_original_name() :
-      expr.get(ID_identifier);
+      to_symbol_expr(expr).get_identifier();
 
     interpretert::memory_mapt::const_iterator m_it1=
       memory_map.find(identifier);
diff --git a/src/goto-programs/json_goto_trace.cpp b/src/goto-programs/json_goto_trace.cpp
@@ -107,7 +107,8 @@ void convert_decl(
       {
         if(expr.id() == ID_symbol)
         {
-          const symbolt &symbol = ns.lookup(expr.get(ID_identifier));
+          const symbolt &symbol = ns.lookup(to_symbol_expr(expr));
+
           if(expr.find(ID_C_base_name).is_not_nil())
             INVARIANT(
               expr.find(ID_C_base_name).id() == symbol.base_name,
diff --git a/src/goto-programs/remove_const_function_pointers.cpp b/src/goto-programs/remove_const_function_pointers.cpp
@@ -73,7 +73,7 @@ exprt remove_const_function_pointerst::replace_const_symbols(
     if(is_const_expression(expression))
     {
       const symbolt &symbol=
-        *symbol_table.lookup(expression.get(ID_identifier));
+        *symbol_table.lookup(to_symbol_expr(expression).get_identifier());
       if(symbol.type.id()!=ID_code)
       {
         const exprt &symbol_value=symbol.value;
diff --git a/src/goto-programs/remove_unused_functions.cpp b/src/goto-programs/remove_unused_functions.cpp
@@ -81,9 +81,10 @@ void find_used_functions(
           // check that this is actually a simple call
           assert(call.function().id()==ID_symbol);
 
-          find_used_functions(call.function().get(ID_identifier),
-                              functions,
-                              seen);
+          const irep_idt &identifier=
+            to_symbol_expr(call.function()).get_identifier();
+
+          find_used_functions(identifier, functions, seen);
         }
       }
     }
diff --git a/src/goto-symex/goto_symex_state.cpp b/src/goto-symex/goto_symex_state.cpp
@@ -376,7 +376,7 @@ void goto_symex_statet::propagationt::operator()(exprt &expr)
   if(expr.id()==ID_symbol)
   {
     valuest::const_iterator it=
-      values.find(expr.get(ID_identifier));
+      values.find(to_symbol_expr(expr).get_identifier());
     if(it!=values.end())
       expr=it->second;
   }
diff --git a/src/goto-symex/postcondition.cpp b/src/goto-symex/postcondition.cpp
@@ -165,7 +165,7 @@ bool postconditiont::is_used(
   }
   else if(expr.id()==ID_symbol)
   {
-    return expr.get(ID_identifier)==identifier;
+    return to_symbol_expr(expr).get_identifier()==identifier;
   }
   else if(expr.id()==ID_dereference)
   {
diff --git a/src/goto-symex/slice_by_trace.cpp b/src/goto-symex/slice_by_trace.cpp
diff --git a/src/memory-models/mm2cpp.cpp b/src/memory-models/mm2cpp.cpp
diff --git a/src/pointer-analysis/value_set_fi.cpp b/src/pointer-analysis/value_set_fi.cpp
diff --git a/src/pointer-analysis/value_set_fivrns.cpp b/src/pointer-analysis/value_set_fivrns.cpp
diff --git a/src/util/base_type.cpp b/src/util/base_type.cpp
diff --git a/src/util/find_macros.cpp b/src/util/find_macros.cpp
diff --git a/src/util/find_symbols.cpp b/src/util/find_symbols.cpp
diff --git a/src/util/rename_symbol.cpp b/src/util/rename_symbol.cpp
diff --git a/src/util/replace_symbol.cpp b/src/util/replace_symbol.cpp
diff --git a/src/util/simplify_expr_pointer.cpp b/src/util/simplify_expr_pointer.cpp

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ bool ai_baset::do_function_call_rec(`
`462`	`462`
`463`	`463`	`if(function.id()==ID_symbol)`
`464`	`464`	`{`
`465`		`- const irep_idt &identifier=function.get(ID_identifier);`
	`465`	`+ const irep_idt &identifier=to_symbol_expr(function).get_identifier();`
`466`	`466`
`467`	`467`	`goto_functionst::function_mapt::const_iterator it=`
`468`	`468`	`goto_functions.function_map.find(identifier);`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ bool flow_insensitive_analysis_baset::do_function_call_rec(`
`293`	`293`
`294`	`294`	`if(function.id()==ID_symbol)`
`295`	`295`	`{`
`296`		`- const irep_idt &identifier=function.get(ID_identifier);`
	`296`	`+ const irep_idt &identifier=to_symbol_expr(function).get_identifier();`
`297`	`297`
`298`	`298`	`if(recursion_set.find(identifier)!=recursion_set.end())`
`299`	`299`	`{`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ std::string inv_object_storet::build_string(const exprt &expr) const`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`if(expr.id()==ID_symbol)`
`146`		`- return expr.get_string(ID_identifier);`
	`146`	`+ return id2string(to_symbol_expr(expr).get_identifier());`
`147`	`147`
`148`	`148`	`return "";`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ void static_analysis_baset::do_function_call_rec(`
`328`	`328`
`329`	`329`	`if(function.id()==ID_symbol)`
`330`	`330`	`{`
`331`		`- const irep_idt &identifier=function.get(ID_identifier);`
	`331`	`+ const irep_idt &identifier=to_symbol_expr(function).get_identifier();`
`332`	`332`
`333`	`333`	`if(recursion_set.find(identifier)!=recursion_set.end())`
`334`	`334`	`{`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ typet c_typecastt::follow_with_qualifiers(const typet &src_type)`
`263`	`263`	`while(result_type.id()==ID_symbol)`
`264`	`264`	`{`
`265`	`265`	`const symbolt &followed_type_symbol=`
`266`		`- ns.lookup(result_type.get(ID_identifier));`
	`266`	`+ ns.lookup(to_symbol_type(result_type));`
`267`	`267`
`268`	`268`	`result_type=followed_type_symbol.type;`
`269`	`269`	`qualifiers+=c_qualifierst(followed_type_symbol.type);`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,8 @@ bool cpp_typecheckt::cpp_is_pod(const typet &type) const`
`82`	`82`	`}`
`83`	`83`	`else if(type.id()==ID_symbol)`
`84`	`84`	`{`
`85`		`- const symbolt &symb=lookup(type.get(ID_identifier));`
`86`		`- assert(symb.is_type);`
	`85`	`+ const symbolt &symb=lookup(to_symbol_type(type));`
	`86`	`+ DATA_INVARIANT(symb.is_type, "type symbol is a type");`
`87`	`87`	`return cpp_is_pod(symb.type);`
`88`	`88`	`}`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ Author: Daniel Kroening, [email protected]`
`14`	`14`	`#include <ostream>`
`15`	`15`
`16`	`16`	`#include <util/invariant.h>`
	`17`	`+#include <util/std_expr.h>`
	`18`	`+#include <util/std_types.h>`
`17`	`19`
`18`	`20`	`void template_mapt::apply(typet &type) const`
`19`	`21`	`{`
`@@ -40,7 +42,7 @@ void template_mapt::apply(typet &type) const`
`40`	`42`	`else if(type.id()==ID_symbol)`
`41`	`43`	`{`
`42`	`44`	`type_mapt::const_iterator m_it=`
`43`		`- type_map.find(type.get(ID_identifier));`
	`45`	`+ type_map.find(to_symbol_type(type).get_identifier());`
`44`	`46`
`45`	`47`	`if(m_it!=type_map.end())`
`46`	`48`	`{`
`@@ -74,7 +76,7 @@ void template_mapt::apply(exprt &expr) const`
`74`	`76`	`if(expr.id()==ID_symbol)`
`75`	`77`	`{`
`76`	`78`	`expr_mapt::const_iterator m_it=`
`77`		`- expr_map.find(expr.get(ID_identifier));`
	`79`	`+ expr_map.find(to_symbol_expr(expr).get_identifier());`
`78`	`80`
`79`	`81`	`if(m_it!=expr_map.end())`
`80`	`82`	`{`