Skip to content

Commit d5f8de1

Browse files
Adapt to rocq-prover/rocq#21811 (Generalize DeclareScheme to use GlobRef)
1 parent 7b0c883 commit d5f8de1

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

src/rocq_elpi_builtins.ml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,7 +1686,7 @@ exception TacticFails of Exninfo.iexn
16861686

16871687
let call_tactic ~depth state ~no_tc proof_context goal tactic =
16881688
let sigma = get_sigma state in
1689-
try
1689+
try
16901690
let sigma, subgoals =
16911691
let open Proofview in let open Notations in
16921692
let focused_tac =
@@ -1934,6 +1934,20 @@ let univ_binder_compat_820 a b = a
19341934
let univ_binder_compat_820 a b = b
19351935
[%%endif]
19361936

1937+
[%%if coq = "9.0" || coq = "9.1" || coq = "9.2"]
1938+
let declare_scheme local k rf gr =
1939+
let ind =
1940+
match x with
1941+
| GlobRef.IndRef i -> i
1942+
| _ -> U.type_error "Register_scheme: expecting an inductive"
1943+
in
1944+
declare_scheme local k (ind,for_scheme gr)
1945+
[%%else]
1946+
let declare_scheme local k rf gr =
1947+
declare_scheme local k (rf,for_scheme gr)
1948+
[%%endif]
1949+
1950+
19371951
let coq_rest_builtins =
19381952
let open API.BuiltIn in
19391953
let open Pred in
@@ -2322,7 +2336,7 @@ Supported attributes:
23222336
let section,l = section_close_section s in
23232337
List.concat_map (function
23242338
| Section.SecDefinition c -> [GlobRef.ConstRef c]
2325-
| Section.SecInductive m ->
2339+
| Section.SecInductive m ->
23262340
let { Declarations.mind_packets } = Environ.lookup_mind m (Safe_typing.env_of_safe_env safe_env) in
23272341
List.init (Array.length mind_packets) (fun i -> GlobRef.IndRef(m,i))
23282342
) l :: aux section
@@ -4230,7 +4244,7 @@ In order to call the code between curly braces one has to run
42304244

42314245
Note that each TACTIC EXTEND block can have many entries and their numbering
42324246
starts from 0. Also, each block has a name, "Lia" in this case.
4233-
4247+
42344248
When the diagnostic is (error Msg), then GL is not set.
42354249

42364250
Supported attributes:
@@ -4613,11 +4627,7 @@ Supported attributes:
46134627
state, (), []
46144628
| Scheme(x,k) ->
46154629
let k = string_of_scheme_kind k in
4616-
let ind =
4617-
match x with
4618-
| GlobRef.IndRef i -> i
4619-
| _ -> U.type_error "Register_scheme: expecting an inductive" in
4620-
declare_scheme local k (ind,for_scheme gr);
4630+
declare_scheme local k x gr;
46214631
state, (), []
46224632
)),
46234633
DocAbove);

0 commit comments

Comments
 (0)