Merge PR #9129: [proof] Removal of imperative state ; interpretation layers only.

Ack-by: SkySkimmer
Reviewed-by: aspiwack
Ack-by: ejgallego
Ack-by: gares
Ack-by: herbelin
Reviewed-by: mattam82
Ack-by: maximedenes

2 files changed, 37 insertions, 5 deletions

diff --git a/dev/ci/user-overlays/09129-ejgallego-proof+no_global_partial.sh b/dev/ci/user-overlays/09129-ejgallego-proof+no_global_partial.sh
new file mode 100644
index 0000000000..c09d1b8929
--- /dev/null
+++ b/dev/ci/user-overlays/09129-ejgallego-proof+no_global_partial.sh
@@ -0,0 +1,30 @@
+if [ "$CI_PULL_REQUEST" = "9129" ] || [ "$CI_BRANCH" = "proof+no_global_partial" ]; then
+
+    aac_tactics_CI_REF=proof+no_global_partial
+    aac_tactics_CI_GITURL=https://github.com/ejgallego/aac-tactics
+
+    # coqhammer_CI_REF=proof+no_global_partial
+    # coqhammer_CI_GITURL=https://github.com/ejgallego/coqhammer
+
+    elpi_CI_REF=proof+no_global_partial
+    elpi_CI_GITURL=https://github.com/ejgallego/coq-elpi
+
+    equations_CI_REF=proof+no_global_partial
+    equations_CI_GITURL=https://github.com/ejgallego/Coq-Equations
+
+    ltac2_CI_REF=proof+no_global_partial
+    ltac2_CI_GITURL=https://github.com/ejgallego/ltac2
+
+    # unicoq_CI_REF=proof+no_global_partial
+    # unicoq_CI_GITURL=https://github.com/ejgallego/unicoq
+
+    mtac2_CI_REF=proof+no_global_partial
+    mtac2_CI_GITURL=https://github.com/ejgallego/Mtac2
+
+    paramcoq_CI_REF=proof+no_global_partial
+    paramcoq_CI_GITURL=https://github.com/ejgallego/paramcoq
+
+    quickchick_CI_REF=proof+no_global_partial
+    quickchick_CI_GITURL=https://github.com/ejgallego/QuickChick
+
+fi
diff --git a/dev/top_printers.ml b/dev/top_printers.ml
index 499bbba37e..1f4f2246be 100644
--- a/dev/top_printers.ml
+++ b/dev/top_printers.ml
@@ -60,19 +60,21 @@ let prrecarg = function
      str "Imbr[" ++ MutInd.print mind ++ pr_comma () ++ int i ++ str "]"
 let ppwf_paths x = pp (Rtree.pp_tree prrecarg x)
 
+let get_current_context = Vernacstate.Proof_global.get_current_context
+
 (* term printers *)
-let envpp pp = let sigma,env = Pfedit.get_current_context () in pp env sigma
+let envpp pp = let sigma,env = get_current_context () in pp env sigma
 let rawdebug = ref false
 let ppevar evk = pp (Evar.print evk)
 let pr_constr t =
-  let sigma, env = Pfedit.get_current_context () in
+  let sigma, env = get_current_context () in
   Printer.pr_constr_env env sigma t
 let pr_econstr t =
-  let sigma, env = Pfedit.get_current_context () in
+  let sigma, env = get_current_context () in
   Printer.pr_econstr_env env sigma t
 let ppconstr x = pp (pr_constr x)
 let ppeconstr x = pp (pr_econstr x)
-let ppconstr_expr x = let sigma,env = Pfedit.get_current_context () in pp (Ppconstr.pr_constr_expr env sigma x)
+let ppconstr_expr x = let sigma,env = get_current_context () in pp (Ppconstr.pr_constr_expr env sigma x)
 let ppsconstr x = ppconstr (Mod_subst.force_constr x)
 let ppconstr_univ x = Constrextern.with_universes ppconstr x
 let ppglob_constr = (fun x -> pp(pr_lglob_constr_env (Global.env()) x))
@@ -500,7 +502,7 @@ let ppist ist =
 (* Vernac-level debugging commands                                    *)
 
 let in_current_context f c =
-  let (evmap,sign) = Pfedit.get_current_context () in
+  let (evmap,sign) = get_current_context () in
   f (fst (Constrintern.interp_constr sign evmap c))(*FIXME*)
 
 (* We expand the result of preprocessing to be independent of camlp5