diff options
| author | Pierre-Marie Pédrot | 2016-04-14 18:33:28 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2016-05-04 13:47:12 +0200 |
| commit | 8ad2627de29639b21473783195905dca6bb1c6ae (patch) | |
| tree | 87f3123c9a660daa310d172e472832051eb5f4de /ltac | |
| parent | 011ac2d7db53f0df2849985ef9cc044574c0ddb0 (diff) | |
Getting rid of the Geninterp.generic_interp function.
Diffstat (limited to 'ltac')
| -rw-r--r-- | ltac/rewrite.ml | 6 | ||||
| -rw-r--r-- | ltac/tacinterp.ml | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ltac/rewrite.ml b/ltac/rewrite.ml index 97b2393a8d..cd8ce7e87a 100644 --- a/ltac/rewrite.ml +++ b/ltac/rewrite.ml @@ -613,8 +613,10 @@ let solve_remaining_by env sigma holes by = (** Only solve independent holes *) let indep = List.map_filter map holes in let ist = { Geninterp.lfun = Id.Map.empty; extra = Geninterp.TacStore.empty } in - let solve_tac = Geninterp.generic_interp ist tac in - let solve_tac = Ftactic.run solve_tac (fun _ -> Proofview.tclUNIT ()) in + let solve_tac = match tac with + | Genarg.GenArg (Genarg.Glbwit tag, tac) -> + Ftactic.run (Geninterp.interp tag ist tac) (fun _ -> Proofview.tclUNIT ()) + in let solve_tac = Tacticals.New.tclCOMPLETE solve_tac in let solve sigma evk = let evi = diff --git a/ltac/tacinterp.ml b/ltac/tacinterp.ml index 90784f5e84..b9d074a3dc 100644 --- a/ltac/tacinterp.ml +++ b/ltac/tacinterp.ml @@ -1569,7 +1569,8 @@ and interp_genarg ist x : Val.t Ftactic.t = let q = Value.cast (topwit wit2) q in Ftactic.return (Value.of_pair (val_tag wit1) (val_tag wit2) (p, q)) | ExtraArg s -> - Geninterp.generic_interp ist (Genarg.in_gen (glbwit wit) x) + Geninterp.interp wit ist x >>= fun x -> + Ftactic.return (in_gen (Topwit wit) x) (** returns [true] for genargs which have the same meaning independently of goals. *) |