Move {json,xml}(source_locationt) to {json,xml}_irep.{h,cpp}

This prepares the move of {json,xml}_expr.{h,cpp} to goto-programs to remove the
dependency of util on langapi.

Author: tautschnig

src/analyses/custom_bitvector_analysis.cpp

@@ -14,7 +14,7 @@ Author: Daniel Kroening, [email protected]
 #include <util/expr_util.h>
 #include <util/simplify_expr.h>
 #include <util/string_constant.h>
-#include <util/xml_expr.h>
+#include <util/xml_irep.h>
 
 #include <langapi/language_util.h>
 

src/analyses/dependence_graph.cpp

@@ -17,8 +17,7 @@ Date: August 2013
 #include <cassert>
 
 #include <util/container_utils.h>
-#include <util/json.h>
-#include <util/json_expr.h>
+#include <util/json_irep.h>
 
 #include "goto_rw.h"
 

src/cbmc/bmc_cover.cpp

@@ -14,11 +14,11 @@ Author: Daniel Kroening, [email protected]
 #include <chrono>
 #include <iomanip>
 
-#include <util/xml.h>
-#include <util/xml_expr.h>
 #include <util/json.h>
-#include <util/json_stream.h>
 #include <util/json_expr.h>
+#include <util/json_stream.h>
+#include <util/xml_expr.h>
+#include <util/xml_irep.h>
 
 #include <solvers/prop/cover_goals.h>
 #include <solvers/prop/literal_expr.h>

src/cbmc/fault_localization.cpp

@@ -13,12 +13,12 @@ Author: Peter Schrammel
 
 #include <chrono>
 
-#include <util/threeval.h>
 #include <util/arith_tools.h>
-#include <util/symbol.h>
-#include <util/std_expr.h>
 #include <util/message.h>
-#include <util/xml_expr.h>
+#include <util/std_expr.h>
+#include <util/symbol.h>
+#include <util/threeval.h>
+#include <util/xml_irep.h>
 
 #include <solvers/prop/minimize.h>
 #include <solvers/prop/literal_expr.h>

src/goto-analyzer/static_verifier.cpp

@@ -8,7 +8,7 @@ Author: Martin Brain, [email protected]
 
 #include "static_verifier.h"
 
-#include <util/json_expr.h>
+#include <util/json_irep.h>
 #include <util/message.h>
 #include <util/namespace.h>
 #include <util/options.h>

src/goto-analyzer/unreachable_instructions.cpp

@@ -14,7 +14,7 @@ Date: April 2016
 #include "unreachable_instructions.h"
 
 #include <util/file_util.h>
-#include <util/json_expr.h>
+#include <util/json_irep.h>
 #include <util/options.h>
 #include <util/xml.h>
 

src/goto-diff/goto_diff_base.cpp

@@ -11,7 +11,7 @@ Author: Peter Schrammel
 
 #include "goto_diff.h"
 
-#include <util/json_expr.h>
+#include <util/json_irep.h>
 #include <util/options.h>
 
 #include <goto-programs/goto_model.h>

src/goto-instrument/unwind.h

@@ -16,7 +16,6 @@ Author: Daniel Kroening, [email protected]
 #include "unwindset.h"
 
 #include <util/json.h>
-#include <util/json_expr.h>
 #include <goto-programs/goto_model.h>
 
 class goto_modelt;

src/goto-programs/goto_inline_class.h

@@ -14,7 +14,6 @@ Author: Daniel Kroening, [email protected]
 
 #include <util/message.h>
 #include <util/json.h>
-#include <util/json_expr.h>
 
 #include "goto_functions.h"
 

src/goto-programs/json_goto_trace.cpp

@@ -14,15 +14,12 @@ Author: Daniel Kroening
 #include "json_goto_trace.h"
 #include "goto_trace.h"
 
-#include <util/json_expr.h>
-#include <util/json.h>
-#include <util/json_stream.h>
+#include <langapi/language_util.h>
 #include <util/arith_tools.h>
 #include <util/config.h>
 #include <util/invariant.h>
+#include <util/json_expr.h>
 #include <util/simplify_expr.h>
