Skip to content

Commit

Permalink
Merge pull request #403 from ejgallego/fix_quality
Browse files Browse the repository at this point in the history
[upstream] Fix breaking merge in Coq upstream.
  • Loading branch information
ejgallego authored Apr 4, 2024
2 parents 0fbcb67 + 83da6e3 commit 0bf56da
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
5 changes: 5 additions & 0 deletions serlib/ser_sorts.ml
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
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

0 comments on commit 0bf56da

Please sign in to comment.