pkgs/development/coq-modules/serapi/janestreet-0.15.patch

   1 diff --git a/serlib/ser_constr.ml b/serlib/ser_constr.ml
   2 index 69b2077..47fa06a 100644
   3 --- a/serlib/ser_constr.ml
   4 +++ b/serlib/ser_constr.ml
   5 @@ -99,11 +99,13 @@ type 'constr pcase_branch =
   6  let map_pcase_branch f (bi, c) = (bi, f c)
   7
   8  type 'types pcase_return =
   9 -  [%import: 'constr Constr.pcase_return]
  10 +  [%import: 'types Constr.pcase_return]
  11    [@@deriving sexp,yojson]
  12
  13  let map_pcase_return f (bi, c) = (bi, f c)
  14
  15 +type 'a identity = 'a [@@deriving sexp,yojson]
  16 +
  17  type _constr =
  18    | Rel       of int
  19    | Var       of Names.Id.t
  20 @@ -126,7 +128,7 @@ type _constr =
  21    | Float     of Float64.t
  22    | Array     of Univ.Instance.t * _constr array * _constr * _types
  23  [@@deriving sexp,yojson]
  24 -and _types = _constr
  25 +and _types = _constr identity
  26  [@@deriving sexp,yojson]
  27
  28  let rec _constr_put (c : constr) : _constr =
  29 diff --git a/serlib/ser_locus.ml b/serlib/ser_locus.ml
  30 index 1f74ebc..cdcfc99 100644
  31 --- a/serlib/ser_locus.ml
  32 +++ b/serlib/ser_locus.ml
  33 @@ -57,7 +57,7 @@ type clause_atom =
  34    [%import: Locus.clause_atom]
  35    [@@deriving sexp]
  36
  37 -type concrete_clause =
  38 +type 'id concrete_clause =
  39    [%import: 'id Locus.clause_expr]
  40    [@@deriving sexp]
  41
  42 @@ -65,7 +65,7 @@ type hyp_location =
  43    [%import: Locus.clause_atom]
  44    [@@deriving sexp]
  45
  46 -type goal_location =
  47 +type 'id goal_location =
  48    [%import: 'id Locus.clause_expr]
  49    [@@deriving sexp]
  50
  51 @@ -73,7 +73,7 @@ type simple_clause =
  52    [%import: Locus.clause_atom]
  53    [@@deriving sexp]
  54
  55 -type 'a or_like_first =
  56 +type 'id or_like_first =
  57    [%import: 'id Locus.clause_expr]
  58    [@@deriving sexp]
  59
  60 diff --git a/serlib/ser_stdlib.ml b/serlib/ser_stdlib.ml
  61 index fdb1720..3907548 100644
  62 --- a/serlib/ser_stdlib.ml
  63 +++ b/serlib/ser_stdlib.ml
  64 @@ -16,6 +16,16 @@
  65  open Sexplib.Conv
  66
  67  type nonrec 'a ref = 'a ref
  68 +let ref = ref
  69 +let ( ! ) = ( ! )
  70 +let ( := ) = ( := )
  71 +
  72 +module Option = struct
  73 +  type 'a t = 'a option =
  74 +    | None
  75 +    | Some of 'a
  76 +  [@@deriving sexp]
  77 +end
  78
  79  let ref_of_sexp = ref_of_sexp
  80  let sexp_of_ref = sexp_of_ref