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

[upstream] Fix breaking merge in Coq upstream. #403

Merged
merged 1 commit into from
Apr 4, 2024
Merged

[upstream] Fix breaking merge in Coq upstream. #403

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: 5 additions & 0 deletions serlib/ser_sorts.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
(* Written by: Emilio J. Gallego Arias and others *)
(************************************************************************)

open Ppx_sexp_conv_lib.Conv
open Ppx_hash_lib.Std.Hash.Builtin
open Ppx_compare_lib.Builtin

module Univ = Ser_univ

type family =
Expand Down Expand Up @@ -46,6 +50,7 @@ module Quality = struct
end
include Self
module Set = Ser_cSet.Make(Sorts.Quality.Set)(Self)
type pattern = [%import: Sorts.Quality.pattern] [@@deriving sexp,yojson,hash,compare]
end

module PierceSpec = struct
Expand Down
2 changes: 2 additions & 0 deletions serlib/ser_sorts.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ module Quality : sig

include SerType.SJHC with type t = Sorts.Quality.t
module Set : SerType.SJHC with type t = Sorts.Quality.Set.t

type pattern = Sorts.Quality.pattern [@@deriving sexp,yojson,hash,compare]
end

module QConstraints : SerType.SJHC with type t = Sorts.QConstraints.t
Loading