Merge pull request #2298 from tautschnig/move-printf_formatter

Move printf_formatter to goto-programs

Author: tautschnig

src/ansi-c/Makefile

@@ -36,7 +36,6 @@ SRC = anonymous_member.cpp \
       literals/unescape_string.cpp \
       padding.cpp \
       preprocessor_line.cpp \
-      printf_formatter.cpp \
       type2name.cpp \
       # Empty last line
 

src/goto-programs/Makefile

@@ -34,6 +34,7 @@ SRC = adjust_float_expressions.cpp \
       osx_fat_reader.cpp \
       parameter_assignments.cpp \
       pointer_arithmetic.cpp \
+      printf_formatter.cpp \
       property_checker.cpp \
       read_bin_goto_object.cpp \
       read_goto_binary.cpp \

src/goto-programs/goto_trace.cpp

@@ -20,9 +20,10 @@ Author: Daniel Kroening
 #include <util/format_expr.h>
 #include <util/symbol.h>
 
-#include <ansi-c/printf_formatter.h>
 #include <langapi/language_util.h>
 
+#include "printf_formatter.h"
+
 void goto_tracet::output(
   const class namespacet &ns,
   std::ostream &out) const

src/ansi-c/printf_formatter.cpp renamed to src/goto-programs/printf_formatter.cpp

@@ -9,8 +9,8 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// printf Formatting
 
-#ifndef CPROVER_ANSI_C_PRINTF_FORMATTER_H
-#define CPROVER_ANSI_C_PRINTF_FORMATTER_H
+#ifndef CPROVER_GOTO_PROGRAMS_PRINTF_FORMATTER_H
+#define CPROVER_GOTO_PROGRAMS_PRINTF_FORMATTER_H
 
 #include <util/expr.h>
 #include <util/namespace.h>
@@ -56,4 +56,4 @@ class printf_formattert
   const exprt make_type(const exprt &src, const typet &dest);
 };
 
-#endif // CPROVER_ANSI_C_PRINTF_FORMATTER_H
+#endif // CPROVER_GOTO_PROGRAMS_PRINTF_FORMATTER_H

src/ansi-c/printf_formatter.h renamed to src/goto-programs/printf_formatter.h

@@ -18,9 +18,10 @@ Author: Daniel Kroening
 #include <util/xml_expr.h>
 #include <util/symbol.h>
 
-#include <ansi-c/printf_formatter.h>
 #include <langapi/language_util.h>
 
+#include "printf_formatter.h"
+
 void convert(
   const namespacet &ns,
   const goto_tracet &goto_trace,