Skip to content
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

Adapt to coq/coq#20315 (may_eval type moved) #924

Merged
merged 1 commit into from
Mar 5, 2025
Merged

Adapt to coq/coq#20315 (may_eval type moved) #924

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion serlib/plugins/ltac/ser_tacexpr.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ type ml_tactic_entry =
[%import: Ltac_plugin.Tacexpr.ml_tactic_entry]
[@@deriving sexp,yojson,hash,compare]

type ('a, 'b, 'c, 'd) may_eval = [%import: ('a,'b,'c,'d) Ltac_plugin.Tacexpr.may_eval]
[@@deriving sexp,yojson,hash,compare]

(* type dyn = Ser_Dyn [@@deriving sexp] *)
(* let to_dyn _ = Ser_Dyn *)
(* let from_dyn _ = fst (Dyn.create "dyn_tac") 0 *)
Expand Down Expand Up @@ -167,7 +170,7 @@ type ('trm, 'dtrm, 'pat, 'redpat, 'cst, 'ref, 'nam, 'occvar, 'tacexpr, 'lev) gen

and ('trm, 'dtrm, 'pat, 'redpat, 'cst, 'ref, 'nam, 'occvar, 'tacexpr, 'lev) gen_tactic_arg =
| TacGeneric of string option * 'lev Genarg.generic_argument
| ConstrMayEval of ('trm,'cst,'redpat,'occvar) Genredexpr.may_eval
| ConstrMayEval of ('trm,'cst,'redpat,'occvar) may_eval
| Reference of 'ref
| TacCall of ('ref *
('trm, 'dtrm, 'pat, 'redpat, 'cst, 'ref, 'nam, 'occvar, 'tacexpr, 'lev) gen_tactic_arg list) CAst.t
Expand Down
4 changes: 0 additions & 4 deletions serlib/ser_genredexpr.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ type ('a,'b,'c,'d) red_expr_gen =
[%import: ('a,'b,'c,'d) Genredexpr.red_expr_gen]
[@@deriving sexp,yojson,hash,compare]

type ('a,'b,'c,'d) may_eval =
[%import: ('a,'b,'c,'d) Genredexpr.may_eval]
[@@deriving sexp,yojson,hash,compare]

(* Helpers for raw_red_expr *)
type r_trm =
[%import: Genredexpr.r_trm]
Expand Down
3 changes: 0 additions & 3 deletions serlib/ser_genredexpr.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ type 'a glob_red_flag = 'a Genredexpr.glob_red_flag
type ('a, 'b, 'c, 'd) red_expr_gen = ('a, 'b, 'c, 'd) Genredexpr.red_expr_gen
[@@deriving sexp,yojson,hash,compare]

type ('a, 'b, 'c, 'd) may_eval = ('a, 'b, 'c, 'd) Genredexpr.may_eval
[@@deriving sexp,yojson,hash,compare]

type raw_red_expr = Genredexpr.raw_red_expr [@@deriving sexp,yojson,hash,compare]

type 'a and_short_name = 'a Genredexpr.and_short_name
Expand Down
Loading