From e445515f2bc1e4e69e9bb80ff90a008e2c83e409 Mon Sep 17 00:00:00 2001
From: Leonardo de Moura <leonardo@microsoft.com>
Date: Sat, 5 Jul 2014 10:31:27 -0700
Subject: [PATCH] refactor(kernel): move standard and hott kernel
 instantiations to library

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
---
 src/CMakeLists.txt                                            | 4 ----
 src/kernel/hott/CMakeLists.txt                                | 2 --
 src/kernel/standard/CMakeLists.txt                            | 2 --
 src/library/CMakeLists.txt                                    | 1 +
 src/{kernel/hott/hott.cpp => library/hott_kernel.cpp}         | 0
 src/{kernel/hott/hott.h => library/hott_kernel.h}             | 0
 src/library/kernel_bindings.cpp                               | 4 ++--
 .../standard/standard.cpp => library/standard_kernel.cpp}     | 0
 src/{kernel/standard/standard.h => library/standard_kernel.h} | 0
 src/shell/lean.cpp                                            | 4 ++--
 10 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 src/kernel/hott/CMakeLists.txt
 delete mode 100644 src/kernel/standard/CMakeLists.txt
 rename src/{kernel/hott/hott.cpp => library/hott_kernel.cpp} (100%)
 rename src/{kernel/hott/hott.h => library/hott_kernel.h} (100%)
 rename src/{kernel/standard/standard.cpp => library/standard_kernel.cpp} (100%)
 rename src/{kernel/standard/standard.h => library/standard_kernel.h} (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 590ebf53f6..38d21b1e2b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -226,10 +226,6 @@ add_subdirectory(kernel)
 set(LEAN_LIBS ${LEAN_LIBS} kernel)
 add_subdirectory(kernel/inductive)
 set(LEAN_LIBS ${LEAN_LIBS} inductive)
-add_subdirectory(kernel/standard)
-set(LEAN_LIBS ${LEAN_LIBS} standard_kernel)
-add_subdirectory(kernel/hott)
-set(LEAN_LIBS ${LEAN_LIBS} hott_kernel)
 add_subdirectory(library)
 set(LEAN_LIBS ${LEAN_LIBS} library)
 # add_subdirectory(library/rewriter)
diff --git a/src/kernel/hott/CMakeLists.txt b/src/kernel/hott/CMakeLists.txt
deleted file mode 100644
index 2e236d7ffa..0000000000
--- a/src/kernel/hott/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_library(hott_kernel hott.cpp)
-target_link_libraries(hott_kernel ${LEAN_LIBS})
diff --git a/src/kernel/standard/CMakeLists.txt b/src/kernel/standard/CMakeLists.txt
deleted file mode 100644
index 84721718f4..0000000000
--- a/src/kernel/standard/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_library(standard_kernel standard.cpp)
-target_link_libraries(standard_kernel ${LEAN_LIBS})
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index e29744cca6..5b03820a25 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -4,6 +4,7 @@ add_library(library deep_copy.cpp expr_lt.cpp io_state.cpp occurs.cpp
   normalize.cpp shared_environment.cpp module.cpp coercion.cpp
   private.cpp placeholder.cpp aliases.cpp level_names.cpp
   update_declaration.cpp choice.cpp scoped_ext.cpp locals.cpp
+  standard_kernel.cpp hott_kernel.cpp
   unifier.cpp unifier_plugin.cpp
   explicit.cpp num.cpp string.cpp)
 # hop_match.cpp)
diff --git a/src/kernel/hott/hott.cpp b/src/library/hott_kernel.cpp
similarity index 100%
rename from src/kernel/hott/hott.cpp
rename to src/library/hott_kernel.cpp
diff --git a/src/kernel/hott/hott.h b/src/library/hott_kernel.h
similarity index 100%
rename from src/kernel/hott/hott.h
rename to src/library/hott_kernel.h
diff --git a/src/library/kernel_bindings.cpp b/src/library/kernel_bindings.cpp
index 16a514871c..b1b0194b87 100644
--- a/src/library/kernel_bindings.cpp
+++ b/src/library/kernel_bindings.cpp
@@ -22,8 +22,8 @@ Author: Leonardo de Moura
 #include "kernel/type_checker.h"
 #include "kernel/replace_fn.h"
 #include "kernel/inductive/inductive.h"
-#include "kernel/standard/standard.h"
-#include "kernel/hott/hott.h"
+#include "library/standard_kernel.h"
+#include "library/hott_kernel.h"
 #include "library/occurs.h"
 #include "library/io_state_stream.h"
 #include "library/expr_lt.h"
diff --git a/src/kernel/standard/standard.cpp b/src/library/standard_kernel.cpp
similarity index 100%
rename from src/kernel/standard/standard.cpp
rename to src/library/standard_kernel.cpp
diff --git a/src/kernel/standard/standard.h b/src/library/standard_kernel.h
similarity index 100%
rename from src/kernel/standard/standard.h
rename to src/library/standard_kernel.h
diff --git a/src/shell/lean.cpp b/src/shell/lean.cpp
index 55c6eb8b85..e90ca6ad4f 100644
--- a/src/shell/lean.cpp
+++ b/src/shell/lean.cpp
@@ -20,8 +20,8 @@ Author: Leonardo de Moura
 #include "kernel/environment.h"
 #include "kernel/kernel_exception.h"
 #include "kernel/formatter.h"
-#include "kernel/standard/standard.h"
-#include "kernel/hott/hott.h"
+#include "library/standard_kernel.h"
+#include "library/hott_kernel.h"
 #include "library/module.h"
 #include "library/io_state_stream.h"
 #include "library/error_handling/error_handling.h"