Made the json and xml show functions class use operator()

Author: thk123

src/goto-programs/show_goto_functions.cpp

@@ -45,14 +45,14 @@ void show_goto_functions(
   case ui_message_handlert::XML_UI:
   {
     show_goto_functions_xmlt xml_show_functions(ns);
-    xml_show_functions.print_goto_functions(goto_functions, std::cout);
+    xml_show_functions(goto_functions, std::cout);
   }
   break;
 
   case ui_message_handlert::JSON_UI:
   {
     show_goto_functions_jsont json_show_functions(ns);
-    json_show_functions.print_goto_functions(goto_functions, std::cout);
+    json_show_functions(goto_functions, std::cout);
   }
   break;
 

src/goto-programs/show_goto_functions_json.cpp

@@ -39,7 +39,7 @@ show_goto_functions_jsont::show_goto_functions_jsont(const namespacet &ns):
 
 /*******************************************************************\
 
-Function: show_goto_functions_jsont::show_goto_functions
+Function: show_goto_functions_jsont::convert
 
   Inputs:
    goto_functions - the goto functions that make up the program
@@ -51,7 +51,7 @@ Function: show_goto_functions_jsont::show_goto_functions
 
 \*******************************************************************/
 
-json_objectt show_goto_functions_jsont::get_goto_functions(
+json_objectt show_goto_functions_jsont::convert(
   const goto_functionst &goto_functions)
 {
   json_arrayt json_functions;
@@ -131,7 +131,7 @@ json_objectt show_goto_functions_jsont::get_goto_functions(
 
 /*******************************************************************\
 
-Function: show_goto_functions_jsont::print_goto_functions
+Function: show_goto_functions_jsont::operator()
 
   Inputs:
    goto_functions - the goto functions that make up the program
@@ -147,7 +147,7 @@ Function: show_goto_functions_jsont::print_goto_functions
 
 \*******************************************************************/
 
-void show_goto_functions_jsont::print_goto_functions(
+void show_goto_functions_jsont::operator()(
   const goto_functionst &goto_functions,
   std::ostream &out,
   bool append)
@@ -156,5 +156,5 @@ void show_goto_functions_jsont::print_goto_functions(
   {
     out << ",\n";
   }
-  out << get_goto_functions(goto_functions);
+  out << convert(goto_functions);
 }

src/goto-programs/show_goto_functions_json.h

@@ -19,8 +19,8 @@ class show_goto_functions_jsont
 public:
   explicit show_goto_functions_jsont(const namespacet &ns);
 
-  json_objectt get_goto_functions(const goto_functionst &goto_functions);
-  void print_goto_functions(
+  json_objectt convert(const goto_functionst &goto_functions);
+  void operator()(
     const goto_functionst &goto_functions, std::ostream &out, bool append=true);
 
 private:

src/goto-programs/show_goto_functions_xml.cpp

@@ -40,7 +40,7 @@ show_goto_functions_xmlt::show_goto_functions_xmlt(const namespacet &ns):
 
 /*******************************************************************\
 
-Function: show_goto_functions_xmlt::show_goto_functions
+Function: show_goto_functions_xmlt::convert
 
   Inputs:
    goto_functions - the goto functions that make up the program
@@ -66,7 +66,7 @@ Function: show_goto_functions_xmlt::show_goto_functions
 
 \*******************************************************************/
 
-xmlt show_goto_functions_xmlt::get_goto_functions(
+xmlt show_goto_functions_xmlt::convert(
   const goto_functionst &goto_functions)
 {
   xmlt xml_functions=xmlt("functions");
@@ -116,7 +116,7 @@ xmlt show_goto_functions_xmlt::get_goto_functions(
 
 /*******************************************************************\
 
-Function: show_goto_functions_xmlt::print_goto_functions
+Function: show_goto_functions_xmlt::operator()
 
   Inputs:
    goto_functions - the goto functions that make up the program
@@ -132,7 +132,7 @@ Function: show_goto_functions_xmlt::print_goto_functions
 
 \*******************************************************************/
 
-void show_goto_functions_xmlt::print_goto_functions(
+void show_goto_functions_xmlt::operator()(
   const goto_functionst &goto_functions,
   std::ostream &out,
   bool append)
@@ -141,5 +141,5 @@ void show_goto_functions_xmlt::print_goto_functions(
   {
     out << "\n";
   }
-  out << get_goto_functions(goto_functions);
+  out << convert(goto_functions);
 }

src/goto-programs/show_goto_functions_xml.h

@@ -19,8 +19,8 @@ class show_goto_functions_xmlt
 public:
   explicit show_goto_functions_xmlt(const namespacet &ns);
 
-  xmlt get_goto_functions(const goto_functionst &goto_functions);
-  void print_goto_functions(
+  xmlt convert(const goto_functionst &goto_functions);
+  void operator()(
     const goto_functionst &goto_functions, std::ostream &out, bool append=true);
 
 private: