From b053d98fb17d2f46878f49d7adf4839ae632c10b Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Tue, 15 May 2018 21:51:21 +0200
Subject: Remove vm_conv hook and reorganize kernel files

---
 kernel/kernel.mllib | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kernel/kernel.mllib')

diff --git a/kernel/kernel.mllib b/kernel/kernel.mllib
index 5d270125a4..3fed3ed29c 100644
--- a/kernel/kernel.mllib
+++ b/kernel/kernel.mllib
@@ -29,8 +29,11 @@ Cbytegen
 Nativecode
 Nativelib
 Environ
+Csymtable
+Vm
 CClosure
 Reduction
+Vconv
 Nativeconv
 Type_errors
 Modops
@@ -43,6 +46,3 @@ Subtyping
 Mod_typing
 Nativelibrary
 Safe_typing
-Csymtable
-Vm
-Vconv
-- 
cgit v1.2.3


From 4552729b88058946055dddde1533057e25bfc5a9 Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Wed, 16 May 2018 00:06:51 +0200
Subject: Unify pre_env and env

We now have only two notions of environments in the kernel: env and
safe_env.
---
 kernel/kernel.mllib | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'kernel/kernel.mllib')

diff --git a/kernel/kernel.mllib b/kernel/kernel.mllib
index 3fed3ed29c..50713b9579 100644
--- a/kernel/kernel.mllib
+++ b/kernel/kernel.mllib
@@ -22,17 +22,16 @@ CPrimitives
 Declareops
 Retroknowledge
 Conv_oracle
-Pre_env
+Environ
+CClosure
+Reduction
 Clambda
 Nativelambda
 Cbytegen
 Nativecode
 Nativelib
-Environ
 Csymtable
 Vm
-CClosure
-Reduction
 Vconv
 Nativeconv
 Type_errors
-- 
cgit v1.2.3