Merge pull request #10 from andersfugmann/arrays

Arrays

Author: andersfugmann

Changelog

@@ -3,6 +3,8 @@
 Changes marked with '*' indicates a changes that breaks backward compatibility
 
 [ ] Support extensible polymorphic variants
+3.1.2
+[x] Support arrays
 
 3.1.1
 [x] Do not reference ppx in libraries

Makefile

@@ -23,9 +23,8 @@ update-version:
 	@sed -i 's/^version: .*/version: "$(VERSION)"/' *.opam
 	@sed -i 's/^\( *\)"ppx_protocol_conv" { >= ".*" }/\1"ppx_protocol_conv" { >= "$(VERSION)" }/' ppx_protocol_conv_*.opam
 
-release: VERSION=$(shell cat Changelog | grep -E '^[0-9]' | head -n 1)
 release:
-	@./release.sh $(VERSION)
+	opam publish
 
 doc:
 	dune build @doc

drivers/generic/ppx_protocol_driver.ml

@@ -11,6 +11,9 @@ module type Driver = sig
   val of_list: t list -> t
   val is_list: t -> bool
 
+  val to_array: t -> t array
+  val of_array: t array -> t
+
   val to_alist: t -> (string * t) list
   val of_alist: (string * t) list -> t
   val is_alist: t -> bool
@@ -171,6 +174,12 @@ module Make(Driver: Driver) = struct
   let of_list: ?flags:flag -> ('a -> t) -> 'a list -> t = fun ?flags:_ of_value_fun v ->
     List.map ~f:of_value_fun v |> Driver.of_list
 
+  let to_array: ?flags:flag -> (t -> 'a) -> t -> 'a array = fun ?flags:_ to_value_fun t ->
+    to_list to_value_fun t |> Array.of_list
+
+  let of_array: ?flags:flag -> ('a -> t) -> 'a array -> t = fun ?flags:_ of_value_fun v ->
+    Array.to_list v |> of_list of_value_fun
+
   let to_lazy_t: ?flags:flag -> (t -> 'a) -> t -> 'a lazy_t = fun ?flags:_ to_value_fun t ->
     Lazy.from_fun (fun () -> to_value_fun t)
 

drivers/generic/ppx_protocol_driver.mli

@@ -6,6 +6,9 @@ module type Driver = sig
   val of_list: t list -> t
   val is_list: t -> bool
 
+  val to_array: t -> t array
+  val of_array: t array -> t
+
   val to_alist: t -> (string * t) list
   val of_alist: (string * t) list -> t
   val is_alist: t -> bool

drivers/json/json.ml

@@ -9,6 +9,9 @@ module Driver : Ppx_protocol_driver.Driver with type t = Yojson.Safe.json = stru
   let to_list = U.to_list
   let is_list = function `List _ -> true | _ -> false
 
+  let of_array l = `List (Array.to_list l)
+  let to_array t = U.to_list t |> Array.of_list
+
   let of_alist a = `Assoc a
   let to_alist = U.to_assoc
   let is_alist = function `Assoc _ -> true | _ -> false

drivers/json/test/unittest.ml

@@ -13,6 +13,8 @@ module JsonTestDriver = struct
   let of_option x = Json.of_option x
   let to_list x = Json.to_list x
   let of_list x = Json.of_list x
+  let to_array x = Json.to_array x
+  let of_array x = Json.of_array x
   let to_lazy_t x = Json.to_lazy_t x
   let of_lazy_t x = Json.of_lazy_t x
   let to_int x = Json.to_int x

drivers/jsonm/jsonm.ml

@@ -9,6 +9,9 @@ module Driver : Ppx_protocol_driver.Driver with type t = Ezjsonm.value = struct
   let to_list = Ezjsonm.get_list identity
   let is_list = function `A _ -> true | _ -> false
 
+  let of_array v = Array.to_list v |> Ezjsonm.list identity
+  let to_array v = Ezjsonm.get_list identity v |> Array.of_list
+
   let of_alist = Ezjsonm.dict
   let to_alist = Ezjsonm.get_dict
   let is_alist = function `O _ -> true | _ -> false

drivers/jsonm/test/unittest.ml

@@ -13,6 +13,8 @@ module TestDriver = struct
   let of_option x = Driver.of_option x
   let to_list x = Driver.to_list x
   let of_list x = Driver.of_list x
+  let to_array x = Driver.to_array x
+  let of_array x = Driver.of_array x
   let to_lazy_t x = Driver.to_lazy_t x
   let of_lazy_t x = Driver.of_lazy_t x
   let to_int x = Driver.to_int x

drivers/msgpack/msgpack.ml

@@ -10,6 +10,9 @@ module Driver : Ppx_protocol_driver.Driver with type t = Msgpck.t = struct
   let to_list = Msgpck.to_list
   let is_list = function Msgpck.List _ -> true | _ -> false
 
+  let of_array t = Array.to_list t |> Msgpck.of_list
+  let to_array v = Msgpck.to_list v |> Array.of_list
+
   let of_alist alist = List.map (fun (k, v) -> Msgpck.of_string k, v) alist |> Msgpck.of_map
   let to_alist t = Msgpck.to_map t |> List.map (fun (k, v) -> (Msgpck.to_string k, v))
 

drivers/msgpack/test/unittest.ml

@@ -13,6 +13,8 @@ module TestDriver = struct
   let of_option x = of_option x
   let to_list x = to_list x
   let of_list x = of_list x
+  let to_array x = to_array x
+  let of_array x = of_array x
   let to_lazy_t x = to_lazy_t x
   let of_lazy_t x = of_lazy_t x
   let to_int x = to_int x