Skip to content

Move printf_formatter to goto-programs #2298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2018
Merged

Move printf_formatter to goto-programs #2298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/ansi-c/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions src/goto-programs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion src/goto-programs/goto_trace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 src/ansi-c/printf_formatter.cpp → src/goto-programs/printf_formatter.cpp
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions src/ansi-c/printf_formatter.h → src/goto-programs/printf_formatter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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
3 changes: 2 additions & 1 deletion src/goto-programs/xml_goto_trace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down