Skip to content

Remove unused includes list, functional from expr.h #4244

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.

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
Feb 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/ansi-c/ansi_c_convert_type.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Author: Daniel Kroening, [email protected]
#ifndef CPROVER_ANSI_C_ANSI_C_CONVERT_TYPE_H
#define CPROVER_ANSI_C_ANSI_C_CONVERT_TYPE_H

#include <list>

#include <util/message.h>

#include "c_qualifiers.h"
Expand Down
2 changes: 0 additions & 2 deletions src/assembler/assembler_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ Author: Daniel Kroening, [email protected]

#include "assembler_parser.h"

#include <iostream>

assembler_parsert assembler_parser;

extern char *yyassemblertext;
Expand Down
3 changes: 2 additions & 1 deletion src/assembler/assembler_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ Author: Daniel Kroening, [email protected]
#define CPROVER_ASSEMBLER_ASSEMBLER_PARSER_H

#include <util/parser.h>
#include <util/expr.h>

#include <list>

int yyassemblerlex();
int yyassemblererror(const std::string &error);
Expand Down
2 changes: 1 addition & 1 deletion src/cbmc/all_properties.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Author: Daniel Kroening, [email protected]
#include <util/xml.h>
#include <util/json.h>

#include <solvers/prop/prop_conv.h>
#include <solvers/sat/satcheck.h>
#include <solvers/prop/literal_expr.h>

#include <goto-symex/build_goto_trace.h>
#include <goto-programs/xml_goto_trace.h>
Expand Down
1 change: 1 addition & 0 deletions src/cbmc/all_properties_class.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Author: Daniel Kroening, [email protected]
#define CPROVER_CBMC_ALL_PROPERTIES_CLASS_H

#include <solvers/prop/cover_goals.h>
#include <solvers/prop/literal_expr.h>

#include "bmc.h"

Expand Down
2 changes: 1 addition & 1 deletion src/cbmc/bmc_cover.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Author: Daniel Kroening, [email protected]
#include <util/xml_irep.h>

#include <solvers/prop/cover_goals.h>
#include <solvers/prop/literal_expr.h>
#include <solvers/prop/prop_conv.h>

#include <goto-symex/build_goto_trace.h>

Expand Down
1 change: 1 addition & 0 deletions src/solvers/flattening/arrays.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Author: Daniel Kroening, [email protected]
#ifndef CPROVER_SOLVERS_FLATTENING_ARRAYS_H
#define CPROVER_SOLVERS_FLATTENING_ARRAYS_H

#include <list>
#include <set>

#include <util/union_find.h>
Expand Down
3 changes: 1 addition & 2 deletions src/solvers/prop/cover_goals.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ Author: Daniel Kroening, [email protected]

#include "cover_goals.h"

#include <util/threeval.h>

#include "literal_expr.h"
#include "prop_conv.h"

cover_goalst::~cover_goalst()
{
Expand Down
7 changes: 6 additions & 1 deletion src/solvers/prop/cover_goals.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@ Author: Daniel Kroening, [email protected]
#ifndef CPROVER_SOLVERS_PROP_COVER_GOALS_H
#define CPROVER_SOLVERS_PROP_COVER_GOALS_H

#include <list>

#include <util/decision_procedure.h>
#include <util/message.h>

#include "prop_conv.h"
#include "literal.h"

class prop_convt;

/// Try to cover some given set of goals incrementally. This can be seen as a
/// heuristic variant of SAT-based set-cover. No minimality guarantee.
Expand Down
3 changes: 0 additions & 3 deletions src/util/expr.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ Author: Daniel Kroening, [email protected]
#include "validate_types.h"
#include "validation_mode.h"

#include <functional>
#include <list>

#define forall_operands(it, expr) \
if((expr).has_operands()) /* NOLINT(readability/braces) */ \
for(exprt::operandst::const_iterator it=(expr).operands().begin(), \
Expand Down