Remove hard dependency on Biniou

CHANGES.md

@@ -4,6 +4,12 @@
 
 - Removed dependency on easy-format and removed `pretty_format` from
   `Yojson`, `Yojson.Basic`, `Yojson.Safe` and `Yojson.Raw`. (@c-cube, #90)
+- Removed dependency on `biniou`, simplifying the chain of dependencies. This
+  changes some APIs:
+  * `Bi_outbuf.t` in signatures is replaced with `Buffer.t`
+  * `to_outbuf` becomes `to_buffer` and `stream_to_outbuf` becomes
+    `stream_to_buffer`
+- Removed `yojson-biniou` library
 
 ### Fix
 

bin/dune

@@ -1,5 +1,6 @@
 (executable
  (name ydump)
  (public_name ydump)
+ (package yojson)
  (flags (-safe-string))
  (libraries yojson))

bin/ydump.ml

@@ -81,7 +81,7 @@ let cat sort output_biniou std compact streaming in_file out_file =
 
   else
     let write_one oc x =
-      output_string oc (Bi_io.string_of_tree (Yojson_biniou.biniou_of_json x))
+      output_string oc (Yojson.Safe.to_string x)
     in
     polycat write_one streaming in_file out_file
 

lib/common.ml

@@ -19,7 +19,7 @@ let create_in_param ?(len = 256) () = {
 
 
 let utf8_of_code buf x =
-  let add = Bi_outbuf.add_char in
+  let add = Buffer.add_char in
 
   (* Straight <= doesn't work with signed 31-bit ints *)
   let maxbits n x = x lsr n = 0 in
@@ -80,7 +80,7 @@ let is_object_or_array x =
 
 
 type lexer_state = {
-  buf : Bi_outbuf.t;
+  buf : Buffer.t;
     (* Buffer used to accumulate substrings *)
 
   mutable lnum : int;
@@ -97,7 +97,7 @@ type lexer_state = {
 module Lexer_state =
 struct
   type t = lexer_state = {
-    buf : Bi_outbuf.t;
+    buf : Buffer.t;
     mutable lnum : int;
     mutable bol : int;
     mutable fname : string option;
@@ -107,7 +107,7 @@ end
 let init_lexer ?buf ?fname ?(lnum = 1) () =
   let buf =
     match buf with
-	None -> Bi_outbuf.create 256
+	None -> Buffer.create 256
       | Some buf -> buf
   in
   {

lib/common.mli

@@ -5,7 +5,7 @@ exception Json_error of string
 val json_error : string -> 'a
 
 type lexer_state = {
-  buf : Bi_outbuf.t;
+  buf : Buffer.t;
     (** Buffer used to accumulate substrings *)
 
   mutable lnum : int;
@@ -22,15 +22,15 @@ type lexer_state = {
 module Lexer_state :
 sig
   type t = lexer_state = {
-    buf : Bi_outbuf.t;
+    buf : Buffer.t;
     mutable lnum : int;
     mutable bol : int;
     mutable fname : string option;
   }
 end
 
 val init_lexer :
-  ?buf: Bi_outbuf.t ->
+  ?buf: Buffer.t ->
   ?fname: string ->
   ?lnum: int ->
   unit -> lexer_state

lib/dune

@@ -33,8 +33,6 @@
 (library
  (name yojson)
  (public_name yojson)
- (modules yojson yojson_biniou)
- (wrapped false)
- (synopsis "JSON parsing and printing (successor of json-wheel)")
- (flags (-safe-string))
- (libraries biniou))
+ (modules yojson)
+ (synopsis "JSON parsing and printing")
+ (flags (-safe-string)))

lib/read.mli

@@ -12,7 +12,7 @@ exception Finally of exn * exn
 (** Exception describing a failure in both finalizer and parsing. *)
 
 val from_string :
-  ?buf:Bi_outbuf.t ->
+  ?buf:Buffer.t ->
   ?fname:string ->
   ?lnum:int ->
   string -> t
@@ -25,15 +25,15 @@ val from_string :
   *)
 
 val from_channel :
-  ?buf:Bi_outbuf.t ->
+  ?buf:Buffer.t ->
   ?fname:string ->
   ?lnum:int ->
   in_channel -> t
   (** Read a JSON value from a channel.
       See [from_string] for the meaning of the optional arguments. *)
 
 val from_file :
-  ?buf:Bi_outbuf.t ->
+  ?buf:Buffer.t ->
   ?fname:string ->
   ?lnum:int ->
   string -> t
@@ -42,7 +42,7 @@ val from_file :
 
 
 type lexer_state = Lexer_state.t = {
-  buf : Bi_outbuf.t;
+  buf : Buffer.t;
   mutable lnum : int;
   mutable bol : int;
   mutable fname : string option;
@@ -52,7 +52,7 @@ type lexer_state = Lexer_state.t = {
     *)
 
 val init_lexer :
-  ?buf: Bi_outbuf.t ->
+  ?buf: Buffer.t ->
   ?fname: string ->
   ?lnum: int ->
   unit -> lexer_state
@@ -72,7 +72,7 @@ val from_lexbuf :
       the end of the JSON value and the end of the input. *)
 
 val stream_from_string :
-  ?buf:Bi_outbuf.t ->
+  ?buf:Buffer.t ->
   ?fname:string ->
   ?lnum:int ->
   string -> t Stream.t
@@ -81,7 +81,7 @@ val stream_from_string :
       See [from_string] for the meaning of the optional arguments. *)
 
 val stream_from_channel :
-  ?buf:Bi_outbuf.t ->
+  ?buf:Buffer.t ->
   ?fin:(unit -> unit) ->
   ?fname:string ->
   ?lnum:int ->
@@ -97,7 +97,7 @@ val stream_from_channel :
       See [from_string] for the meaning of the other optional arguments. *)
 
 val stream_from_file :
-  ?buf:Bi_outbuf.t ->
+  ?buf:Buffer.t ->
   ?fname:string ->
   ?lnum:int ->
   string -> t Stream.t
@@ -124,7 +124,7 @@ type json_line = [ `Json of t | `Exn of exn ]
     (** The type of values resulting from a parsing attempt of a JSON value. *)
 
 val linestream_from_channel :
-  ?buf:Bi_outbuf.t ->
+  ?buf:Buffer.t ->
   ?fin:(unit -> unit) ->
   ?fname:string ->
   ?lnum:int ->
@@ -138,7 +138,7 @@ val linestream_from_channel :
       See [from_string] for the meaning of the other optional arguments. *)
 
 val linestream_from_file :
-  ?buf:Bi_outbuf.t ->
+  ?buf:Buffer.t ->
   ?fname:string ->
   ?lnum:int ->
   string -> json_line Stream.t