Rename/Reorg some kernel files

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

src/kernel/expr.cpp

@@ -6,7 +6,7 @@ Author: Leonardo de Moura
 */
 #include <vector>
 #include "expr.h"
-#include "expr_set.h"
+#include "sets.h"
 #include "hash.h"
 
 namespace lean {

src/kernel/expr.h

@@ -309,8 +309,17 @@ inline mpz const &  get_numeral(expr const & e)              { return to_numeral
 inline bool operator!=(expr const & a, expr const & b) { return !operator==(a, b); }
 // =======================================
 
-std::ostream & operator<<(std::ostream & out, expr const & a);
+// =======================================
+// Auxiliary functors
+struct expr_hash { unsigned operator()(expr const & e) const { return e.hash(); } };
+struct expr_eqp { bool operator()(expr const & e1, expr const & e2) const { return eqp(e1, e2); } };
+struct expr_cell_hash { unsigned operator()(expr_cell * e) const { return e->hash(); } };
+struct expr_cell_eqp { bool operator()(expr_cell * e1, expr_cell * e2) const { return e1 == e2; } };
+// =======================================
 
+// =======================================
+// Miscellaneous
+std::ostream & operator<<(std::ostream & out, expr const & a);
 /**
    \brief Wrapper for iterating over application arguments.
    If n is an application, it allows us to write
@@ -324,5 +333,6 @@ struct app_args {
     expr const * begin() const { return &get_arg(m_app, 0); }
     expr const * end() const { return begin() + get_num_args(m_app); }
 };
+// =======================================
 
 }

src/kernel/expr_functors.h

@@ -1,26 +0,0 @@
-/*
-Copyright (c) 2013 Microsoft Corporation. All rights reserved.
-Released under Apache 2.0 license as described in the file LICENSE.
-
-Author: Leonardo de Moura
-*/
-#pragma once
-#include "expr.h"
-
-namespace lean {
-
-struct expr_hash {
-    unsigned operator()(expr const & e) const { return e.hash(); }
-};
-struct expr_eqp {
-    bool operator()(expr const & e1, expr const & e2) const { return eqp(e1, e2); }
-};
-
-struct expr_cell_hash {
-    unsigned operator()(expr_cell * e) const { return e->hash(); }
-};
-struct expr_cell_eqp {
-    bool operator()(expr_cell * e1, expr_cell * e2) const { return e1 == e2; }
-};
-
-}

src/kernel/maps.h

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

src/kernel/max_sharing.cpp

@@ -7,7 +7,6 @@ Author: Leonardo de Moura
 #include <unordered_set>
 #include <vector>
 #include "expr.h"
-#include "expr_functors.h"
 
 namespace lean {
 

src/kernel/sets.h

@@ -7,7 +7,6 @@ Author: Leonardo de Moura
 #pragma once
 #include <unordered_set>
 #include "expr.h"
-#include "expr_functors.h"
 #include "hash.h"
 
 namespace lean {

src/tests/kernel/expr.cpp

@@ -5,7 +5,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #include "expr.h"
-#include "expr_set.h"
+#include "sets.h"
 #include "max_sharing.h"
 #include "test.h"
 #include <algorithm>