From 9b3c98850572f0729afe97ffde16d05a7e6e691b Mon Sep 17 00:00:00 2001 From: Cristian Cadar Date: Thu, 25 Jul 2019 22:22:55 +0100 Subject: Consolidated Expr-related include files into a single include/klee/Expr directory. This improves the organization of the code, and also makes it easier to reuse Expr outside KLEE. --- tools/kleaver/main.cpp | 17 ++++++++--------- tools/klee/main.cpp | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'tools') diff --git a/tools/kleaver/main.cpp b/tools/kleaver/main.cpp index 9033a2b4..cc292d10 100644 --- a/tools/kleaver/main.cpp +++ b/tools/kleaver/main.cpp @@ -7,23 +7,22 @@ // //===----------------------------------------------------------------------===// -#include "expr/Lexer.h" -#include "expr/Parser.h" - #include "klee/Common.h" #include "klee/Config/Version.h" -#include "klee/Constraints.h" -#include "klee/Expr.h" -#include "klee/ExprBuilder.h" +#include "klee/Expr/Constraints.h" +#include "klee/Expr/Expr.h" +#include "klee/Expr/ExprBuilder.h" +#include "klee/Expr/ExprPPrinter.h" +#include "klee/Expr/ExprSMTLIBPrinter.h" +#include "klee/Expr/ExprVisitor.h" +#include "klee/Expr/Parser/Lexer.h" +#include "klee/Expr/Parser/Parser.h" #include "klee/Internal/Support/PrintVersion.h" #include "klee/OptionCategories.h" #include "klee/Solver.h" #include "klee/SolverCmdLine.h" #include "klee/SolverImpl.h" #include "klee/Statistics.h" -#include "klee/util/ExprPPrinter.h" -#include "klee/util/ExprSMTLIBPrinter.h" -#include "klee/util/ExprVisitor.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/CommandLine.h" diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp index 99a9bf2a..8235c261 100644 --- a/tools/klee/main.cpp +++ b/tools/klee/main.cpp @@ -11,7 +11,7 @@ #include "klee/Config/Version.h" #include "klee/ExecutionState.h" -#include "klee/Expr.h" +#include "klee/Expr/Expr.h" #include "klee/Internal/ADT/KTest.h" #include "klee/Internal/ADT/TreeStream.h" #include "klee/Internal/Support/Debug.h" -- cgit 1.4.1