Make order of arguments in ai_baset::output* consistent

Place the identifier (the name of the function) before the goto program.

Author: tautschnig

src/analyses/ai.cpp

@@ -35,15 +35,15 @@ void ai_baset::output(
       out << "////\n";
       out << "\n";
 
-      output(ns, f_it->second.body, f_it->first, out);
+      output(ns, f_it->first, f_it->second.body, out);
     }
   }
 }
 
 void ai_baset::output(
   const namespacet &ns,
-  const goto_programt &goto_program,
   const irep_idt &identifier,
+  const goto_programt &goto_program,
   std::ostream &out) const
 {
   forall_goto_program_instructions(i_it, goto_program)
@@ -70,8 +70,8 @@ jsont ai_baset::output_json(
   {
     if(f_it->second.body_available())
     {
-      result[id2string(f_it->first)]=
-        output_json(ns, f_it->second.body, f_it->first);
+      result[id2string(f_it->first)] =
+        output_json(ns, f_it->first, f_it->second.body);
     }
     else
     {
@@ -90,8 +90,8 @@ jsont ai_baset::output_json(
 /// \return The JSON object
 jsont ai_baset::output_json(
   const namespacet &ns,
-  const goto_programt &goto_program,
-  const irep_idt &identifier) const
+  const irep_idt &identifier,
+  const goto_programt &goto_program) const
 {
   json_arrayt contents;
 
@@ -129,7 +129,7 @@ xmlt ai_baset::output_xml(
 
     if(f_it->second.body_available())
     {
-      function.new_element(output_xml(ns, f_it->second.body, f_it->first));
+      function.new_element(output_xml(ns, f_it->first, f_it->second.body));
     }
 
     program.new_element(function);
@@ -146,8 +146,8 @@ xmlt ai_baset::output_xml(
 /// \return The XML object
 xmlt ai_baset::output_xml(
   const namespacet &ns,
-  const goto_programt &goto_program,
-  const irep_idt &identifier) const
+  const irep_idt &identifier,
+  const goto_programt &goto_program) const
 {
   xmlt function_body;
 

src/analyses/ai.h

@@ -145,7 +145,7 @@ class ai_baset
     const goto_programt &goto_program,
     std::ostream &out) const
   {
-    output(ns, goto_program, "", out);
+    output(ns, "", goto_program, out);
   }
 
   /// Output the abstract states for a function
@@ -154,7 +154,7 @@ class ai_baset
     const goto_functionst::goto_functiont &goto_function,
     std::ostream &out) const
   {
-    output(ns, goto_function.body, "", out);
+    output(ns, "", goto_function.body, out);
   }
 
   /// Output the abstract states for the whole program as JSON
@@ -175,15 +175,15 @@ class ai_baset
     const namespacet &ns,
     const goto_programt &goto_program) const
   {
-    return output_json(ns, goto_program, "");
+    return output_json(ns, "", goto_program);
   }
 
   /// Output the abstract states for a single function as JSON
   jsont output_json(
     const namespacet &ns,
     const goto_functionst::goto_functiont &goto_function) const
   {
-    return output_json(ns, goto_function.body, "");
+    return output_json(ns, "", goto_function.body);
   }
 
   /// Output the abstract states for the whole program as XML
@@ -204,7 +204,7 @@ class ai_baset
     const namespacet &ns,
     const goto_programt &goto_program) const
   {
-    return output_xml(ns, goto_program, "");
+    return output_xml(ns, "", goto_program);
   }
 
   /// Output the abstract states for a single function as XML
@@ -259,8 +259,8 @@ class ai_baset
   /// \return The JSON object
   virtual jsont output_json(
     const namespacet &ns,
-    const goto_programt &goto_program,
-    const irep_idt &identifier) const;
+    const irep_idt &identifier,
+    const goto_programt &goto_program) const;
 
   /// Output the abstract states for a single function as XML
   /// \param ns: The namespace
@@ -270,8 +270,8 @@ class ai_baset
   /// \return The XML object
   virtual xmlt output_xml(
     const namespacet &ns,
-    const goto_programt &goto_program,
-    const irep_idt &identifier) const;
+    const irep_idt &identifier,
+    const goto_programt &goto_program) const;
 
   /// The work queue, sorted by location number
   typedef std::map<unsigned, locationt> working_sett;