Moving sexpr.{cpp,h,i} from expr/ back into util/.

1 files changed, 11 insertions, 12 deletions

diff --git a/src/cvc4.i b/src/cvc4.i
index e81276f23..601c9a878 100644
--- a/src/cvc4.i
+++ b/src/cvc4.i
@@ -52,12 +52,12 @@ using namespace CVC4;
 #include "base/modal_exception.h"
 #include "expr/datatype.h"
 #include "expr/expr.h"
-#include "expr/sexpr.h"
 #include "expr/type.h"
 #include "options/option_exception.h"
 #include "smt_util/command.h"
-#include "util/integer.h"
 #include "util/bitvector.h"
+#include "util/integer.h"
+#include "util/sexpr.h"
 #include "util/unsafe_interrupt_exception.h"
 
 #ifdef SWIGJAVA
@@ -306,25 +306,24 @@ std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters;
 // At the moment, the header includes seem to need to follow a special order.
 // I don't know why. I am following the build order 
 %include "base/exception.i"
-%include "util/unsafe_interrupt_exception.i"
-%include "util/integer.i"
-%include "util/rational.i"
-%include "options/language.i"
-%include "util/configuration.i"
-%include "util/bool.i"
-%include "util/cardinality.i"
 %include "base/modal_exception.i"
-%include "expr/sexpr.i"
-
-%include "util/bitvector.i"
 
+%include "options/language.i"
 
+%include "util/bitvector.i"
+%include "util/bool.i"
+%include "util/cardinality.i"
+%include "util/configuration.i"
 %include "util/hash.i"
+%include "util/integer.i"
 %include "util/proof.i"
+%include "util/rational.i"
 %include "util/regexp.i"
 %include "util/result.i"
+%include "util/sexpr.i"
 %include "util/subrange_bound.i"
 %include "util/tuple.i"
+%include "util/unsafe_interrupt_exception.i"
 //%include "util/floatingpoint.i"
 
 %include "expr/uninterpreted_constant.i"