breaking: move CCSexp into the core library, delete containers.sexp

src/core/CCSexp.ml

@@ -23,7 +23,6 @@ module Make(Sexp : SEXP) = struct
   let of_int x = Sexp.atom (string_of_int x)
   let of_float x = Sexp.atom (string_of_float x)
   let of_bool x = Sexp.atom (string_of_bool x)
-  let atom x = Sexp.atom x
   let of_unit = Sexp.list []
   let of_list l = Sexp.list l
   let of_rev_list l = Sexp.list (List.rev l)

src/core/CCSexp.mli

@@ -1,6 +1,9 @@
 (* This file is free software, part of containers. See file "license" for more details. *)
 
-(** {1 Handling S-expressions} *)
+(** {1 Handling S-expressions}
+
+    @since 3.0 moved into containers-core, previously in [containers.sexp]
+*)
 
 type 'a or_error = ('a, string) result
 type 'a sequence = ('a -> unit) -> unit
@@ -34,5 +37,11 @@ type t = [
 
 include S with type t := t
 
-val atom : string -> t  
+val equal : t -> t -> bool
+(** @since 3.0 *)
+
+val compare : t -> t -> int
+(** @since 3.0 *)
+
+val atom : string -> t
 (** Build an atom directly from a string. *)

src/core/containers.ml

@@ -45,6 +45,9 @@ module Vector = CCVector
 module Monomorphic = CCMonomorphic
 module Utf8_string = CCUtf8_string
 
+module Sexp = CCSexp
+module Sexp_intf = CCSexp_intf
+
 module Stdlib = CCShims_.Stdlib
 
 include Monomorphic

src/core/dune

@@ -16,8 +16,9 @@
  (public_name containers)
  (wrapped false)
  (modules :standard \ mkshims)
- (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -nolabels -open
+ (flags :standard :standard -warn-error -a+8 -safe-string -nolabels -open
    CCMonomorphic)
- (ocamlopt_flags
+ (ocamlopt_flags (:include ../flambda.flags))
-  (:include ../flambda.flags))
  (libraries seq containers.monomorphic))
+
+(ocamllex (modules CCSexp_lex))

src/sexp/dune

@@ -1,10 +0,0 @@
-
-(library
-  (name containers_sexp)
-  (public_name containers.sexp)
-  (wrapped false)
-  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
-  (ocamlopt_flags :standard (:include ../flambda.flags))
-  (libraries containers))
-
-(ocamllex (modules CCSexp_lex))

src/top/dune

@@ -6,4 +6,4 @@
   (wrapped false)
   (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
   (ocamlopt_flags :standard (:include ../flambda.flags))
-  (libraries compiler-libs.common containers containers.unix containers.sexp))
+  (libraries compiler-libs.common containers containers.unix))