diff options
| author | Pierre-Marie Pédrot | 2018-12-16 13:55:56 +0100 |
|---|---|---|
| committer | GitHub | 2018-12-16 13:55:56 +0100 |
| commit | 86eba733f8f4591cc38652cf9588cdbdc8f6743d (patch) | |
| tree | 394f768695ea449765c3b8b8fd83328f3e03aca3 | |
| parent | f503e20667008eabb48aa1676ce56f4958c7087e (diff) | |
| parent | 8b1c09e551c02f26c524922570341f0f7fc78e2e (diff) | |
Merge pull request coq/ltac2#91 from ejgallego/proof_rework
[coq] Adapt to coq/coq#9172
| -rw-r--r-- | src/g_ltac2.mlg | 2 | ||||
| -rw-r--r-- | src/tac2core.ml | 3 | ||||
| -rw-r--r-- | src/tac2entries.ml | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/g_ltac2.mlg b/src/g_ltac2.mlg index 12364a0bd8..7020ca079e 100644 --- a/src/g_ltac2.mlg +++ b/src/g_ltac2.mlg @@ -859,7 +859,7 @@ let rules = [ ] in Hook.set Tac2entries.register_constr_quotations begin fun () -> - Pcoq.grammar_extend Pcoq.Constr.operconstr None (Some (Level "0"), [(None, None, rules)]) + Pcoq.grammar_extend Pcoq.Constr.operconstr None (Some (Gramlib.Gramext.Level "0"), [(None, None, rules)]) end } diff --git a/src/tac2core.ml b/src/tac2core.ml index aad4814744..8e92e154ac 100644 --- a/src/tac2core.ml +++ b/src/tac2core.ml @@ -1142,7 +1142,8 @@ let () = let interp ist env sigma concl tac = let ist = Tac2interp.get_env ist in let tac = Proofview.tclIGNORE (Tac2interp.interp ist tac) in - let c, sigma = Pfedit.refine_by_tactic env sigma concl tac in + let name, poly = Id.of_string "ltac2", false in + let c, sigma = Pfedit.refine_by_tactic ~name ~poly env sigma concl tac in (EConstr.of_constr c, sigma) in GlobEnv.register_constr_interp0 wit_ltac2 interp diff --git a/src/tac2entries.ml b/src/tac2entries.ml index bba4680a72..22025f0a8f 100644 --- a/src/tac2entries.ml +++ b/src/tac2entries.ml @@ -750,7 +750,8 @@ let perform_eval e = Proof_global.give_me_the_proof () with Proof_global.NoCurrentProof -> let sigma = Evd.from_env env in - Goal_select.SelectAll, Proof.start sigma [] + let name, poly = Id.of_string "ltac2", false in + Goal_select.SelectAll, Proof.start ~name ~poly sigma [] in let v = match selector with | Goal_select.SelectNth i -> Proofview.tclFOCUS i i v |