From 2db085e62f7797cc999518eb58983ac059763e1f Mon Sep 17 00:00:00 2001 From: Pierre-Marie Pédrot Date: Fri, 4 Nov 2016 14:13:08 +0100 Subject: Vnorm API using EConstr. --- pretyping/vnorm.ml | 5 +++++ pretyping/vnorm.mli | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'pretyping') diff --git a/pretyping/vnorm.ml b/pretyping/vnorm.ml index 8c3de7cfd4..60f99fd3d8 100644 --- a/pretyping/vnorm.ml +++ b/pretyping/vnorm.ml @@ -352,6 +352,11 @@ and nf_cofix env sigma cf = mkCoFix (init,(name,cft,cfb)) let cbv_vm env sigma c t = + if Termops.occur_meta_or_existential sigma c then + CErrors.error "vm_compute does not support existential variables."; + (** This evar-normalizes terms beforehand *) + let c = EConstr.to_constr sigma c in + let t = EConstr.to_constr sigma t in let v = Vconv.val_of_constr env c in nf_val env sigma v t diff --git a/pretyping/vnorm.mli b/pretyping/vnorm.mli index bc6eec851f..650f3f2911 100644 --- a/pretyping/vnorm.mli +++ b/pretyping/vnorm.mli @@ -6,8 +6,8 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -open Term +open EConstr open Environ (** {6 Reduction functions } *) -val cbv_vm : env -> Evd.evar_map -> constr -> types -> constr +val cbv_vm : env -> Evd.evar_map -> constr -> types -> Constr.t -- cgit v1.2.3