Refactor xml_interface

Turn the constructor-only class into a free function.

Author: peterschrammel

src/cbmc/cbmc_parse_options.cpp

@@ -88,9 +88,9 @@ cbmc_parse_optionst::cbmc_parse_optionst(int argc, const char **argv)
       CBMC_OPTIONS,
       argc,
       argv,
-      std::string("CBMC ") + CBMC_VERSION),
-    xml_interfacet(cmdline)
+      std::string("CBMC ") + CBMC_VERSION)
 {
+  xml_interface(cmdline, ui_message_handler);
 }
 
 ::cbmc_parse_optionst::cbmc_parse_optionst(
@@ -101,9 +101,9 @@ ::cbmc_parse_optionst::cbmc_parse_optionst(
       CBMC_OPTIONS + extra_options,
       argc,
       argv,
-      std::string("CBMC ") + CBMC_VERSION),
-    xml_interfacet(cmdline)
+      std::string("CBMC ") + CBMC_VERSION)
 {
+  xml_interface(cmdline, ui_message_handler);
 }
 
 void cbmc_parse_optionst::set_default_options(optionst &options)

src/xmllang/xml_interface.cpp

@@ -13,30 +13,13 @@ Author: Daniel Kroening, [email protected]
 
 #include <iostream>
 
+#include <util/cmdline.h>
 #include <util/message.h>
 
 #include <xmllang/xml_parser.h>
 
-/// XML User Interface
-void xml_interfacet::get_xml_options(cmdlinet &cmdline)
-{
-  if(cmdline.isset("xml-interface"))
-  {
-    null_message_handlert message_handler;
-    xmlt xml;
-
-    parse_xml(std::cin, "", message_handler, xml);
-
-    get_xml_options(xml, cmdline);
-
-    cmdline.set("xml-ui");
-  }
-}
-
-/// XML User Interface
-void xml_interfacet::get_xml_options(
-  const xmlt &xml,
-  cmdlinet &cmdline)
+/// Parse commandline options from \p xml into \p cmdline
+static void get_xml_options(const xmlt &xml, cmdlinet &cmdline)
 {
   for(const auto &e : xml.elements)
   {
@@ -62,3 +45,20 @@ void xml_interfacet::get_xml_options(
     }
   }
 }
+
+void xml_interface(cmdlinet &cmdline, message_handlert &message_handler)
+{
+  if(cmdline.isset("xml-interface"))
+  {
+    xmlt xml;
+
+    parse_xml(std::cin, "", message_handler, xml);
+
+    get_xml_options(xml, cmdline);
+
+    // Add this so that it gets propagated into optionst;
+    // the ui_message_handlert::uit has already been set on the basis
+    // of the xml-interface flag.
+    cmdline.set("xml-ui");
+  }
+}

src/xmllang/xml_interface.h

@@ -12,21 +12,23 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_XMLLANG_XML_INTERFACE_H
 #define CPROVER_XMLLANG_XML_INTERFACE_H
 
-#include <util/cmdline.h>
-
-class xmlt;
-
-class xml_interfacet
-{
-public:
-  explicit xml_interfacet(cmdlinet &_cmdline)
-  {
-    get_xml_options(_cmdline);
-  }
-
-protected:
-  void get_xml_options(cmdlinet &cmdline);
-  void get_xml_options(const xmlt &xml, cmdlinet &cmdline);
-};
+class cmdlinet;
+class message_handlert;
+
+/// Parse XML-formatted commandline options from stdin.
+///
+/// Example:
+/// \code{.xml}
+/// <options>
+///   <valueOption actual="main.c"/>
+///   <valueOption name="function" actual="foo"/>
+///   <valueOption name="unwind" actual="3"/>
+///   <valueOption name="property" actual="foo.assertion.1"/>
+///   <valueOption name="property" actual="foo.assertion.3"/>
+///   <flagOption name="trace" actual="on"/>
+///   <flagOption name="show-properties" actual="off"/>
+/// </options>
+/// \endcode
+void xml_interface(cmdlinet &, message_handlert &);
 
 #endif // CPROVER_XMLLANG_XML_INTERFACE_H