From f2b7897572072af32ad3faf08d0e2c053b4f1760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= <gregoire.henry@tezos.com>
Date: Sun, 11 Feb 2018 19:17:39 +0100
Subject: [PATCH] Resto: add `RPC_path.subst{0,1,2,3}`

---
 vendors/ocplib-resto/lib_resto/resto.ml  | 44 ++++++++++++++++++++++++
 vendors/ocplib-resto/lib_resto/resto.mli | 16 +++++++++
 2 files changed, 60 insertions(+)

diff --git a/vendors/ocplib-resto/lib_resto/resto.ml b/vendors/ocplib-resto/lib_resto/resto.ml
index d6e5540dd..3d8998030 100644
--- a/vendors/ocplib-resto/lib_resto/resto.ml
+++ b/vendors/ocplib-resto/lib_resto/resto.ml
@@ -81,6 +81,46 @@ module Internal = struct
         ('prefix, 'key) rpath * ('key -> 'params) * ('params -> 'key) ->
       ('prefix, 'params) path
 
+  let rec rsubst0 : type a b. (a, a) rpath -> (b, b) rpath = function
+    | Root -> Root
+    | Static (rpath, name) -> Static (rsubst0 rpath, name)
+    | Dynamic (rpath, arg) -> assert false (* impossible *)
+    | DynamicTail (rpath, arg) -> assert false (* impossible *)
+
+  let subst0 = function
+    | Path rpath -> Path (rsubst0 rpath)
+    | MappedPath _ -> invalid_arg "Resto.Path.subst0"
+
+  let rec rsubst1 : type a b c. (a, a * c) rpath -> (b, b * c) rpath = function
+    | Root -> assert false (* impossible *)
+    | Static (rpath, name) -> Static (rsubst1 rpath, name)
+    | Dynamic (rpath, arg) -> Dynamic (rsubst0 rpath, arg)
+    | DynamicTail (rpath, arg) -> DynamicTail (rsubst0 rpath, arg)
+
+  let subst1 = function
+    | Path rpath -> Path (rsubst1 rpath)
+    | MappedPath _ -> invalid_arg "Resto.Path.subst1"
+
+  let rec rsubst2 : type a b c d. (a, (a * c) * d) rpath -> (b, (b * c) * d) rpath = function
+    | Root -> assert false (* impossible *)
+    | Static (rpath, name) -> Static (rsubst2 rpath, name)
+    | Dynamic (rpath, arg) -> Dynamic (rsubst1 rpath, arg)
+    | DynamicTail (rpath, arg) -> DynamicTail (rsubst1 rpath, arg)
+
+  let subst2 = function
+    | Path rpath -> Path (rsubst2 rpath)
+    | MappedPath _ -> invalid_arg "Resto.Path.subst2"
+
+  let rec rsubst3 : type a b c d e. (a, ((a * c) * d) * e) rpath -> (b, ((b * c) * d) * e) rpath = function
+    | Root -> assert false (* impossible *)
+    | Static (rpath, name) -> Static (rsubst3 rpath, name)
+    | Dynamic (rpath, arg) -> Dynamic (rsubst2 rpath, arg)
+    | DynamicTail (rpath, arg) -> DynamicTail (rsubst2 rpath, arg)
+
+  let subst3 = function
+    | Path rpath -> Path (rsubst3 rpath)
+    | MappedPath _ -> invalid_arg "Resto.Path.subst3"
+
   let from_path x = x
   let to_path x = x
 
@@ -613,6 +653,10 @@ module MakeService(Encoding : ENCODING) = struct
       types = { query ; input ; output ; error } }
 
   let prefix path s = { s with path = Path.prefix path s.path }
+  let subst0 s = { s with path = Internal.subst0 s.path }
+  let subst1 s = { s with path = Internal.subst1 s.path }
+  let subst2 s = { s with path = Internal.subst2 s.path }
+  let subst3 s = { s with path = Internal.subst3 s.path }
 
   let map f g (s : (_,_,_,_,_,_,_) service) =
     { s with path = Path.map f g s.path }
diff --git a/vendors/ocplib-resto/lib_resto/resto.mli b/vendors/ocplib-resto/lib_resto/resto.mli
index b7499f265..1218fa9ec 100644
--- a/vendors/ocplib-resto/lib_resto/resto.mli
+++ b/vendors/ocplib-resto/lib_resto/resto.mli
@@ -344,6 +344,22 @@ module MakeService(Encoding : ENCODING) : sig
     ('meth, 'pr, 'a, 'q, 'i, 'o, 'e) service ->
     ('meth, 'pr, 'b, 'q, 'i, 'o, 'e) service
 
+  val subst0:
+    ([< meth ] as 'm, 'p, 'p, 'q, 'i, 'o, 'e) service ->
+    ('m, 'p2, 'p2, 'q, 'i, 'o, 'e) service
+
+  val subst1:
+    ([< meth ] as 'm, 'p, 'p * 'a, 'q, 'i, 'o, 'e) service ->
+    ('m, 'p2, 'p2 * 'a, 'q, 'i, 'o, 'e) service
+
+  val subst2:
+    ([< meth ] as 'm, 'p, ('p * 'a) * 'b, 'q, 'i, 'o, 'e) service ->
+    ('m, 'p2, ('p2 * 'a) * 'b, 'q, 'i, 'o, 'e) service
+
+  val subst3:
+    ([< meth ] as 'm, 'p, (('p * 'a) * 'b) * 'c, 'q, 'i, 'o, 'e) service ->
+    ('m, 'p2, (('p2 * 'a) * 'b) * 'c, 'q, 'i, 'o, 'e) service
+
   type ('prefix, 'params) description_service =
     ([ `GET ], 'prefix, 'params * string list, Description.request,
      unit, Encoding.schema Description.directory, unit) service