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.

19 files changed, 45 insertions, 47 deletions

diff --git a/lib/Expr/ArrayCache.cpp b/lib/Expr/ArrayCache.cpp
index b669f237..d4e8ee8f 100644
--- a/lib/Expr/ArrayCache.cpp
+++ b/lib/Expr/ArrayCache.cpp
@@ -1,4 +1,4 @@
-#include "klee/util/ArrayCache.h"
+#include "klee/Expr/ArrayCache.h"
 
 namespace klee {
 
diff --git a/lib/Expr/ArrayExprOptimizer.cpp b/lib/Expr/ArrayExprOptimizer.cpp
index 43b289e2..1a48adfe 100644
--- a/lib/Expr/ArrayExprOptimizer.cpp
+++ b/lib/Expr/ArrayExprOptimizer.cpp
@@ -13,10 +13,10 @@
 #include "AssignmentGenerator.h"
 
 #include "klee/Config/Version.h"
-#include "klee/ExprBuilder.h"
+#include "klee/Expr/Assignment.h"
+#include "klee/Expr/ExprBuilder.h"
 #include "klee/Internal/Support/ErrorHandling.h"
 #include "klee/OptionCategories.h"
-#include "klee/util/Assignment.h"
 #include "klee/util/BitArray.h"
 
 #include <llvm/ADT/APInt.h>
diff --git a/lib/Expr/ArrayExprOptimizer.h b/lib/Expr/ArrayExprOptimizer.h
index 8f6472a4..ca90931d 100644
--- a/lib/Expr/ArrayExprOptimizer.h
+++ b/lib/Expr/ArrayExprOptimizer.h
@@ -17,7 +17,7 @@
 #include <utility>
 #include <vector>
 
-#include "klee/Expr.h"
+#include "klee/Expr/Expr.h"
 #include "klee/util/Ref.h"
 
 namespace klee {
diff --git a/lib/Expr/ArrayExprRewriter.h b/lib/Expr/ArrayExprRewriter.h
index a0ee9f1d..098cb0a6 100644
--- a/lib/Expr/ArrayExprRewriter.h
+++ b/lib/Expr/ArrayExprRewriter.h
@@ -14,7 +14,7 @@
 #include <map>
 #include <vector>
 
-#include "klee/Expr.h"
+#include "klee/Expr/Expr.h"
 #include "klee/util/Ref.h"
 
 namespace klee {
diff --git a/lib/Expr/ArrayExprVisitor.h b/lib/Expr/ArrayExprVisitor.h
index bfa75478..a6d9ae46 100644
--- a/lib/Expr/ArrayExprVisitor.h
+++ b/lib/Expr/ArrayExprVisitor.h
@@ -10,9 +10,9 @@
 #ifndef KLEE_ARRAYEXPRVISITOR_H
 #define KLEE_ARRAYEXPRVISITOR_H
 
-#include "klee/ExprBuilder.h"
+#include "klee/Expr/ExprBuilder.h"
+#include "klee/Expr/ExprVisitor.h"
 #include "klee/SolverCmdLine.h"
-#include "klee/util/ExprVisitor.h"
 
 #include <unordered_map>
 #include <unordered_set>
diff --git a/lib/Expr/Assigment.cpp b/lib/Expr/Assigment.cpp
index d788785a..2fc569cc 100644
--- a/lib/Expr/Assigment.cpp
+++ b/lib/Expr/Assigment.cpp
@@ -6,7 +6,9 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
-#include "klee/util/Assignment.h"
+
+#include "klee/Expr/Assignment.h"
+
 namespace klee {
 
 void Assignment::dump() {
diff --git a/lib/Expr/AssignmentGenerator.cpp b/lib/Expr/AssignmentGenerator.cpp
index dc744ba0..acb2dc13 100644
--- a/lib/Expr/AssignmentGenerator.cpp
+++ b/lib/Expr/AssignmentGenerator.cpp
@@ -9,21 +9,22 @@
 
 #include "AssignmentGenerator.h"
 
-#include <cassert>
-#include <cstdint>
+#include "klee/Expr/Assignment.h"
+#include "klee/Internal/Support/ErrorHandling.h"
+#include "klee/klee.h"
+
 #include <llvm/ADT/APInt.h>
 #include <llvm/Support/Casting.h>
 #include <llvm/Support/raw_ostream.h>
+
+#include <cassert>
+#include <cstdint>
 #include <map>
 #include <set>
 #include <stddef.h>
 #include <string>
 #include <utility>
 
-#include "klee/Internal/Support/ErrorHandling.h"
-#include "klee/klee.h"
-#include "klee/util/Assignment.h"
-
 using namespace klee;
 
 bool AssignmentGenerator::generatePartialAssignment(const ref<Expr> &e,
diff --git a/lib/Expr/AssignmentGenerator.h b/lib/Expr/AssignmentGenerator.h
index 3bd940e7..173b863e 100644
--- a/lib/Expr/AssignmentGenerator.h
+++ b/lib/Expr/AssignmentGenerator.h
@@ -10,11 +10,11 @@
 #ifndef KLEE_ASSIGNMENTGENERATOR_H
 #define KLEE_ASSIGNMENTGENERATOR_H
 
-#include <vector>
-
-#include "klee/Expr.h"
+#include "klee/Expr/Expr.h"
 #include "klee/util/Ref.h"
 
+#include <vector>
+
 namespace klee {
 class Assignment;
 } /* namespace klee */
diff --git a/lib/Expr/Constraints.cpp b/lib/Expr/Constraints.cpp
index e033333b..2b5adc4c 100644
--- a/lib/Expr/Constraints.cpp
+++ b/lib/Expr/Constraints.cpp
@@ -7,12 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "klee/Constraints.h"
+#include "klee/Expr/Constraints.h"
 
+#include "klee/Expr/ExprPPrinter.h"
+#include "klee/Expr/ExprVisitor.h"
 #include "klee/Internal/Module/KModule.h"
 #include "klee/OptionCategories.h"
-#include "klee/util/ExprPPrinter.h"
-#include "klee/util/ExprVisitor.h"
 
 #include "llvm/IR/Function.h"
 #include "llvm/Support/CommandLine.h"
diff --git a/lib/Expr/Expr.cpp b/lib/Expr/Expr.cpp
index 060595d6..6b8dc95f 100644
--- a/lib/Expr/Expr.cpp
+++ b/lib/Expr/Expr.cpp
@@ -7,14 +7,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "klee/Expr.h"
+#include "klee/Expr/Expr.h"
 
 #include "klee/Config/Version.h"
+#include "klee/Expr/ExprPPrinter.h"
 // FIXME: We shouldn't need this once fast constant support moves into
 // Core. If we need to do arithmetic, we probably want to use APInt.
 #include "klee/Internal/Support/IntEvaluation.h"
 #include "klee/OptionCategories.h"
-#include "klee/util/ExprPPrinter.h"
 
 #include "llvm/ADT/Hashing.h"
 #include "llvm/Support/CommandLine.h"
diff --git a/lib/Expr/ExprBuilder.cpp b/lib/Expr/ExprBuilder.cpp
index d9e20e45..e1cfa2d2 100644
--- a/lib/Expr/ExprBuilder.cpp
+++ b/lib/Expr/ExprBuilder.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "klee/ExprBuilder.h"
+#include "klee/Expr/ExprBuilder.h"
 
 using namespace klee;
 
diff --git a/lib/Expr/ExprEvaluator.cpp b/lib/Expr/ExprEvaluator.cpp
index 6b84cd6f..f03d7669 100644
--- a/lib/Expr/ExprEvaluator.cpp
+++ b/lib/Expr/ExprEvaluator.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "klee/util/ExprEvaluator.h"
+#include "klee/Expr/ExprEvaluator.h"
 
 using namespace klee;
 
diff --git a/lib/Expr/ExprPPrinter.cpp b/lib/Expr/ExprPPrinter.cpp
index 114c46b4..2ccd7262 100644
--- a/lib/Expr/ExprPPrinter.cpp
+++ b/lib/Expr/ExprPPrinter.cpp
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "klee/util/ExprPPrinter.h"
+#include "klee/Expr/ExprPPrinter.h"
 
-#include "klee/Constraints.h"
+#include "klee/Expr/Constraints.h"
 #include "klee/OptionCategories.h"
 #include "klee/util/PrintContext.h"
 
diff --git a/lib/Expr/ExprSMTLIBPrinter.cpp b/lib/Expr/ExprSMTLIBPrinter.cpp
index 06186db2..b83a6af4 100644
--- a/lib/Expr/ExprSMTLIBPrinter.cpp
+++ b/lib/Expr/ExprSMTLIBPrinter.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "klee/util/ExprSMTLIBPrinter.h"
+#include "klee/Expr/ExprSMTLIBPrinter.h"
 
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/CommandLine.h"
diff --git a/lib/Expr/ExprUtil.cpp b/lib/Expr/ExprUtil.cpp
index 2106b226..911366f3 100644
--- a/lib/Expr/ExprUtil.cpp
+++ b/lib/Expr/ExprUtil.cpp
@@ -7,12 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "klee/util/ExprUtil.h"
-#include "klee/util/ExprHashMap.h"
-
-#include "klee/Expr.h"
-
-#include "klee/util/ExprVisitor.h"
+#include "klee/Expr/ExprUtil.h"
+#include "klee/Expr/Expr.h"
+#include "klee/Expr/ExprHashMap.h"
+#include "klee/Expr/ExprVisitor.h"
 
 #include <set>
 
diff --git a/lib/Expr/ExprVisitor.cpp b/lib/Expr/ExprVisitor.cpp
index b99cc7e7..a3fa41d8 100644
--- a/lib/Expr/ExprVisitor.cpp
+++ b/lib/Expr/ExprVisitor.cpp
@@ -7,9 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "klee/util/ExprVisitor.h"
+#include "klee/Expr/ExprVisitor.h"
+
+#include "klee/Expr/Expr.h"
 
-#include "klee/Expr.h"
 #include "llvm/Support/CommandLine.h"
 
 namespace {
diff --git a/lib/Expr/Lexer.cpp b/lib/Expr/Lexer.cpp
index e250a968..784764bb 100644
--- a/lib/Expr/Lexer.cpp
+++ b/lib/Expr/Lexer.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "expr/Lexer.h"
+#include "klee/Expr/Parser/Lexer.h"
 
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/lib/Expr/Parser.cpp b/lib/Expr/Parser.cpp
index 479ff6c2..c365002d 100644
--- a/lib/Expr/Parser.cpp
+++ b/lib/Expr/Parser.cpp
@@ -7,16 +7,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "expr/Parser.h"
-
-#include "expr/Lexer.h"
-
 #include "klee/Config/Version.h"
-#include "klee/Constraints.h"
-#include "klee/ExprBuilder.h"
+#include "klee/Expr/Constraints.h"
+#include "klee/Expr/ArrayCache.h"
+#include "klee/Expr/ExprBuilder.h"
+#include "klee/Expr/ExprPPrinter.h"
+#include "klee/Expr/Parser/Lexer.h"
+#include "klee/Expr/Parser/Parser.h"
 #include "klee/Solver.h"
-#include "klee/util/ExprPPrinter.h"
-#include "klee/util/ArrayCache.h"
 
 #include "llvm/ADT/APInt.h"
 #include "llvm/Support/MemoryBuffer.h"
diff --git a/lib/Expr/Updates.cpp b/lib/Expr/Updates.cpp
index d58a3642..7264ca89 100644
--- a/lib/Expr/Updates.cpp
+++ b/lib/Expr/Updates.cpp
@@ -7,14 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "klee/Expr.h"
+#include "klee/Expr/Expr.h"
 
 #include <cassert>
 
 using namespace klee;
 
-///
-
 UpdateNode::UpdateNode(const UpdateNode *_next, 
                        const ref<Expr> &_index, 
                        const ref<Expr> &_value)