Skip to content

Adapt to coq/coq#20313 (wit_tactic does not handle ltac in term) #789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ppedrot merged 1 commit into from
Mar 19, 2025
Merged

Adapt to coq/coq#20313 (wit_tactic does not handle ltac in term) #789

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/rocq_elpi_builtins.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,6 +951,12 @@ let rec gbpmp f = function
Gbpmp (Pcoq.Rule.next r (Pcoq.Symbol.token (Tok.PFIELD (Some x))), (fun a _ -> f a))
| [] -> assert false

[%%if coq = "8.20" || coq = "9.0"]
let wit_ltac_in_term = Ltac_plugin.Tacarg.wit_tactic
[%%else]
let wit_ltac_in_term = Ltac_plugin.Tacarg.wit_ltac_in_term
[%%endif]

let cache_abbrev_for_tac { abbrev_name; tac_name = tacname; tac_fixed_args = more_args } =
let action args loc =
let open Ltac_plugin in
Expand All @@ -977,7 +983,7 @@ let cache_abbrev_for_tac { abbrev_name; tac_name = tacname; tac_fixed_args = mor
let args = args |> List.map (fun (arg,_) -> Rocq_elpi_arg_HOAS.Tac.Term(arg)) in
let args = Genarg.in_gen (Genarg.rawwit (Genarg.wit_list Rocq_elpi_arg_syntax.wit_elpi_tactic_arg)) (more_args @ args) in
(TacML (elpi_tac_entry, [TacGeneric(None, tacname); TacGeneric(None, args)])) in
CAst.make @@ Constrexpr.CGenarg (Genarg.in_gen (Genarg.rawwit Tacarg.wit_tactic) (CAst.make tac)) in
CAst.make @@ Constrexpr.CGenarg (Genarg.in_gen (Genarg.rawwit wit_ltac_in_term) (CAst.make tac)) in
let Gbpmp (rule, action) = gbpmp action (List.rev abbrev_name) in
Pcoq.grammar_extend Pcoq.Constr.term (Pcoq.Fresh
(Gramlib.Gramext.Before "10",
Expand Down
Loading