From 7799626c67c39c6bd2c5faf247456efb2c26ae82 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Tue, 12 Dec 2017 04:34:45 +0100
Subject: [econstr] Cleanup in `vernac/classes.ml`.

We fix quite a few types, and perform some cleanup wrt to the
evar_map, in particular we prefer to thread it now as otherwise
it may become trickier to check when we are using the correct one.

Thanks to @SkySkimmer for lots of comments and bug-finding.
---
 interp/constrintern.ml  | 2 +-
 interp/constrintern.mli | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'interp')

diff --git a/interp/constrintern.ml b/interp/constrintern.ml
index 977146b2fe..c2157bb2e5 100644
--- a/interp/constrintern.ml
+++ b/interp/constrintern.ml
@@ -2123,7 +2123,7 @@ let interp_constr_evars env evdref ?(impls=empty_internalization_env) c =
   interp_constr_evars_gen env evdref WithoutTypeConstraint ~impls c
 
 let interp_casted_constr_evars env evdref ?(impls=empty_internalization_env) c typ =
-  interp_constr_evars_gen env evdref ~impls (OfType (EConstr.of_constr typ)) c
+  interp_constr_evars_gen env evdref ~impls (OfType typ) c
 
 let interp_type_evars env evdref ?(impls=empty_internalization_env) c =
   interp_constr_evars_gen env evdref IsType ~impls c
diff --git a/interp/constrintern.mli b/interp/constrintern.mli
index 46f96d20b4..af4e4a9c55 100644
--- a/interp/constrintern.mli
+++ b/interp/constrintern.mli
@@ -115,8 +115,9 @@ val interp_open_constr : env -> evar_map -> constr_expr -> evar_map * EConstr.co
 val interp_constr_evars : env -> evar_map ref ->
   ?impls:internalization_env -> constr_expr -> EConstr.constr
 
+
 val interp_casted_constr_evars : env -> evar_map ref ->
-  ?impls:internalization_env -> constr_expr -> types -> EConstr.constr
+  ?impls:internalization_env -> constr_expr -> EConstr.types -> EConstr.constr
 
 val interp_type_evars : env -> evar_map ref ->
   ?impls:internalization_env -> constr_expr -> EConstr.types
-- 
cgit v1.2.3