Skip to content

Commit cc23b20

Browse files
committed
Move printf_formatter to goto-programs
The only users of this code are in goto-programs, and printf_formatter has no dependency on ansi-c code.
1 parent 2ed63f5 commit cc23b20

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

src/ansi-c/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ SRC = anonymous_member.cpp \
3636
literals/unescape_string.cpp \
3737
padding.cpp \
3838
preprocessor_line.cpp \
39-
printf_formatter.cpp \
4039
type2name.cpp \
4140
# Empty last line
4241

src/goto-programs/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ SRC = adjust_float_expressions.cpp \
3434
osx_fat_reader.cpp \
3535
parameter_assignments.cpp \
3636
pointer_arithmetic.cpp \
37+
printf_formatter.cpp \
3738
property_checker.cpp \
3839
read_bin_goto_object.cpp \
3940
read_goto_binary.cpp \

src/goto-programs/goto_trace.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ Author: Daniel Kroening
2020
#include <util/format_expr.h>
2121
#include <util/symbol.h>
2222

23-
#include <ansi-c/printf_formatter.h>
2423
#include <langapi/language_util.h>
2524

25+
#include "printf_formatter.h"
26+
2627
void goto_tracet::output(
2728
const class namespacet &ns,
2829
std::ostream &out) const

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Author: Daniel Kroening, [email protected]
99
/// \file
1010
/// printf Formatting
1111

12-
#ifndef CPROVER_ANSI_C_PRINTF_FORMATTER_H
13-
#define CPROVER_ANSI_C_PRINTF_FORMATTER_H
12+
#ifndef CPROVER_GOTO_PROGRAMS_PRINTF_FORMATTER_H
13+
#define CPROVER_GOTO_PROGRAMS_PRINTF_FORMATTER_H
1414

1515
#include <util/expr.h>
1616
#include <util/namespace.h>
@@ -56,4 +56,4 @@ class printf_formattert
5656
const exprt make_type(const exprt &src, const typet &dest);
5757
};
5858

59-
#endif // CPROVER_ANSI_C_PRINTF_FORMATTER_H
59+
#endif // CPROVER_GOTO_PROGRAMS_PRINTF_FORMATTER_H

src/goto-programs/xml_goto_trace.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ Author: Daniel Kroening
1818
#include <util/xml_expr.h>
1919
#include <util/symbol.h>
2020

21-
#include <ansi-c/printf_formatter.h>
2221
#include <langapi/language_util.h>
2322

23+
#include "printf_formatter.h"
24+
2425
void convert(
2526
const namespacet &ns,
2627
const goto_tracet &goto_trace,

0 commit comments

Comments
 (0)