From 5bc1d4fc5accce6b92baeb6a921cfae8ea762ed5 Mon Sep 17 00:00:00 2001 From: Frank Emrich Date: Thu, 9 Nov 2023 21:36:22 +0000 Subject: [PATCH] Better workaround for issue #1187 (#1188) --- lens/column.ml | 5 +++++ lens/database.ml | 5 +++++ lens/sort.ml | 5 +++++ lens/value.ml | 5 +++++ links.opam | 2 +- 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/lens/column.ml b/lens/column.ml index 5d9dcbaee..cc045fe99 100644 --- a/lens/column.ml +++ b/lens/column.ml @@ -1,6 +1,11 @@ open Lens_utility module Type = Phrase_type +(* Workaround for issue #1187 (i.e., the @@deriving sexp clause on t + below creates code triggering warning 40 otherwise) *) +open Sexplib0.Sexp_conv_record.Fields +open Sexplib0.Sexp_conv_record.Kind + type t = { table : string; name : string; diff --git a/lens/database.ml b/lens/database.ml index 7ecb3c1a3..1fb7f26d3 100644 --- a/lens/database.ml +++ b/lens/database.ml @@ -2,6 +2,11 @@ open Operators open Lens_utility module LPV = Phrase_value +(* Workaround for issue #1187 (i.e., the @@deriving sexp clause on t + below creates code triggering warning 40 otherwise) *) +open Sexplib0.Sexp_conv_record.Fields +open Sexplib0.Sexp_conv_record.Kind + type t = { serialize : unit -> string; driver_name : unit -> string; diff --git a/lens/sort.ml b/lens/sort.ml index 3a714607a..b3481727f 100644 --- a/lens/sort.ml +++ b/lens/sort.ml @@ -2,6 +2,11 @@ open Lens_utility open Lens_utility.O module Column = Column +(* Workaround for issue #1187 (i.e., the @@deriving sexp clause on t + below creates code triggering warning 40 otherwise) *) +open Sexplib0.Sexp_conv_record.Fields +open Sexplib0.Sexp_conv_record.Kind + type t = { fds : Fun_dep.Set.t; predicate : Phrase.t option; diff --git a/lens/value.ml b/lens/value.ml index 88f55411a..67a50cddd 100644 --- a/lens/value.ml +++ b/lens/value.ml @@ -1,5 +1,10 @@ open Lens_utility +(* Workaround for issue #1187 (i.e., the @@deriving sexp clause on t + below creates code triggering warning 40 otherwise) *) +open Sexplib0.Sexp_conv_record.Fields +open Sexplib0.Sexp_conv_record.Kind + type t = | Lens of { table : Database.Table.t; sort : Sort.t } | LensMem of { records : Phrase_value.t list; sort : Sort.t } diff --git a/links.opam b/links.opam index 8e3d8bebe..ae354ac9d 100644 --- a/links.opam +++ b/links.opam @@ -35,7 +35,7 @@ depends: [ "result" "ocamlfind" "menhir" {>= "20210419"} - "ppx_sexp_conv" {<= "v0.15.1"} + "ppx_sexp_conv" {>= "v0.16.0"} "calendar" {>= "2.0.4"} "rdf_lwt" {>= "0.13.0"} ]