Merge pull request #32 from djs55/fixes

Fix warnings and build with `-safe-string`

Author: samoht

.travis.yml

@@ -10,5 +10,6 @@ env:
     - OCAML_VERSION=4.02
     - OCAML_VERSION=4.03
     - OCAML_VERSION=4.04
+    - OCAML_VERSION=4.06
 os:
   - linux

ezjsonm-lwt.opam

@@ -18,7 +18,6 @@ build: [
 
 depends: [
   "ezjsonm"
-  "ocamlfind" {build}
   "jbuilder"  {build & >="1.0+beta9"}
   "alcotest"  {test & >= "0.4.0"}
   "jsonm"     {>= "0.9.1"}

ezjsonm-lwt.version

@@ -244,22 +244,24 @@ let map f t path =
     | h::tl ->
       match t with
       | `O d -> Some (`O (map_dict (fun t -> aux t tl) d h))
-      | j    -> None in
+      | _    -> None in
   match aux t path with
   | None   -> raise Not_found
   | Some j -> j
 
 let update t path v =
   map (fun _ -> v) t path
 
+exception Not_utf8
+
 let is_valid_utf8 str =
   try
     Uutf.String.fold_utf_8 (fun _ _ -> function
-        | `Malformed _ -> raise (Failure "utf8")
+        | `Malformed _ -> raise Not_utf8
         | _ -> ()
       ) () str;
     true
-  with Failure "utf8" -> false
+  with Not_utf8 -> false
 
 let encode_string str =
   if is_valid_utf8 str
@@ -271,7 +273,7 @@ let encode_string str =
 let decode_string = function
   | `String str               -> Some str
   | `O [ "hex", `String str ] -> Some (Hex.to_string (`Hex str))
-  | j                         -> None
+  | _                         -> None
 
 let decode_string_exn j =
   match decode_string j with

ezjsonm.version

@@ -29,7 +29,8 @@ let from_stream (stream: string Lwt_stream.t): value Lwt_stream.t =
       Lwt_stream.get stream >>= function
       | None    -> Lwt.fail (Escape (Jsonm.decoded_range d, (`Expected `Value)))
       | Some str ->
-        Jsonm.Manual.src d str 0 (String.length str);
+        let bytes = Bytes.of_string str in
+        Jsonm.Manual.src d bytes 0 (Bytes.length bytes);
         dec ()
   in
   let rec value v k = match v with
@@ -56,7 +57,7 @@ let from_stream (stream: string Lwt_stream.t): value Lwt_stream.t =
   let open_stream () =
     dec () >>= function
     | `As -> Lwt.return_unit
-    | l   -> Lwt.fail (Escape (Jsonm.decoded_range d, `Expected (`Aval true)))
+    | _   -> Lwt.fail (Escape (Jsonm.decoded_range d, `Expected (`Aval true)))
   in
   let get () =
     dec () >>= fun v ->

lib/META

@@ -1,5 +1,3 @@
-open Alcotest
-
 (* Check we're compatible with sexplib *)
 type test = {
   foo: Ezjsonm.value;
@@ -29,7 +27,7 @@ let random_string len =
   for i = 0 to Bytes.length s - 1 do
     Bytes.set s i @@ Char.chr (random_int 127)
   done;
-  s
+  Bytes.to_string s
 
 let random_list len gen =
   Array.to_list (Array.init len gen)