ai_baset: consistently use function_id instead of function_identifier

It is as clear, but makes for shorter lines.

Author: tautschnig

src/analyses/ai.cpp

@@ -42,7 +42,7 @@ void ai_baset::output(
 
 void ai_baset::output(
   const namespacet &ns,
-  const irep_idt &function_identifier,
+  const irep_idt &function_id,
   const goto_programt &goto_program,
   std::ostream &out) const
 {
@@ -54,7 +54,7 @@ void ai_baset::output(
     abstract_state_before(i_it)->output(out, *this, ns);
     out << "\n";
     #if 1
-    goto_program.output_instruction(ns, function_identifier, out, *i_it);
+    goto_program.output_instruction(ns, function_id, out, *i_it);
     out << "\n";
     #endif
   }
@@ -84,7 +84,7 @@ jsont ai_baset::output_json(
 
 jsont ai_baset::output_json(
   const namespacet &ns,
-  const irep_idt &function_identifier,
+  const irep_idt &function_id,
   const goto_programt &goto_program) const
 {
   json_arrayt contents;
@@ -93,7 +93,7 @@ jsont ai_baset::output_json(
   {
     // Ideally we need output_instruction_json
     std::ostringstream out;
-    goto_program.output_instruction(ns, function_identifier, out, *i_it);
+    goto_program.output_instruction(ns, function_id, out, *i_it);
 
     json_objectt location(
       {{"locationNumber", json_numbert(std::to_string(i_it->location_number))},
@@ -134,7 +134,7 @@ xmlt ai_baset::output_xml(
 
 xmlt ai_baset::output_xml(
   const namespacet &ns,
-  const irep_idt &function_identifier,
+  const irep_idt &function_id,
   const goto_programt &goto_program) const
 {
   xmlt function_body;
@@ -149,7 +149,7 @@ xmlt ai_baset::output_xml(
 
     // Ideally we need output_instruction_xml
     std::ostringstream out;
-    goto_program.output_instruction(ns, function_identifier, out, *i_it);
+    goto_program.output_instruction(ns, function_id, out, *i_it);
     location.set_attribute("instruction", out.str());
 
     function_body.new_element(location);
@@ -176,10 +176,10 @@ void ai_baset::entry_state(const goto_programt &goto_program)
 }
 
 void ai_baset::initialize(
-  const irep_idt &function_identifier,
+  const irep_idt &function_id,
   const goto_functionst::goto_functiont &goto_function)
 {
-  initialize(function, goto_function.body);
+  initialize(function_id, goto_function.body);
 }
 
 void ai_baset::initialize(const irep_idt &, const goto_programt &goto_program)
@@ -214,7 +214,7 @@ ai_baset::locationt ai_baset::get_next(
 }
 
 bool ai_baset::fixedpoint(
-  const irep_idt &function_identifier,
+  const irep_idt &function_id,
   const goto_programt &goto_program,
   const goto_functionst &goto_functions,
   const namespacet &ns)
@@ -234,16 +234,15 @@ bool ai_baset::fixedpoint(
     locationt l=get_next(working_set);
 
     // goto_program is really only needed for iterator manipulation
-    if(visit(
-         function_identifier, l, working_set, goto_program, goto_functions, ns))
+    if(visit(function_id, l, working_set, goto_program, goto_functions, ns))
       new_data=true;
   }
 
   return new_data;
 }
 
 bool ai_baset::visit(
-  const irep_idt &function_identifier,
+  const irep_idt &function_id,
   locationt l,
   working_sett &working_set,
   const goto_programt &goto_program,
@@ -274,7 +273,7 @@ bool ai_baset::visit(
         to_code_function_call(l->code);
 
       if(do_function_call_rec(
-           function_identifier,
+           function_id,
            l,
            to_l,
            code.function(),
@@ -288,8 +287,7 @@ bool ai_baset::visit(
       // initialize state, if necessary
       get_state(to_l);
 
-      new_values.transform(
-        function_identifier, l, function_identifier, to_l, *this, ns);
+      new_values.transform(function_id, l, function_id, to_l, *this, ns);
 
       if(merge(new_values, l, to_l))
         have_new_values=true;
@@ -306,7 +304,7 @@ bool ai_baset::visit(
 }
 
 bool ai_baset::do_function_call(
-  const irep_idt &calling_function_identifier,
+  const irep_idt &calling_function_id,
   locationt l_call,
   locationt l_return,
   const goto_functionst &goto_functions,
@@ -327,12 +325,7 @@ bool ai_baset::do_function_call(
     // If we don't have a body, we just do an edge call -> return
     std::unique_ptr<statet> tmp_state(make_temporary_state(get_state(l_call)));
     tmp_state->transform(
-      calling_function_identifier,
-      l_call,
-      calling_function_identifier,
-      l_return,
-      *this,
-      ns);
+      calling_function_id, l_call, calling_function_id, l_return, *this, ns);
 
     return merge(*tmp_state, l_call, l_return);
   }
@@ -350,7 +343,7 @@ bool ai_baset::do_function_call(
     // do the edge from the call site to the beginning of the function
     std::unique_ptr<statet> tmp_state(make_temporary_state(get_state(l_call)));
     tmp_state->transform(
-      calling_function_identifier, l_call, f_it->first, l_begin, *this, ns);
+      calling_function_id, l_call, f_it->first, l_begin, *this, ns);
 
     bool new_data=false;
 
@@ -378,15 +371,15 @@ bool ai_baset::do_function_call(
 
     std::unique_ptr<statet> tmp_state(make_temporary_state(end_state));
     tmp_state->transform(
-      f_it->first, l_end, calling_function_identifier, l_return, *this, ns);
+      f_it->first, l_end, calling_function_id, l_return, *this, ns);
 
     // Propagate those
     return merge(*tmp_state, l_end, l_return);
   }
 }
 
 bool ai_baset::do_function_call_rec(
-  const irep_idt &calling_function_identifier,
+  const irep_idt &calling_function_id,
   locationt l_call,
   locationt l_return,
   const exprt &function,
@@ -414,13 +407,7 @@ bool ai_baset::do_function_call_rec(
     "Function " + id2string(identifier) + "not in function map");
 
   new_data = do_function_call(
-    calling_function_identifier,
-    l_call,
-    l_return,
-    goto_functions,
-    it,
-    arguments,
-    ns);
+    calling_function_id, l_call, l_return, goto_functions, it, arguments, ns);
 
   return new_data;
 }
@@ -454,16 +441,16 @@ void ai_baset::concurrent_fixedpoint(
   struct wl_entryt
   {
     wl_entryt(
-      const irep_idt &_function_identifier,
+      const irep_idt &_function_id,
       const goto_programt &_goto_program,
       locationt _location)
-      : function_identifier(_function_identifier),
+      : function_id(_function_id),
         goto_program(&_goto_program),
         location(_location)
     {
     }
 
-    irep_idt function_identifier;
+    irep_idt function_id;
     const goto_programt *goto_program;
     locationt location;
   };
@@ -506,7 +493,7 @@ void ai_baset::concurrent_fixedpoint(
         goto_programt::const_targett l=get_next(working_set);
 
         visit(
-          wl_entry.function_identifier,
+          wl_entry.function_id,
           l,
           working_set,
           *(wl_entry.goto_program),

src/analyses/ai.h

@@ -45,14 +45,14 @@ class ai_baset
 
   /// Run abstract interpretation on a single function
   void operator()(
-    const irep_idt &function_identifier,
+    const irep_idt &function_id,
     const goto_programt &goto_program,
     const namespacet &ns)
   {
     goto_functionst goto_functions;
-    initialize(function_identifier, goto_program);
+    initialize(function_id, goto_program);
     entry_state(goto_program);
-    fixedpoint(function_identifier, goto_program, goto_functions, ns);
+    fixedpoint(function_id, goto_program, goto_functions, ns);
     finalize();
   }
 
@@ -79,14 +79,14 @@ class ai_baset
 
   /// Run abstract interpretation on a single function
   void operator()(
-    const irep_idt &function_identifier,
+    const irep_idt &function_id,
     const goto_functionst::goto_functiont &goto_function,
     const namespacet &ns)
   {
     goto_functionst goto_functions;
-    initialize(function_identifier, goto_function);
+    initialize(function_id, goto_function);
     entry_state(goto_function.body);
-    fixedpoint(function_identifier, goto_function.body, goto_functions, ns);
+    fixedpoint(function_id, goto_function.body, goto_functions, ns);
     finalize();
   }
 
@@ -126,13 +126,13 @@ class ai_baset
 
   /// Output the abstract states for a single function
   /// \param ns: The namespace
-  /// \param function_identifier: The identifier used to find a symbol to
+  /// \param function_id: The identifier used to find a symbol to
   ///   identify the \p goto_program's source language
   /// \param goto_program: The goto program
   /// \param out: The ostream to direct output to
   virtual void output(
     const namespacet &ns,
-    const irep_idt &function_identifier,
+    const irep_idt &function_id,
     const goto_programt &goto_program,
     std::ostream &out) const;
 
@@ -221,13 +221,12 @@ class ai_baset
 protected:
   /// Initialize all the abstract states for a single function. Override this to
   /// do custom per-domain initialization.
-  virtual void initialize(
-    const irep_idt &function_identifier,
-    const goto_programt &goto_program);
+  virtual void
+  initialize(const irep_idt &function_id, const goto_programt &goto_program);
 
   /// Initialize all the abstract states for a single function.
   virtual void initialize(
-    const irep_idt &function_identifier,
+    const irep_idt &function_id,
     const goto_functionst::goto_functiont &goto_function);
 
   /// Initialize all the abstract states for a whole program. Override this to
@@ -249,23 +248,23 @@ class ai_baset
   /// Output the abstract states for a single function as JSON
   /// \param ns: The namespace
   /// \param goto_program: The goto program
-  /// \param function_identifier: The identifier used to find a symbol to
+  /// \param function_id: The identifier used to find a symbol to
   ///   identify the source language
   /// \return The JSON object
   virtual jsont output_json(
     const namespacet &ns,
-    const irep_idt &function_identifier,
+    const irep_idt &function_id,
     const goto_programt &goto_program) const;
 
   /// Output the abstract states for a single function as XML
   /// \param ns: The namespace
   /// \param goto_program: The goto program
-  /// \param function_identifier: The identifier used to find a symbol to
+  /// \param function_id: The identifier used to find a symbol to
   ///   identify the source language
   /// \return The XML object
   virtual xmlt output_xml(
     const namespacet &ns,
-    const irep_idt &function_identifier,
+    const irep_idt &function_id,
     const goto_programt &goto_program) const;
 
   /// The work queue, sorted by location number
@@ -285,7 +284,7 @@ class ai_baset
   /// Run the fixedpoint algorithm until it reaches a fixed point
   /// \return True if we found something new
   bool fixedpoint(
-    const irep_idt &function_identifier,
+    const irep_idt &function_id,
     const goto_programt &goto_program,
     const goto_functionst &goto_functions,
     const namespacet &ns);
@@ -307,7 +306,7 @@ class ai_baset
   /// or applications of the abstract transformer
   /// \return True if the state was changed
   bool visit(
-    const irep_idt &function_identifier,
+    const irep_idt &function_id,
     locationt l,
     working_sett &working_set,
     const goto_programt &goto_program,
@@ -316,7 +315,7 @@ class ai_baset
 
   // function calls
   bool do_function_call_rec(
-    const irep_idt &calling_function_identifier,
+    const irep_idt &calling_function_id,
     locationt l_call,
     locationt l_return,
     const exprt &function,
@@ -325,7 +324,7 @@ class ai_baset
     const namespacet &ns);
 
   bool do_function_call(
-    const irep_idt &calling_function_identifier,
+    const irep_idt &calling_function_id,
     locationt l_call,
     locationt l_return,
     const goto_functionst &goto_functions,