Merge pull request #11 from andersfugmann/ppxlib

Use ppxlib rather than ppx_type_conv.

Author: andersfugmann

.travis.yml

@@ -13,7 +13,7 @@ env:
   - PACKAGE="ppx_protocol_conv" OCAML_VERSION=4.04
   - PACKAGE="ppx_protocol_conv" OCAML_VERSION=4.05
   - PACKAGE="ppx_protocol_conv" OCAML_VERSION=4.06
-
+  - PACKAGE="ppx_protocol_conv" OCAML_VERSION=4.07
   - PACKAGE="ppx_protocol_conv_json" OCAML_VERSION=4.07
   - PACKAGE="ppx_protocol_conv_msgpack" OCAML_VERSION=4.07
   - PACKAGE="ppx_protocol_conv_xml_light" OCAML_VERSION=4.07

ppx/dune

@@ -2,8 +2,7 @@
  (name ppx_protocol_conv)
  (public_name ppx_protocol_conv)
  (kind ppx_deriver)
- (libraries base ppx_type_conv ppx_core)
- ;(ppx_runtime_libraries ppxlib ppx_core ppx_type_conv ppx_driver)
+ (libraries base ppxlib)
  (preprocess (pps ppxlib.metaquot))
  (synopsis "ppx to derive (de)serialisers of a type")
 )

ppx/ppx_protocol_conv.ml

@@ -1,5 +1,4 @@
-open !Ppx_type_conv.Std
-open Ppx_core
+open Ppxlib
 open Ast_builder.Default
 open !Printf
 open Base
@@ -127,9 +126,9 @@ let test_row_mapping t rows =
         | Rtag (name, attrs, _, _) -> name, attrs
       in
       match Attribute.get t.row_attrib row with
