Move sexpr to util directory

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>

src/CMakeLists.txt

@@ -52,7 +52,6 @@ endif()
 
 include_directories(${LEAN_SOURCE_DIR}/util)
 include_directories(${LEAN_SOURCE_DIR}/util/numerics)
-include_directories(${LEAN_SOURCE_DIR}/util/sexpr)
 include_directories(${LEAN_SOURCE_DIR}/interval)
 include_directories(${LEAN_SOURCE_DIR}/kernel)
 include_directories(${LEAN_SOURCE_DIR}/kernel/arith)
@@ -62,8 +61,6 @@ add_subdirectory(util)
 set(EXTRA_LIBS ${EXTRA_LIBS} util)
 add_subdirectory(util/numerics)
 set(EXTRA_LIBS ${EXTRA_LIBS} numerics)
-add_subdirectory(util/sexpr)
-set(EXTRA_LIBS ${EXTRA_LIBS} sexpr)
 add_subdirectory(interval)
 set(EXTRA_LIBS ${EXTRA_LIBS} interval)
 add_subdirectory(kernel)
@@ -76,6 +73,5 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
 add_subdirectory(shell)
 add_subdirectory(tests/util)
 add_subdirectory(tests/util/numerics)
-add_subdirectory(tests/util/sexpr)
 add_subdirectory(tests/interval)
 add_subdirectory(tests/kernel)

src/tests/util/CMakeLists.txt

@@ -4,6 +4,9 @@ add_test(interrupt ${CMAKE_CURRENT_BINARY_DIR}/interrupt)
 add_executable(name name.cpp)
 target_link_libraries(name ${EXTRA_LIBS})
 add_test(name ${CMAKE_CURRENT_BINARY_DIR}/name)
+add_executable(sexpr sexpr.cpp)
+target_link_libraries(sexpr ${EXTRA_LIBS})
+add_test(sexpr ${CMAKE_CURRENT_BINARY_DIR}/sexpr)
 add_executable(format format.cpp)
 target_link_libraries(format ${EXTRA_LIBS})
 add_test(format ${CMAKE_CURRENT_BINARY_DIR}/format)

src/tests/util/sexpr/CMakeLists.txt

@@ -1,3 +0,0 @@
-add_executable(sexpr_tst sexpr.cpp)
-target_link_libraries(sexpr_tst ${EXTRA_LIBS})
-add_test(sexpr ${CMAKE_CURRENT_BINARY_DIR}/sexpr_tst)

src/util/CMakeLists.txt

@@ -1,4 +1,4 @@
 add_library(util trace.cpp debug.cpp name.cpp exception.cpp
   verbosity.cpp interrupt.cpp hash.cpp escaped.cpp bit_tricks.cpp
-  format.cpp safe_arith.cpp options.cpp
+  sexpr.cpp sexpr_funcs.cpp format.cpp safe_arith.cpp options.cpp
   )

src/util/sexpr.h

@@ -136,6 +136,7 @@ inline bool operator==(sexpr const & a, bool b) { return is_int(a) && to_bool(a)
 inline bool operator==(sexpr const & a, int b) { return is_int(a) && to_int(a) == b; }
 inline bool operator==(sexpr const & a, double b) { return is_double(a) && to_double(a) == b; }
 inline bool operator==(sexpr const & a, std::string const & b) { return is_string(a) && to_string(a) == b; }
+inline bool operator==(sexpr const & a, char const * b) { return is_string(a) && to_string(a) == b; }
 bool operator==(sexpr const & a, name const & b);
 bool operator==(sexpr const & a, mpz const & b);
 bool operator==(sexpr const & a, mpq const & b);

src/util/sexpr/CMakeLists.txt

@@ -1,2 +0,0 @@
-add_library(sexpr sexpr.cpp sexpr_funcs.cpp)
-target_link_libraries(sexpr ${EXTRA_LIBS})