Merge pull request #22 from NathanReb/upgrade-ppxlib-0-18

Make ppx_yojson compatible with ppxlib.0.18.0
NathanReb · Oct 21, 2020 · 73741a7 · 73741a7
2 parents 6fb3b8c + c44fec5
commit 73741a7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,9 @@
+## unreleased
+
+### Added
+
+- Make ppx_yojson fully compatible with 4.11 (#22, @NathanReb)
+
 ## 1.0.0
 
 ### Additions

diff --git a/dune-project b/dune-project
@@ -14,5 +14,5 @@
  (depends
   (ocaml (>= 4.04.2))
   (alcotest :with-test)
-  (ppxlib (and (>= 0.3.0) (< 0.18.0)))
+  (ppxlib (>= 0.18.0))
   (yojson (and :with-test (>= 1.6.0)))))
diff --git a/lib/expression.ml b/lib/expression.ml
@@ -29,7 +29,7 @@ let rec expand ~loc ~path expr =
   | [%expr None] -> [%expr `Null]
   | [%expr true] -> [%expr `Bool true]
   | [%expr false] -> [%expr `Bool false]
-  | { pexp_desc = Pexp_constant (Pconst_string (s, None)); _ } ->
+  | { pexp_desc = Pexp_constant (Pconst_string (s, _, None)); _ } ->
       expand_string ~loc s
   | { pexp_desc = Pexp_constant (Pconst_integer (s, None)); pexp_loc; _ } ->
       expand_int ~loc ~pexp_loc s

diff --git a/lib/pattern.ml b/lib/pattern.ml
@@ -32,7 +32,7 @@ let rec expand ~loc ~path pat =
   | [%pat? None] -> [%pat? `Null]
   | [%pat? true] -> [%pat? `Bool true]
   | [%pat? false] -> [%pat? `Bool false]
-  | { ppat_desc = Ppat_constant (Pconst_string (s, None)); _ } ->
+  | { ppat_desc = Ppat_constant (Pconst_string (s, _, None)); _ } ->
       expand_string ~loc s
   | { ppat_desc = Ppat_constant (Pconst_integer (s, None)); ppat_loc; _ } ->
       expand_int ~loc ~ppat_loc s

diff --git a/ppx_yojson.opam b/ppx_yojson.opam
@@ -10,7 +10,7 @@ depends: [
   "dune" {>= "2.1"}
   "ocaml" {>= "4.04.2"}
   "alcotest" {with-test}
-  "ppxlib" {>= "0.3.0" & < "0.18.0"}
+  "ppxlib" {>= "0.18.0"}
   "yojson" {with-test & >= "1.6.0"}
 ]
 build: [