-      | Some name when String.equal row_name name -> `Fst name
+      | Some name when String.equal row_name.txt name -> `Fst name
       | Some name -> `Snd (name, attrs)
-      | None -> `Fst row_name
+      | None -> `Fst row_name.txt
     ) rows
   in
   let _: string list = List.fold_left ~init:base
@@ -199,7 +198,7 @@ let rec serialize_expr_of_type_descr t ~loc = function
         raise_errorf ~loc "Inherited types not supported"
       | Rtag (name, _attributes, _bool, core_types) as row ->
         let lhs =
-          ppat_variant ~loc name (mk_pattern core_types)
+          ppat_variant ~loc name.txt (mk_pattern core_types)
         in
         let args =
           List.mapi ~f:(
@@ -212,7 +211,7 @@ let rec serialize_expr_of_type_descr t ~loc = function
         let rhs =
           let constr_name = match Attribute.get t.row_attrib row with
             | Some key -> key
-            | None -> name
+            | None -> name.txt
           in
           [%expr ( [%e estring ~loc constr_name ],
                    [%e args |> list_expr ~loc] )]
@@ -290,7 +289,7 @@ let rec deserialize_expr_of_type_descr t ~loc = function
         let lhs =
           let constr_name = match Attribute.get t.row_attrib row with
             | Some key -> key
-            | None -> name
+            | None -> name.txt
           in
           let pcstr s pat = ppat_construct ~loc { loc; txt=Lident s } pat in
           core_types
@@ -316,7 +315,7 @@ let rec deserialize_expr_of_type_descr t ~loc = function
                     |> pexp_tuple ~loc
                     |> Option.some
           in
-          pexp_variant ~loc name args
+          pexp_variant ~loc name.txt args
         in
         case ~lhs ~guard:None ~rhs
     in
@@ -706,25 +705,25 @@ let mk_str_type_decl =
     f t recflag ~loc tydecls
 
 let () =
-  let driver = Type_conv.Args.(arg "driver" (pexp_pack __)) in
-  let flags = Type_conv.Args.(arg "flags" __) in
-  Type_conv.add "protocol"
-    ~str_type_decl:(Type_conv.Generator.make
-                      Type_conv.Args.(empty +> driver +> flags)
+  let driver = Ppxlib.Deriving.Args.(arg "driver" (pexp_pack __)) in
+  let flags = Ppxlib.Deriving.Args.(arg "flags" __) in
+  Deriving.add "protocol"
+    ~str_type_decl:(Deriving.Generator.make
+                      Deriving.Args.(empty +> driver +> flags)
                       (mk_str_type_decl protocol_str_type_decls))
-    ~sig_type_decl:(Type_conv.Generator.make Type_conv.Args.(empty +> driver) protocol_sig_type_decls)
-  |> Type_conv.ignore;
+    ~sig_type_decl:(Deriving.Generator.make Deriving.Args.(empty +> driver) protocol_sig_type_decls)
+  |> Ppxlib.Deriving.ignore;
 
-  Type_conv.add "of_protocol"
-    ~str_type_decl:(Type_conv.Generator.make
-                      Type_conv.Args.(empty +> driver +> flags)
+  Deriving.add "of_protocol"
+    ~str_type_decl:(Deriving.Generator.make
+                      Deriving.Args.(empty +> driver +> flags)
                       (mk_str_type_decl of_protocol_str_type_decls))
-    ~sig_type_decl:(Type_conv.Generator.make Type_conv.Args.(empty +> driver) of_protocol_sig_type_decls)
-  |> Type_conv.ignore;
+    ~sig_type_decl:(Deriving.Generator.make Deriving.Args.(empty +> driver) of_protocol_sig_type_decls)
+  |> Deriving.ignore;
 
-  Type_conv.add "to_protocol"
-    ~str_type_decl:(Type_conv.Generator.make
-                      Type_conv.Args.(empty +> driver +> flags)
+  Deriving.add "to_protocol"
+    ~str_type_decl:(Deriving.Generator.make
+                      Deriving.Args.(empty +> driver +> flags)
                       (mk_str_type_decl to_protocol_str_type_decls))
-    ~sig_type_decl:(Type_conv.Generator.make Type_conv.Args.(empty +> driver) to_protocol_sig_type_decls)
-  |> Type_conv.ignore;
+    ~sig_type_decl:(Deriving.Generator.make Deriving.Args.(empty +> driver) to_protocol_sig_type_decls)
+  |> Deriving.ignore;

ppx_protocol_conv.opam

@@ -11,14 +11,11 @@ build: [
 ]
 depends: [
   "ocaml" {>= "4.04"}
-  "base"
-  "ppx_type_conv"
-  "ppx_driver"
-  "ppx_core"
+  "base" {< "v0.12"}
   "dune" {build}
-  "ppxlib"
-  "ppx_sexp_conv" {with-test}
-  "sexplib" {with-test}
+  "ppxlib" {>= "0.3.0"}
+  "ppx_sexp_conv" {with-test & < "v0.12"}
+  "sexplib" {with-test & < "v0.12"}
   "ounit" {with-test}
 ]
 synopsis:

ppx_protocol_conv_json.opam

@@ -14,8 +14,8 @@ depends: [
   "ppx_protocol_conv" {>= "3.1.1"}
   "yojson"
   "dune" {build}
-  "ppx_sexp_conv" {with-test}
-  "sexplib" {with-test}
+  "ppx_sexp_conv" {with-test & < "v0.12"}
+  "sexplib" {with-test & < "v0.12"}
   "ounit" {with-test}
 ]
 synopsis: "Json driver for Ppx_protocol_conv"

ppx_protocol_conv_jsonm.opam

@@ -14,8 +14,8 @@ depends: [
   "ppx_protocol_conv" {>= "3.1.1"}
   "ezjsonm"
   "dune" {build}
-  "ppx_sexp_conv" {with-test}
-  "sexplib" {with-test}
+  "ppx_sexp_conv" {with-test & < "v0.12"}
+  "sexplib" {with-test & < "v0.12"}
   "ounit" {with-test}
 ]
 synopsis: "Jsonm driver for Ppx_protocol_conv"

ppx_protocol_conv_msgpack.opam

@@ -14,8 +14,8 @@ depends: [
   "ppx_protocol_conv" {>= "3.1.1"}
   "msgpck"
   "dune" {build}
-  "ppx_sexp_conv" {with-test}
-  "sexplib" {with-test}
+  "ppx_sexp_conv" {with-test & < "v0.12"}
+  "sexplib" {with-test & < "v0.12"}
   "ounit" {with-test}
 ]
 synopsis: "MessagePack driver for Ppx_protocol_conv"

ppx_protocol_conv_xml_light.opam

@@ -14,8 +14,8 @@ depends: [
   "ppx_protocol_conv" {>= "3.1.1"}
   "xml-light"
   "dune" {build}
-  "ppx_sexp_conv" {with-test}
-  "sexplib" {with-test}
+  "ppx_sexp_conv" {with-test & < "v0.12"}
+  "sexplib" {with-test & < "v0.12"}
   "ounit" {with-test}
 ]
 synopsis: "Xml driver for Ppx_protocol_conv"

ppx_protocol_conv_yaml.opam

@@ -14,8 +14,8 @@ depends: [
   "ppx_protocol_conv" {>= "3.1.1"}
   "yaml"
   "dune" {build}
-  "ppx_sexp_conv" {with-test}
-  "sexplib" {with-test}
+  "ppx_sexp_conv" {with-test & < "v0.12"}
+  "sexplib" {with-test & < "v0.12"}
   "ounit" {with-test}
 ]
 synopsis: "Json driver for Ppx_protocol_conv"