Use fullpath in #include directives.

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

src/CMakeLists.txt

@@ -77,17 +77,7 @@ if("${READLINE}" MATCHES "ON")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLEAN_USE_READLINE")
 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}/library)
-include_directories(${LEAN_SOURCE_DIR}/library/arith)
-include_directories(${LEAN_SOURCE_DIR}/library/cast)
-include_directories(${LEAN_SOURCE_DIR}/library/import_all)
-include_directories(${LEAN_SOURCE_DIR}/parsers)
-include_directories(${LEAN_SOURCE_DIR}/frontends/lean)
+include_directories(${LEAN_SOURCE_DIR})
 
 add_subdirectory(util)
 set(LEAN_LIBS ${LEAN_LIBS} util)

src/frontends/lean/lean_coercion.h

@@ -5,7 +5,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "object.h"
+#include "kernel/object.h"
 
 namespace lean {
 /**

src/frontends/lean/lean_elaborator.cpp

@@ -5,20 +5,20 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <deque>
-#include "normalizer.h"
-#include "metavar.h"
-#include "printer.h"
-#include "context.h"
-#include "builtin.h"
-#include "free_vars.h"
-#include "for_each.h"
-#include "update_expr.h"
-#include "replace.h"
-#include "expr_pair.h"
-#include "flet.h"
-#include "lean_frontend.h"
-#include "lean_elaborator.h"
-#include "lean_elaborator_exception.h"
+#include "util/flet.h"
+#include "kernel/normalizer.h"
+#include "kernel/context.h"
+#include "kernel/builtin.h"
+#include "kernel/free_vars.h"
+#include "kernel/for_each.h"
+#include "kernel/replace.h"
+#include "library/metavar.h"
+#include "library/printer.h"
+#include "library/update_expr.h"
+#include "library/expr_pair.h"
+#include "frontends/lean/lean_frontend.h"
+#include "frontends/lean/lean_elaborator.h"
+#include "frontends/lean/lean_elaborator_exception.h"
 
 namespace lean {
 static name g_choice_name(name(name(name(0u), "library"), "choice"));

src/frontends/lean/lean_elaborator.h

@@ -6,8 +6,8 @@ Author: Leonardo de Moura
 */
 #pragma once
 #include <memory>
-#include "environment.h"
-#include "formatter.h"
+#include "kernel/environment.h"
+#include "library/formatter.h"
 
 namespace lean {
 class frontend;

src/frontends/lean/lean_elaborator_exception.cpp

@@ -4,8 +4,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "lean_elaborator_exception.h"
-#include "lean_elaborator.h"
+#include "frontends/lean/lean_elaborator_exception.h"
+#include "frontends/lean/lean_elaborator.h"
 
 namespace lean {
 format pp_elaborator_state(formatter fmt, elaborator const & elb, options const & opts) {

src/frontends/lean/lean_elaborator_exception.h

@@ -5,9 +5,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "lean_elaborator.h"
-#include "kernel_exception.h"
-#include "state.h"
+#include "kernel/kernel_exception.h"
+#include "library/state.h"
+#include "frontends/lean/lean_elaborator.h"
 
 namespace lean {
 /**

src/frontends/lean/lean_frontend.cpp

@@ -6,18 +6,18 @@ Author: Leonardo de Moura
 */
 #include <atomic>
 #include <unordered_set>
-#include "environment.h"
-#include "import_all.h"
-#include "map.h"
-#include "state.h"
-#include "sstream.h"
-#include "exception.h"
-#include "expr_pair.h"
-#include "lean_operator_info.h"
-#include "lean_coercion.h"
-#include "lean_frontend.h"
-#include "lean_notation.h"
-#include "lean_pp.h"
+#include "util/map.h"
+#include "util/sstream.h"
+#include "util/exception.h"
+#include "kernel/environment.h"
+#include "library/expr_pair.h"
+#include "library/import_all/import_all.h"
+#include "library/state.h"
+#include "frontends/lean/lean_operator_info.h"
+#include "frontends/lean/lean_coercion.h"
+#include "frontends/lean/lean_frontend.h"
+#include "frontends/lean/lean_notation.h"
+#include "frontends/lean/lean_pp.h"
 
 namespace lean {
 static std::vector<bool> g_empty_vector;

src/frontends/lean/lean_frontend.h

@@ -6,9 +6,9 @@ Author: Leonardo de Moura
 */
 #pragma once
 #include <memory>
-#include "environment.h"
-#include "state.h"
-#include "lean_operator_info.h"
+#include "kernel/environment.h"
+#include "library/state.h"
+#include "frontends/lean/lean_operator_info.h"
 
 namespace lean {
 /**

src/frontends/lean/lean_notation.cpp

@@ -4,11 +4,11 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "builtin.h"
-#include "basic_thms.h"
-#include "lean_frontend.h"
-#include "arithlibs.h"
-#include "castlib.h"
+#include "kernel/builtin.h"
+#include "library/basic_thms.h"
+#include "library/arith/arithlibs.h"
+#include "library/cast/castlib.h"
+#include "frontends/lean/lean_frontend.h"
 
 namespace lean {
 /**

src/frontends/lean/lean_operator_info.cpp

@@ -5,8 +5,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "lean_operator_info.h"
-#include "rc.h"
+#include "util/rc.h"
+#include "frontends/lean/lean_operator_info.h"
 
 namespace lean {
 /** \brief Actual implementation of operator_info */

src/frontends/lean/lean_operator_info.h

@@ -5,10 +5,10 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "name.h"
-#include "list.h"
-#include "format.h"
-#include "object.h"
+#include "util/name.h"
+#include "util/list.h"
+#include "util/sexpr/format.h"
+#include "kernel/object.h"
 
 namespace lean {
 /**

src/frontends/lean/lean_parser.cpp

@@ -5,28 +5,28 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <unordered_map>
-#include "scoped_map.h"
-#include "exception.h"
-#include "normalizer.h"
-#include "type_checker.h"
-#include "free_vars.h"
-#include "builtin.h"
-#include "arithlibs.h"
-#include "printer.h"
-#include "state.h"
-#include "option_declarations.h"
-#include "expr_maps.h"
-#include "sstream.h"
-#include "kernel_exception.h"
-#include "kernel_exception_formatter.h"
-#include "metavar.h"
-#include "lean_frontend.h"
-#include "lean_elaborator.h"
-#include "lean_elaborator_exception.h"
-#include "lean_parser.h"
-#include "lean_scanner.h"
-#include "lean_notation.h"
-#include "lean_pp.h"
+#include "util/scoped_map.h"
+#include "util/exception.h"
+#include "util/sstream.h"
+#include "util/sexpr/option_declarations.h"
+#include "kernel/normalizer.h"
+#include "kernel/type_checker.h"
+#include "kernel/free_vars.h"
+#include "kernel/builtin.h"
+#include "kernel/kernel_exception.h"
+#include "kernel/expr_maps.h"
+#include "library/arith/arithlibs.h"
+#include "library/printer.h"
+#include "library/state.h"
+#include "library/kernel_exception_formatter.h"
+#include "library/metavar.h"
+#include "frontends/lean/lean_frontend.h"
+#include "frontends/lean/lean_elaborator.h"
+#include "frontends/lean/lean_elaborator_exception.h"
+#include "frontends/lean/lean_parser.h"
+#include "frontends/lean/lean_scanner.h"
+#include "frontends/lean/lean_notation.h"
+#include "frontends/lean/lean_pp.h"
 #ifdef LEAN_USE_READLINE
 #include <stdlib.h>
 #include <stdio.h>

src/frontends/lean/lean_parser.h

@@ -6,8 +6,8 @@ Author: Leonardo de Moura
 */
 #pragma once
 #include <iostream>
-#include "lean_frontend.h"
-#include "interruptable_ptr.h"
+#include "util/interruptable_ptr.h"
+#include "frontends/lean/lean_frontend.h"
 
 namespace lean {
 /** \brief Functional object for parsing commands and expressions */

src/frontends/lean/lean_pp.cpp

@@ -6,24 +6,24 @@ Author: Leonardo de Moura
 */
 #include <limits>
 #include <memory>
-#include "context.h"
-#include "scoped_map.h"
-#include "scoped_set.h"
-#include "for_each.h"
-#include "instantiate.h"
-#include "occurs.h"
-#include "builtin.h"
-#include "free_vars.h"
-#include "context_to_lambda.h"
-#include "options.h"
-#include "interruptable_ptr.h"
-#include "metavar.h"
-#include "exception.h"
-#include "lean_notation.h"
-#include "lean_pp.h"
-#include "lean_frontend.h"
-#include "lean_coercion.h"
-#include "lean_elaborator.h"
+#include "util/scoped_map.h"
+#include "util/exception.h"
+#include "util/scoped_set.h"
+#include "util/sexpr/options.h"
+#include "util/interruptable_ptr.h"
+#include "kernel/context.h"
+#include "kernel/for_each.h"
+#include "kernel/instantiate.h"
+#include "kernel/occurs.h"
+#include "kernel/builtin.h"
+#include "kernel/free_vars.h"
+#include "library/context_to_lambda.h"
+#include "library/metavar.h"
+#include "frontends/lean/lean_notation.h"
+#include "frontends/lean/lean_pp.h"
+#include "frontends/lean/lean_frontend.h"
+#include "frontends/lean/lean_coercion.h"
+#include "frontends/lean/lean_elaborator.h"
 
 #ifndef LEAN_DEFAULT_PP_MAX_DEPTH
 #define LEAN_DEFAULT_PP_MAX_DEPTH std::numeric_limits<unsigned>::max()

src/frontends/lean/lean_pp.h

@@ -5,9 +5,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "context.h"
-#include "formatter.h"
-#include "options.h"
+#include "util/sexpr/options.h"
+#include "kernel/context.h"
+#include "library/formatter.h"
 
 namespace lean {
 class frontend;

src/frontends/lean/lean_scanner.cpp

@@ -7,9 +7,9 @@ Author: Leonardo de Moura
 #include <cstdio>
 #include <string>
 #include <algorithm>
-#include "lean_scanner.h"
-#include "debug.h"
-#include "exception.h"
+#include "util/debug.h"
+#include "util/exception.h"
+#include "frontends/lean/lean_scanner.h"
 
 namespace lean {
 

src/frontends/lean/lean_scanner.h

@@ -7,9 +7,9 @@ Author: Leonardo de Moura
 #pragma once
 #include <iostream>
 #include <vector>
-#include "mpq.h"
-#include "name.h"
-#include "list.h"
+#include "util/name.h"
+#include "util/list.h"
+#include "util/numerics/mpq.h"
 
 namespace lean {
 /**

src/interval/interval.cpp

@@ -4,9 +4,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "interval_def.h"
-#include "mpq.h"
-#include "double.h"
+#include "util/numerics/mpq.h"
+#include "util/numerics/double.h"
+#include "interval/interval_def.h"
 
 namespace lean {
 template class interval<mpq>;

src/interval/interval.h

@@ -6,8 +6,8 @@ Author: Leonardo de Moura
         Soonho Kong
 */
 #pragma once
-#include "numeric_traits.h"
-#include "xnumeral.h"
+#include "util/numerics/numeric_traits.h"
+#include "util/numerics/xnumeral.h"
 
 namespace lean {
 

src/interval/interval_def.h

@@ -9,9 +9,9 @@ Author: Leonardo de Moura
 #include <gmp.h>
 #include <mpfr.h>
 #include <utility>
-#include "interval.h"
-#include "trace.h"
-#include "mpz.h"
+#include "util/trace.h"
+#include "util/numerics/mpz.h"
+#include "interval/interval.h"
 
 namespace lean {
 

src/kernel/context.cpp

@@ -4,8 +4,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "context.h"
-#include "exception.h"
+#include "util/exception.h"
+#include "kernel/context.h"
 
 namespace lean {
 std::pair<context_entry const &, context> context::lookup_ext(unsigned i) const {

src/kernel/context.h

@@ -5,8 +5,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "expr.h"
-#include "list.h"
+#include "util/list.h"
+#include "kernel/expr.h"
 
 namespace lean {
 /**

src/kernel/environment.cpp

@@ -8,11 +8,11 @@ Author: Leonardo de Moura
 #include <vector>
 #include <atomic>
 #include <unordered_map>
-#include "kernel_exception.h"
-#include "environment.h"
-#include "safe_arith.h"
-#include "type_checker.h"
-#include "normalizer.h"
+#include "util/safe_arith.h"
+#include "kernel/kernel_exception.h"
+#include "kernel/environment.h"
+#include "kernel/type_checker.h"
+#include "kernel/normalizer.h"
 
 namespace lean {
 

src/kernel/expr.cpp

@@ -7,10 +7,10 @@ Author: Leonardo de Moura
 */
 #include <vector>
 #include <sstream>
-#include "expr.h"
-#include "free_vars.h"
-#include "expr_eq.h"
-#include "hash.h"
+#include "util/hash.h"
+#include "kernel/expr.h"
+#include "kernel/free_vars.h"
+#include "kernel/expr_eq.h"
 
 namespace lean {
 unsigned hash_args(unsigned size, expr const * args) {

src/kernel/expr.h

@@ -8,12 +8,12 @@ Author: Leonardo de Moura
 #include <iostream>
 #include <limits>
 #include <atomic>
-#include "rc.h"
-#include "name.h"
-#include "level.h"
-#include "hash.h"
-#include "buffer.h"
-#include "format.h"
+#include "util/rc.h"
+#include "util/name.h"
+#include "util/hash.h"
+#include "util/buffer.h"
+#include "util/sexpr/format.h"
+#include "kernel/level.h"
 
 namespace lean {
 class value;

src/kernel/expr_eq.h

@@ -5,8 +5,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "expr.h"
-#include "expr_sets.h"
+#include "kernel/expr.h"
+#include "kernel/expr_sets.h"
 
 namespace lean {
 /** \brief Identity function for expressions. */

src/kernel/expr_sets.h

@@ -6,8 +6,8 @@ Author: Leonardo de Moura
 */
 #pragma once
 #include <unordered_set>
-#include "expr.h"
-#include "hash.h"
+#include "util/hash.h"
+#include "kernel/expr.h"
 
 namespace lean {
 

src/kernel/instantiate.cpp

@@ -5,8 +5,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <algorithm>
-#include "free_vars.h"
-#include "replace.h"
+#include "kernel/free_vars.h"
+#include "kernel/replace.h"
 
 namespace lean {
 expr instantiate_with_closed(expr const & e, unsigned n, expr const * s) {

src/kernel/kernel_exception.h

@@ -5,9 +5,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "exception.h"
-#include "context.h"
-#include "environment.h"
+#include "util/exception.h"
+#include "kernel/context.h"
+#include "kernel/environment.h"
 
 namespace lean {
 class environment;

src/kernel/level.cpp

@@ -5,12 +5,12 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <algorithm>
-#include "safe_arith.h"
-#include "level.h"
-#include "buffer.h"
-#include "rc.h"
-#include "debug.h"
-#include "hash.h"
+#include "util/safe_arith.h"
+#include "util/buffer.h"
+#include "util/rc.h"
+#include "util/debug.h"
+#include "util/hash.h"
+#include "kernel/level.h"
 
 namespace lean {
 /** \brief Base class for representing universe level cells. */

src/kernel/level.h

@@ -6,9 +6,9 @@ Author: Leonardo de Moura
 */
 #pragma once
 #include <iostream>
-#include "name.h"
-#include "format.h"
-#include "options.h"
+#include "util/name.h"
+#include "util/sexpr/format.h"
+#include "util/sexpr/options.h"
 
 namespace lean {
 class environment;

src/kernel/normalizer.cpp

@@ -5,18 +5,18 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <algorithm>
-#include "normalizer.h"
-#include "expr.h"
-#include "context.h"
-#include "environment.h"
-#include "scoped_map.h"
-#include "builtin.h"
-#include "free_vars.h"
-#include "list.h"
-#include "flet.h"
-#include "buffer.h"
-#include "kernel_exception.h"
-#include "options.h"
+#include "util/scoped_map.h"
+#include "util/list.h"
+#include "util/flet.h"
+#include "util/buffer.h"
+#include "util/sexpr/options.h"
+#include "kernel/normalizer.h"
+#include "kernel/expr.h"
+#include "kernel/context.h"
+#include "kernel/environment.h"
+#include "kernel/builtin.h"
+#include "kernel/free_vars.h"
+#include "kernel/kernel_exception.h"
 
 #ifndef LEAN_KERNEL_NORMALIZER_MAX_DEPTH
 #define LEAN_KERNEL_NORMALIZER_MAX_DEPTH std::numeric_limits<unsigned>::max()

src/kernel/object.cpp

@@ -4,8 +4,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "object.h"
-#include "environment.h"
+#include "kernel/object.h"
+#include "kernel/environment.h"
 
 namespace lean {
 neutral_object_cell::neutral_object_cell():object_cell(object_kind::Neutral) {}

src/kernel/object.h

@@ -5,8 +5,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "expr.h"
-#include "rc.h"
+#include "util/rc.h"
+#include "kernel/expr.h"
 /*
   Kernel objects.
 

src/kernel/replace.h

@@ -5,9 +5,10 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "buffer.h"
-#include "expr.h"
-#include "expr_maps.h"
+#include "util/buffer.h"
+#include "kernel/expr.h"
+#include "kernel/expr_maps.h"
+
 namespace lean {
 /**
    \brief Default replace_fn postprocessor functional object. It is a

src/kernel/type_checker.cpp

@@ -4,14 +4,14 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "type_checker.h"
-#include "environment.h"
-#include "kernel_exception.h"
-#include "normalizer.h"
-#include "instantiate.h"
-#include "scoped_map.h"
-#include "builtin.h"
-#include "free_vars.h"
+#include "util/scoped_map.h"
+#include "kernel/type_checker.h"
+#include "kernel/environment.h"
+#include "kernel/kernel_exception.h"
+#include "kernel/normalizer.h"
+#include "kernel/instantiate.h"
+#include "kernel/builtin.h"
+#include "kernel/free_vars.h"
 
 namespace lean {
 /** \brief Auxiliary functional object used to implement infer_type. */

src/library/arith/arithlibs.cpp

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "arithlibs.h"
+#include "library/arith/arithlibs.h"
 
 namespace lean {
 void import_arithlibs(environment & env) {

src/library/arith/arithlibs.h

@@ -5,10 +5,10 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "natlib.h"
-#include "intlib.h"
-#include "reallib.h"
-#include "specialfnlib.h"
+#include "library/arith/natlib.h"
+#include "library/arith/intlib.h"
+#include "library/arith/reallib.h"
+#include "library/arith/specialfnlib.h"
 
 namespace lean {
 class environment;

src/library/arith/intlib.cpp

@@ -4,11 +4,11 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "intlib.h"
-#include "natlib.h"
-#include "numtype.h"
-#include "abstract.h"
-#include "environment.h"
+#include "kernel/abstract.h"
+#include "kernel/environment.h"
+#include "library/arith/intlib.h"
+#include "library/arith/natlib.h"
+#include "library/arith/numtype.h"
 
 namespace lean {
 class int_type_value : public num_type_value {

src/library/arith/intlib.h

@@ -5,9 +5,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "expr.h"
-#include "builtin.h"
-#include "mpz.h"
+#include "util/numerics/mpz.h"
+#include "kernel/expr.h"
+#include "kernel/builtin.h"
 
 namespace lean {
 /** \brief Integer numbers type */

src/library/arith/natlib.cpp

@@ -4,10 +4,10 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "natlib.h"
-#include "numtype.h"
-#include "abstract.h"
-#include "environment.h"
+#include "kernel/abstract.h"
+#include "kernel/environment.h"
+#include "library/arith/natlib.h"
+#include "library/arith/numtype.h"
 
 namespace lean {
 class nat_type_value : public num_type_value {

src/library/arith/natlib.h

@@ -5,9 +5,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "expr.h"
-#include "builtin.h"
-#include "mpz.h"
+#include "kernel/expr.h"
+#include "kernel/builtin.h"
+#include "util/numerics/mpz.h"
 
 namespace lean {
 /** \brief Natural numbers type */

src/library/arith/numtype.h

@@ -5,8 +5,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "expr.h"
-#include "value.h"
+#include "kernel/expr.h"
+#include "kernel/value.h"
 
 namespace lean {
 /** \brief Base class for numeric types */

src/library/arith/reallib.cpp

@@ -4,12 +4,12 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "reallib.h"
-#include "intlib.h"
-#include "natlib.h"
-#include "numtype.h"
-#include "abstract.h"
-#include "environment.h"
+#include "kernel/abstract.h"
+#include "kernel/environment.h"
+#include "library/arith/reallib.h"
+#include "library/arith/intlib.h"
+#include "library/arith/natlib.h"
+#include "library/arith/numtype.h"
 
 namespace lean {
 class real_type_value : public num_type_value {

src/library/arith/reallib.h

@@ -5,9 +5,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "expr.h"
-#include "builtin.h"
-#include "mpq.h"
+#include "util/numerics/mpq.h"
+#include "kernel/expr.h"
+#include "kernel/builtin.h"
 
 namespace lean {
 /** \brief Real numbers type */

src/library/arith/specialfnlib.cpp

@@ -4,10 +4,10 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "specialfnlib.h"
-#include "reallib.h"
-#include "abstract.h"
-#include "environment.h"
+#include "kernel/environment.h"
+#include "kernel/abstract.h"
+#include "library/arith/specialfnlib.h"
+#include "library/arith/reallib.h"
 
 namespace lean {
 MK_CONSTANT(exp_fn, name("exp"));

src/library/arith/specialfnlib.h

@@ -5,7 +5,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "expr.h"
+#include "kernel/expr.h"
 
 namespace lean {
 // Special functions library

src/library/basic_thms.cpp

@@ -4,10 +4,10 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "basic_thms.h"
-#include "environment.h"
-#include "abstract.h"
-#include "type_checker.h"
+#include "kernel/environment.h"
+#include "kernel/abstract.h"
+#include "kernel/type_checker.h"
+#include "library/basic_thms.h"
 
 namespace lean {
 

src/library/basic_thms.h

@@ -5,7 +5,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "builtin.h"
+#include "kernel/builtin.h"
 
 namespace lean {
 expr mk_trivial();

src/library/cast/castlib.cpp

@@ -4,11 +4,11 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "castlib.h"
-#include "environment.h"
-#include "abstract.h"
-#include "basic_thms.h"
-#include "builtin.h"
+#include "kernel/environment.h"
+#include "kernel/abstract.h"
+#include "kernel/builtin.h"
+#include "library/basic_thms.h"
+#include "library/cast/castlib.h"
 
 namespace lean {
 // Cast builtin operator

src/library/cast/castlib.h

@@ -5,7 +5,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "expr.h"
+#include "kernel/expr.h"
 
 namespace lean {
 /** \brief Type Cast. It has type <tt>Pi (A : Type u) (B : Type u) (H : A = B) (a : A), B</tt> */

src/library/context_to_lambda.cpp

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "context_to_lambda.h"
+#include "library/context_to_lambda.h"
 
 namespace lean {
 static expr g_fake = Const(name(name(0u), "context_to_lambda"));

src/library/context_to_lambda.h

@@ -5,7 +5,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "context.h"
+#include "kernel/context.h"
 namespace lean {
 /**
    \brief Given the context (n_1 : T_1 [:= V_1]) ... (n_k : T_k [:= V_k]) and expression e into,

src/library/deep_copy.cpp

@@ -4,9 +4,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "expr.h"
-#include "expr_maps.h"
-#include "buffer.h"
+#include "util/buffer.h"
+#include "kernel/expr.h"
+#include "kernel/expr_maps.h"
 
 namespace lean {
 /** \brief Implements deep copy of kernel expressions. */

src/library/deep_copy.h

@@ -5,7 +5,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "expr.h"
+#include "kernel/expr.h"
 
 namespace lean {
 /**

src/library/expr_pair.h

@@ -5,8 +5,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "expr.h"
-#include "hash.h"
+#include "util/hash.h"
+#include "kernel/expr.h"
 
 namespace lean {
 typedef std::pair<expr, expr> expr_pair;

src/library/formatter.cpp

@@ -5,9 +5,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <sstream>
-#include "formatter.h"
-#include "printer.h"
-#include "kernel_exception.h"
+#include "kernel/kernel_exception.h"
+#include "library/printer.h"
+#include "library/formatter.h"
 
 namespace lean {
 class simple_formatter_cell : public formatter_cell {

src/library/formatter.h

@@ -6,8 +6,8 @@ Author: Leonardo de Moura
 */
 #pragma once
 #include <memory>
-#include "context.h"
-#include "options.h"
+#include "util/sexpr/options.h"
+#include "kernel/context.h"
 
 namespace lean {
 class environment;

src/library/import_all/import_all.cpp

@@ -4,11 +4,11 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "import_all.h"
-#include "builtin.h"
-#include "basic_thms.h"
-#include "arithlibs.h"
-#include "castlib.h"
+#include "kernel/builtin.h"
+#include "library/basic_thms.h"
+#include "library/arith/arithlibs.h"
+#include "library/cast/castlib.h"
+#include "library/import_all/import_all.h"
 
 namespace lean {
 void import_all(environment & env) {

src/library/import_all/import_all.h

@@ -5,7 +5,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "environment.h"
+#include "kernel/environment.h"
 
 namespace lean {
 /** \brief Import all builtin libraries and theorems */

src/library/kernel_exception_formatter.cpp

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "kernel_exception_formatter.h"
+#include "library/kernel_exception_formatter.h"
 
 namespace lean {
 /*

src/library/kernel_exception_formatter.h

@@ -5,9 +5,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "kernel_exception.h"
-#include "formatter.h"
-#include "state.h"
+#include "kernel/kernel_exception.h"
+#include "library/formatter.h"
+#include "library/state.h"
 
 namespace lean {
 /** \brief Pretty print an arbitrary kernel exception using the given formatter */

src/library/light_checker.cpp

@@ -4,15 +4,15 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "light_checker.h"
-#include "environment.h"
-#include "reduce.h"
-#include "scoped_map.h"
-#include "normalizer.h"
-#include "builtin.h"
-#include "kernel_exception.h"
-#include "instantiate.h"
-#include "free_vars.h"
+#include "util/scoped_map.h"
+#include "kernel/environment.h"
+#include "kernel/normalizer.h"
+#include "kernel/builtin.h"
+#include "kernel/kernel_exception.h"
+#include "kernel/instantiate.h"
+#include "kernel/free_vars.h"
+#include "library/reduce.h"
+#include "library/light_checker.h"
 
 namespace lean {
 class light_checker::imp {

src/library/light_checker.h

@@ -6,8 +6,8 @@ Author: Leonardo de Moura
 */
 #pragma once
 #include <memory>
-#include "expr.h"
-#include "context.h"
+#include "kernel/expr.h"
+#include "kernel/context.h"
 
 namespace lean {
 class environment;

src/library/max_sharing.cpp

@@ -5,8 +5,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <unordered_set>
-#include "buffer.h"
-#include "max_sharing.h"
+#include "util/buffer.h"
+#include "library/max_sharing.h"
 
 namespace lean {
 /**

src/library/max_sharing.h

@@ -6,7 +6,7 @@ Author: Leonardo de Moura
 */
 #pragma once
 #include <memory>
-#include "expr.h"
+#include "kernel/expr.h"
 
 namespace lean {
 /**

src/library/metavar.cpp

@@ -4,13 +4,13 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "metavar.h"
-#include "replace.h"
-#include "for_each.h"
-#include "environment.h"
-#include "occurs.h"
-#include "update_expr.h"
-#include "printer.h"
+#include "kernel/replace.h"
+#include "kernel/for_each.h"
+#include "kernel/environment.h"
+#include "kernel/occurs.h"
+#include "library/update_expr.h"
+#include "library/printer.h"
+#include "library/metavar.h"
 
 namespace lean {
 static name g_placeholder_name("_");

src/library/metavar.h

@@ -5,9 +5,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "expr.h"
-#include "environment.h"
-#include "name_set.h"
+#include "util/name_set.h"
+#include "kernel/expr.h"
+#include "kernel/environment.h"
 
 namespace lean {
 /**

src/library/printer.cpp

@@ -5,10 +5,10 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <algorithm>
-#include "printer.h"
-#include "metavar.h"
-#include "environment.h"
-#include "exception.h"
+#include "util/exception.h"
+#include "library/printer.h"
+#include "library/metavar.h"
+#include "kernel/environment.h"
 
 namespace lean {
 bool is_atomic(expr const & e) {

src/library/printer.h

@@ -6,8 +6,8 @@ Author: Leonardo de Moura
 */
 #pragma once
 #include <iostream>
-#include "expr.h"
-#include "context.h"
+#include "kernel/expr.h"
+#include "kernel/context.h"
 
 namespace lean {
 std::ostream & operator<<(std::ostream & out, context const & ctx);

src/library/reduce.cpp

@@ -4,12 +4,12 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "context.h"
-#include "instantiate.h"
-#include "environment.h"
-#include "name_set.h"
-#include "update_expr.h"
-#include "free_vars.h"
+#include "util/name_set.h"
+#include "kernel/context.h"
+#include "kernel/instantiate.h"
+#include "kernel/environment.h"
+#include "kernel/free_vars.h"
+#include "library/update_expr.h"
 
 namespace lean {
 bool is_head_beta(expr const & t) {

src/library/reduce.h

@@ -5,9 +5,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "context.h"
-#include "environment.h"
-#include "name_set.h"
+#include "util/name_set.h"
+#include "kernel/context.h"
+#include "kernel/environment.h"
 
 namespace lean {
 bool is_head_beta(expr const & t);

src/library/state.cpp

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "state.h"
+#include "library/state.h"
 
 namespace lean {
 state::state():

src/library/state.h

@@ -5,9 +5,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "output_channel.h"
-#include "formatter.h"
-#include "options.h"
+#include "util/output_channel.h"
+#include "util/sexpr/options.h"
+#include "library/formatter.h"
 
 namespace lean {
 /**

src/library/update_expr.cpp

@@ -4,8 +4,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "update_expr.h"
-#include "buffer.h"
+#include "util/buffer.h"
+#include "library/update_expr.h"
 
 namespace lean {
 expr update_app(expr const & app, unsigned i, expr const & new_arg) {

src/library/update_expr.h

@@ -5,7 +5,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
-#include "expr.h"
+#include "kernel/expr.h"
 
 namespace lean {
 /**

src/shell/lean.cpp

@@ -1,10 +1,16 @@
+/*
+Copyright (c) 2013 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+
+Author: Leonardo de Moura
+*/
 #include <iostream>
 #include <fstream>
 #include <signal.h>
+#include "util/interruptable_ptr.h"
+#include "library/printer.h"
+#include "frontends/lean/lean_parser.h"
 #include "version.h"
-#include "printer.h"
-#include "interruptable_ptr.h"
-#include "lean_parser.h"
 using namespace lean;
 
 static interruptable_ptr<shell> g_lean_shell;

src/tests/frontends/lean/implicit_args.cpp

@@ -4,19 +4,19 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "test.h"
-#include "metavar.h"
-#include "free_vars.h"
-#include "printer.h"
-#include "occurs.h"
-#include "abstract.h"
-#include "import_all.h"
-#include "basic_thms.h"
-#include "type_checker.h"
-#include "kernel_exception.h"
-#include "lean_frontend.h"
-#include "lean_elaborator.h"
-#include "lean_elaborator_exception.h"
+#include "util/test.h"
+#include "kernel/type_checker.h"
+#include "kernel/kernel_exception.h"
+#include "kernel/occurs.h"
+#include "kernel/abstract.h"
+#include "kernel/free_vars.h"
+#include "library/metavar.h"
+#include "library/printer.h"
+#include "library/basic_thms.h"
+#include "library/import_all/import_all.h"
+#include "frontends/lean/lean_frontend.h"
+#include "frontends/lean/lean_elaborator.h"
+#include "frontends/lean/lean_elaborator_exception.h"
 using namespace lean;
 
 expr elaborate(expr const & e, frontend const & env) {

src/tests/frontends/lean/lean_frontend.cpp

@@ -4,15 +4,15 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "test.h"
-#include "environment.h"
-#include "kernel_exception.h"
-#include "builtin.h"
-#include "printer.h"
-#include "abstract.h"
-#include "lean_frontend.h"
-#include "lean_operator_info.h"
-#include "lean_pp.h"
+#include "util/test.h"
+#include "kernel/environment.h"
+#include "kernel/kernel_exception.h"
+#include "kernel/builtin.h"
+#include "kernel/abstract.h"
+#include "library/printer.h"
+#include "frontends/lean/lean_frontend.h"
+#include "frontends/lean/lean_operator_info.h"
+#include "frontends/lean/lean_pp.h"
 using namespace lean;
 
 static void tst1() {

src/tests/frontends/lean/lean_parser.cpp

@@ -5,12 +5,12 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <sstream>
-#include "builtin.h"
-#include "lean_parser.h"
-#include "lean_pp.h"
-#include "printer.h"
-#include "exception.h"
-#include "test.h"
+#include "util/test.h"
+#include "util/exception.h"
+#include "kernel/builtin.h"
+#include "library/printer.h"
+#include "frontends/lean/lean_parser.h"
+#include "frontends/lean/lean_pp.h"
 using namespace lean;
 
 static void parse(frontend & fe, char const * str) {

src/tests/frontends/lean/lean_pp.cpp

@@ -4,12 +4,12 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "printer.h"
-#include "abstract.h"
-#include "builtin.h"
-#include "lean_frontend.h"
-#include "lean_pp.h"
-#include "test.h"
+#include "util/test.h"
+#include "kernel/abstract.h"
+#include "kernel/builtin.h"
+#include "library/printer.h"
+#include "frontends/lean/lean_frontend.h"
+#include "frontends/lean/lean_pp.h"
 using namespace lean;
 
 static expr mk_shared_expr(unsigned depth) {

src/tests/frontends/lean/lean_scanner.cpp

@@ -5,10 +5,10 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <sstream>
-#include "test.h"
-#include "lean_scanner.h"
-#include "exception.h"
-#include "escaped.h"
+#include "util/test.h"
+#include "util/exception.h"
+#include "util/escaped.h"
+#include "frontends/lean/lean_scanner.h"
 using namespace lean;
 
 #define st scanner::token

src/tests/interval/double_interval.cpp

@@ -4,11 +4,11 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Soonho Kong
 */
-#include "test.h"
-#include "trace.h"
-#include "double.h"
-#include "interval_def.h"
-#include "check.h"
+#include "util/test.h"
+#include "util/trace.h"
+#include "util/numerics/double.h"
+#include "interval/interval_def.h"
+#include "tests/interval/check.h"
 
 using namespace lean;
 

src/tests/interval/float_interval.cpp

@@ -4,11 +4,11 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Soonho Kong
 */
-#include "test.h"
-#include "trace.h"
-#include "float.h"
-#include "interval_def.h"
-#include "check.h"
+#include "util/test.h"
+#include "util/trace.h"
+#include "util/numerics/float.h"
+#include "interval/interval_def.h"
+#include "tests/interval/check.h"
 
 using namespace lean;
 

src/tests/interval/interval.cpp

@@ -5,12 +5,12 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <vector>
-#include "test.h"
-#include "trace.h"
-#include "double.h"
-#include "mpq.h"
-#include "mpfp.h"
-#include "interval_def.h"
+#include "util/test.h"
+#include "util/trace.h"
+#include "util/numerics/double.h"
+#include "util/numerics/mpq.h"
+#include "util/numerics/mpfp.h"
+#include "interval/interval_def.h"
 
 using namespace lean;
 

src/tests/interval/mpfp_interval.cpp

@@ -4,11 +4,11 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Soonho Kong
 */
-#include "test.h"
-#include "trace.h"
-#include "mpfp.h"
-#include "interval_def.h"
-#include "check.h"
+#include "util/test.h"
+#include "util/trace.h"
+#include "util/numerics/mpfp.h"
+#include "interval/interval_def.h"
+#include "tests/interval/check.h"
 
 using namespace lean;
 

src/tests/kernel/arith.cpp

@@ -5,15 +5,15 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <thread>
-#include "environment.h"
-#include "type_checker.h"
-#include "builtin.h"
-#include "arithlibs.h"
-#include "normalizer.h"
-#include "import_all.h"
-#include "abstract.h"
-#include "printer.h"
-#include "test.h"
+#include "util/test.h"
+#include "kernel/environment.h"
+#include "kernel/type_checker.h"
+#include "kernel/builtin.h"
+#include "kernel/normalizer.h"
+#include "kernel/abstract.h"
+#include "library/printer.h"
+#include "library/arith/arithlibs.h"
+#include "library/import_all/import_all.h"
 using namespace lean;
 
 static void tst1() {

src/tests/kernel/environment.cpp

@@ -4,18 +4,18 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "kernel_exception.h"
-#include "environment.h"
-#include "type_checker.h"
-#include "printer.h"
-#include "import_all.h"
-#include "builtin.h"
-#include "arithlibs.h"
-#include "normalizer.h"
-#include "abstract.h"
-#include "exception.h"
-#include "trace.h"
-#include "test.h"
+#include "util/test.h"
+#include "util/exception.h"
+#include "util/trace.h"
+#include "kernel/kernel_exception.h"
+#include "kernel/environment.h"
+#include "kernel/type_checker.h"
+#include "kernel/builtin.h"
+#include "kernel/normalizer.h"
+#include "kernel/abstract.h"
+#include "library/printer.h"
+#include "library/arith/arithlibs.h"
+#include "library/import_all/import_all.h"
 using namespace lean;
 
 static void tst1() {

src/tests/kernel/expr.cpp

@@ -6,16 +6,16 @@ Author: Leonardo de Moura
         Soonho Kong
 */
 #include <algorithm>
-#include "expr.h"
-#include "expr_sets.h"
-#include "max_sharing.h"
-#include "free_vars.h"
-#include "test.h"
-#include "abstract.h"
-#include "instantiate.h"
-#include "printer.h"
-#include "deep_copy.h"
-#include "arithlibs.h"
+#include "util/test.h"
+#include "kernel/expr.h"
+#include "kernel/expr_sets.h"
+#include "kernel/free_vars.h"
+#include "kernel/abstract.h"
+#include "kernel/instantiate.h"
+#include "library/max_sharing.h"
+#include "library/deep_copy.h"
+#include "library/printer.h"
+#include "library/arith/arithlibs.h"
 using namespace lean;
 
 void tst1() {

src/tests/kernel/free_vars.cpp

@@ -4,9 +4,9 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "free_vars.h"
-#include "abstract.h"
-#include "test.h"
+#include "util/test.h"
+#include "kernel/free_vars.h"
+#include "kernel/abstract.h"
 using namespace lean;
 
 static void tst1() {

src/tests/kernel/level.cpp

@@ -5,10 +5,10 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <locale>
-#include "environment.h"
-#include "exception.h"
-#include "printer.h"
-#include "test.h"
+#include "util/test.h"
+#include "util/exception.h"
+#include "kernel/environment.h"
+#include "library/printer.h"
 using namespace lean;
 
 static void tst0() {

src/tests/kernel/normalizer.cpp

@@ -7,16 +7,16 @@ Author: Leonardo de Moura
 #include <algorithm>
 #include <thread>
 #include <chrono>
-#include "exception.h"
-#include "normalizer.h"
-#include "builtin.h"
-#include "trace.h"
-#include "test.h"
-#include "expr_sets.h"
-#include "abstract.h"
-#include "kernel_exception.h"
-#include "import_all.h"
-#include "printer.h"
+#include "util/test.h"
+#include "util/trace.h"
+#include "util/exception.h"
+#include "kernel/normalizer.h"
+#include "kernel/builtin.h"
+#include "kernel/expr_sets.h"
+#include "kernel/abstract.h"
+#include "kernel/kernel_exception.h"
+#include "library/printer.h"
+#include "library/import_all/import_all.h"
 using namespace lean;
 
 expr normalize(expr const & e) {

src/tests/kernel/occurs.cpp

@@ -4,10 +4,10 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "test.h"
-#include "occurs.h"
-#include "abstract.h"
-#include "printer.h"
+#include "util/test.h"
+#include "kernel/occurs.h"
+#include "kernel/abstract.h"
+#include "library/printer.h"
 using namespace lean;
 
 static void tst1() {

src/tests/kernel/replace.cpp

@@ -4,15 +4,15 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "expr.h"
-#include "abstract.h"
-#include "instantiate.h"
-#include "deep_copy.h"
-#include "expr_maps.h"
-#include "replace.h"
-#include "printer.h"
-#include "name.h"
-#include "test.h"
+#include "util/test.h"
+#include "util/name.h"
+#include "kernel/expr.h"
+#include "kernel/abstract.h"
+#include "kernel/instantiate.h"
+#include "kernel/expr_maps.h"
+#include "kernel/replace.h"
+#include "library/deep_copy.h"
+#include "library/printer.h"
 using namespace lean;
 
 expr mk_big(expr f, unsigned depth, unsigned val) {

src/tests/kernel/threads.cpp

@@ -7,15 +7,15 @@ Author: Leonardo de Moura
 #include <thread>
 #include <mutex>
 #include <vector>
-#include "expr.h"
-#include "max_sharing.h"
-#include "free_vars.h"
-#include "deep_copy.h"
-#include "abstract.h"
-#include "normalizer.h"
-#include "import_all.h"
-#include "arithlibs.h"
-#include "test.h"
+#include "util/test.h"
+#include "kernel/expr.h"
+#include "kernel/free_vars.h"
+#include "kernel/abstract.h"
+#include "kernel/normalizer.h"
+#include "library/max_sharing.h"
+#include "library/deep_copy.h"
+#include "library/import_all/import_all.h"
+#include "library/arith/arithlibs.h"
 using namespace lean;
 
 expr norm(expr const & e, environment & env) {

src/tests/kernel/type_checker.cpp

@@ -7,18 +7,18 @@ Author: Leonardo de Moura
 #include <iostream>
 #include <thread>
 #include <chrono>
-#include "type_checker.h"
-#include "environment.h"
-#include "abstract.h"
-#include "exception.h"
-#include "import_all.h"
-#include "basic_thms.h"
-#include "builtin.h"
-#include "arithlibs.h"
-#include "normalizer.h"
-#include "printer.h"
-#include "trace.h"
-#include "test.h"
+#include "util/test.h"
+#include "util/trace.h"
+#include "util/exception.h"
+#include "kernel/type_checker.h"
+#include "kernel/environment.h"
+#include "kernel/abstract.h"
+#include "kernel/builtin.h"
+#include "kernel/normalizer.h"
+#include "library/printer.h"
+#include "library/import_all/import_all.h"
+#include "library/basic_thms.h"
+#include "library/arith/arithlibs.h"
 using namespace lean;
 
 expr c(char const * n) { return mk_constant(n); }

src/tests/library/light_checker.cpp

@@ -4,15 +4,15 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "test.h"
-#include "light_checker.h"
-#include "type_checker.h"
-#include "environment.h"
-#include "arithlibs.h"
-#include "import_all.h"
-#include "abstract.h"
-#include "printer.h"
-#include "timeit.h"
+#include "util/test.h"
+#include "util/timeit.h"
+#include "kernel/type_checker.h"
+#include "kernel/environment.h"
+#include "kernel/abstract.h"
+#include "library/arith/arithlibs.h"
+#include "library/import_all/import_all.h"
+#include "library/light_checker.h"
+#include "library/printer.h"
 using namespace lean;
 
 static void tst1() {

src/tests/library/metavar.cpp

@@ -4,10 +4,10 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Author: Leonardo de Moura
 */
-#include "test.h"
-#include "metavar.h"
-#include "abstract.h"
-#include "printer.h"
+#include "util/test.h"
+#include "kernel/abstract.h"
+#include "library/metavar.h"
+#include "library/printer.h"
 using namespace lean;
 
 static void tst1() {

src/tests/util/buffer.cpp

@@ -5,8 +5,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include <vector>
-#include "buffer.h"
-#include "test.h"
+#include "util/buffer.h"
+#include "util/test.h"
 using namespace lean;
 
 template<typename C>

src/tests/util/format.cpp

@@ -7,11 +7,11 @@ Author: Soonho Kong
 #include <vector>
 #include <algorithm>
 #include <sstream>
-#include "format.h"
-#include "test.h"
-#include "sexpr_fn.h"
-#include "options.h"
-#include "mpq.h"
+#include "util/test.h"
+#include "util/numerics/mpq.h"
+#include "util/sexpr/format.h"
+#include "util/sexpr/sexpr_fn.h"
+#include "util/sexpr/options.h"
 using namespace lean;
 
 using std::cout;