-#include <util/json_irep.h>
-#include <langapi/language_util.h>
 
 /// Convert an ASSERT goto_trace step.
 /// \param [out] json_failure: The JSON object that

src/goto-programs/json_goto_trace.h

@@ -16,10 +16,10 @@ Date: November 2005
 
 #include "goto_trace.h"
 
+#include <util/invariant.h>
 #include <util/json.h>
+#include <util/json_irep.h>
 #include <util/json_stream.h>
-#include <util/json_expr.h>
-#include <util/invariant.h>
 
 /// This is structure is here to facilitate
 /// passing arguments to the conversion

src/goto-programs/loop_ids.cpp

@@ -13,10 +13,8 @@ Author: Daniel Kroening, [email protected]
 
 #include <iostream>
 
-#include <util/xml.h>
-#include <util/xml_expr.h>
-#include <util/json.h>
-#include <util/json_expr.h>
+#include <util/json_irep.h>
+#include <util/xml_irep.h>
 
 void show_loop_ids(
   ui_message_handlert::uit ui,

src/goto-programs/show_goto_functions.cpp

@@ -13,8 +13,6 @@ Author: Peter Schrammel
 
 #include <util/xml.h>
 #include <util/json.h>
-#include <util/json_expr.h>
-#include <util/xml_expr.h>
 #include <util/cprover_prefix.h>
 #include <util/prefix.h>
 

src/goto-programs/show_goto_functions_json.cpp

@@ -14,7 +14,6 @@ Author: Thomas Kiley
 #include <iostream>
 #include <sstream>
 
-#include <util/json_expr.h>
 #include <util/json_irep.h>
 #include <util/cprover_prefix.h>
 #include <util/prefix.h>

src/goto-programs/show_goto_functions_xml.cpp

@@ -14,9 +14,9 @@ Author: Thomas Kiley
 #include <iostream>
 #include <sstream>
 
-#include <util/xml_expr.h>
 #include <util/cprover_prefix.h>
 #include <util/prefix.h>
+#include <util/xml_irep.h>
 
 #include <langapi/language_util.h>
 

src/goto-programs/show_properties.cpp

@@ -13,10 +13,8 @@ Author: Daniel Kroening, [email protected]
 
 #include <iostream>
 
-#include <util/xml.h>
-#include <util/xml_expr.h>
-#include <util/json.h>
-#include <util/json_expr.h>
+#include <util/json_irep.h>
+#include <util/xml_irep.h>
 
 #include <langapi/language_util.h>
 

src/goto-programs/xml_goto_trace.cpp

@@ -15,8 +15,9 @@ Author: Daniel Kroening
 
 #include <cassert>
 
-#include <util/xml_expr.h>
 #include <util/symbol.h>
+#include <util/xml_expr.h>
+#include <util/xml_irep.h>
 
 #include <langapi/language_util.h>
 

src/goto-symex/show_vcc.cpp

@@ -20,8 +20,7 @@ Author: Daniel Kroening, [email protected]
 
 #include <util/exception_utils.h>
 #include <util/format_expr.h>
-#include <util/json.h>
-#include <util/json_expr.h>
+#include <util/json_irep.h>
 #include <util/ui_message.h>
 
 void show_vcc_plain(

src/pointer-analysis/value_set_analysis.cpp

@@ -11,10 +11,9 @@ Author: Daniel Kroening, [email protected]
 
 #include "value_set_analysis.h"
 
-#include <util/prefix.h>
 #include <util/cprover_prefix.h>
-#include <util/xml_expr.h>
-#include <util/xml.h>
+#include <util/prefix.h>
+#include <util/xml_irep.h>
 
 #include <langapi/language_util.h>
 

src/util/json_expr.cpp

@@ -84,31 +84,6 @@ static exprt simplify_json_expr(
   return src;
 }
 
-json_objectt json(const source_locationt &location)
-{
-  json_objectt result;
-
-  if(!location.get_working_directory().empty())
-    result["workingDirectory"] = json_stringt(location.get_working_directory());
-
-  if(!location.get_file().empty())
-    result["file"] = json_stringt(location.get_file());
-
-  if(!location.get_line().empty())
-    result["line"] = json_stringt(location.get_line());
-
-  if(!location.get_column().empty())
-    result["column"] = json_stringt(location.get_column());
-
-  if(!location.get_function().empty())
-    result["function"] = json_stringt(location.get_function());
-
-  if(!location.get_java_bytecode_index().empty())
-    result["bytecodeIndex"] = json_stringt(location.get_java_bytecode_index());
-
-  return result;
-}
-
 /// Output a CBMC type in json.
 /// The `mode` argument is used to correctly report types.
 /// \param type: a type

src/util/json_expr.h

@@ -15,7 +15,6 @@ Author: Peter Schrammel
 #include "json.h"
 #include "irep.h"
 
-class source_locationt;
 class typet;
 class exprt;
 class namespacet;
@@ -30,6 +29,4 @@ json_objectt json(
   const namespacet &,
   const irep_idt &mode);
 
-json_objectt json(const source_locationt &);
-
 #endif // CPROVER_UTIL_JSON_EXPR_H

src/util/json_irep.cpp

@@ -121,3 +121,28 @@ irept json_irept::convert_from_json(const jsont &in) const
 
   return out;
 }
+
+json_objectt json(const source_locationt &location)
+{
+  json_objectt result;
+
+  if(!location.get_working_directory().empty())
+    result["workingDirectory"] = json_stringt(location.get_working_directory());
+
+  if(!location.get_file().empty())
+    result["file"] = json_stringt(location.get_file());
+
+  if(!location.get_line().empty())
+    result["line"] = json_stringt(location.get_line());
+
+  if(!location.get_column().empty())
+    result["column"] = json_stringt(location.get_column());
+
+  if(!location.get_function().empty())
+    result["function"] = json_stringt(location.get_function());
+
+  if(!location.get_java_bytecode_index().empty())
+    result["bytecodeIndex"] = json_stringt(location.get_java_bytecode_index());
+
+  return result;
+}

src/util/json_irep.h

@@ -13,9 +13,9 @@ Author: Thomas Kiley, [email protected]
 #define CPROVER_UTIL_JSON_IREP_H
 
 #include "irep.h"
+#include "json.h"
 
-class jsont;
-class json_objectt;
+class source_locationt;
 
 class json_irept
 {
@@ -38,4 +38,6 @@ class json_irept
   bool include_comments;
 };
 
+json_objectt json(const source_locationt &);
+
 #endif // CPROVER_UTIL_JSON_IREP_H

src/util/ui_message.cpp

@@ -12,12 +12,10 @@ Author: Daniel Kroening, [email protected]
 #include <iostream>
 
 #include "cmdline.h"
-#include "json.h"
-#include "json_expr.h"
+#include "json_irep.h"
 #include "json_stream.h"
 #include "make_unique.h"
-#include "xml.h"
-#include "xml_expr.h"
+#include "xml_irep.h"
 
 ui_message_handlert::ui_message_handlert(
   message_handlert *_message_handler,

src/util/xml_expr.cpp

@@ -23,31 +23,6 @@ Author: Daniel Kroening
 #include "std_expr.h"
 #include "xml.h"
 
-xmlt xml(const source_locationt &location)
-{
-  xmlt result;
-
-  result.name="location";
-
-  if(!location.get_working_directory().empty())
-    result.set_attribute(
-      "working-directory", id2string(location.get_working_directory()));
-
-  if(!location.get_file().empty())
-    result.set_attribute("file", id2string(location.get_file()));
-
-  if(!location.get_line().empty())
-    result.set_attribute("line", id2string(location.get_line()));
-
-  if(!location.get_column().empty())
-    result.set_attribute("column", id2string(location.get_column()));
-
-  if(!location.get_function().empty())
-    result.set_attribute("function", id2string(location.get_function()));
-
-  return result;
-}
-
 xmlt xml(
   const typet &type,
   const namespacet &ns)

src/util/xml_expr.h

@@ -12,7 +12,6 @@ Author: Daniel Kroening, [email protected]
 
 #include "xml.h"
 
-class source_locationt;
 class typet;
 class exprt;
 class namespacet;
@@ -25,6 +24,4 @@ xmlt xml(
   const typet &,
   const namespacet &);
 
-xmlt xml(const source_locationt &);
-
 #endif // CPROVER_UTIL_XML_EXPR_H