diff options
| author | Pierre-Marie Pédrot | 2018-05-28 13:38:23 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2018-05-28 13:38:23 +0200 |
| commit | 81535edc4b21015bd63d23e57ca9d707b4b71f6b (patch) | |
| tree | 6a76bc46b66cade1b53d2c878ae2aa7c5e1f5dc5 /vernac/comInductive.ml | |
| parent | b2f746e41abf53fc481f90804ba4d70edd73fc86 (diff) | |
| parent | dfaf7e1ca5aebfdfbef5f32d235a948335f7fda0 (diff) | |
Merge PR #7419: Remove 100 occurrences of Evd.empty
Diffstat (limited to 'vernac/comInductive.ml')
| -rw-r--r-- | vernac/comInductive.ml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vernac/comInductive.ml b/vernac/comInductive.ml index 629fcce5a7..790e83dbef 100644 --- a/vernac/comInductive.ml +++ b/vernac/comInductive.ml @@ -367,7 +367,7 @@ let interp_mutual_inductive (paramsl,indl) notations cum poly prv finite = () in (* Try further to solve evars, and instantiate them *) - let sigma = solve_remaining_evars all_and_fail_flags env_params sigma Evd.empty in + let sigma = solve_remaining_evars all_and_fail_flags env_params sigma (Evd.from_env env_params) in (* Compute renewed arities *) let sigma = Evd.minimize_universes sigma in let nf = Evarutil.nf_evars_universes sigma in @@ -381,10 +381,10 @@ let interp_mutual_inductive (paramsl,indl) notations cum poly prv finite = let constructors = List.map (fun (idl,cl,impsl) -> (idl,List.map nf cl,impsl)) constructors in let ctx_params = List.map Termops.(map_rel_decl (EConstr.to_constr sigma)) ctx_params in let uctx = Evd.check_univ_decl ~poly sigma decl in - List.iter (fun c -> check_evars env_params Evd.empty sigma (EConstr.of_constr c)) arities; - Context.Rel.iter (fun c -> check_evars env0 Evd.empty sigma (EConstr.of_constr c)) ctx_params; + List.iter (fun c -> check_evars env_params (Evd.from_env env_params) sigma (EConstr.of_constr c)) arities; + Context.Rel.iter (fun c -> check_evars env0 (Evd.from_env env0) sigma (EConstr.of_constr c)) ctx_params; List.iter (fun (_,ctyps,_) -> - List.iter (fun c -> check_evars env_ar_params Evd.empty sigma (EConstr.of_constr c)) ctyps) + List.iter (fun c -> check_evars env_ar_params (Evd.from_env env_ar_params) sigma (EConstr.of_constr c)) ctyps) constructors; (* Build the inductive entries *) |
