Updated ocaml-ppxlib to 0.16.0

3 files changed, 239 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6645c400282e..da500a3f6685 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ocaml-ppxlib
 	pkgdesc = Standard library for ppx rewriters
-	pkgver = 0.15.0
+	pkgver = 0.16.0
 	pkgrel = 1
 	url = https://github.com/ocaml-ppx/ppxlib
 	arch = x86_64
@@ -13,12 +13,15 @@ pkgbase = ocaml-ppxlib
 	makedepends = dune>=1.11.0
 	depends = ocaml>=4.04.1
 	depends = ocaml-compiler-libs-repackaged>=0.11.0
-	depends = ocaml-migrate-parsetree>=1.5.0
+	depends = ocaml-migrate-parsetree2
 	depends = ocaml-ppx_derivers>=1.0.0
+	depends = ocaml-result
 	depends = ocaml-sexplib0
 	depends = ocaml-stdlib-shims
 	options = !strip
-	source = ocaml-ppxlib-0.15.0-1.tar.gz::https://github.com/ocaml-ppx/ppxlib/archive/0.15.0.tar.gz
-	sha256sums = d3bfed08737130d663419354ae309fb4d383f4e0110d5b5e7808d93b078a584f
+	source = ocaml-ppxlib-0.16.0-1.tar.gz::https://github.com/ocaml-ppx/ppxlib/archive/0.16.0.tar.gz
+	source = ocaml-migrate-parsetree2.diff
+	sha256sums = 67c9286f670d705caf588e8bb75665be06ccefc06001570dd3b00fdf44c6a6fc
+	sha256sums = acb4e6dfeb0b0a67e23080eec2059fd15e2201a2f272e4eeca131eb750b7e9de
 
 pkgname = ocaml-ppxlib
diff --git a/PKGBUILD b/PKGBUILD
index 5997b172ad3f..55b9acc2746a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,29 @@
 # Contributor: Jakob Gahde <j5lx@fmail.co.uk>
 _projectname='ppxlib'
 pkgname="ocaml-$_projectname"
-pkgver='0.15.0'
+pkgver='0.16.0'
 pkgrel='1'
 pkgdesc='Standard library for ppx rewriters'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://github.com/ocaml-ppx/$_projectname"
 license=('MIT')
-depends=('ocaml>=4.04.1' 'ocaml-compiler-libs-repackaged>=0.11.0' 'ocaml-migrate-parsetree>=1.5.0' 'ocaml-ppx_derivers>=1.0.0' 'ocaml-sexplib0' 'ocaml-stdlib-shims')
+depends=('ocaml>=4.04.1' 'ocaml-compiler-libs-repackaged>=0.11.0' 'ocaml-migrate-parsetree2' 'ocaml-ppx_derivers>=1.0.0' 'ocaml-result' 'ocaml-sexplib0' 'ocaml-stdlib-shims')
 makedepends=('dune>=1.11.0')
 options=('!strip')
-source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz")
-sha256sums=('d3bfed08737130d663419354ae309fb4d383f4e0110d5b5e7808d93b078a584f')
+source=(
+	"$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz"
+	'ocaml-migrate-parsetree2.diff'
+)
+sha256sums=('67c9286f670d705caf588e8bb75665be06ccefc06001570dd3b00fdf44c6a6fc'
+            'acb4e6dfeb0b0a67e23080eec2059fd15e2201a2f272e4eeca131eb750b7e9de')
 
 _sourcedirectory="$_projectname-$pkgver"
 
+prepare() {
+	cd "$srcdir/$_sourcedirectory/"
+	patch --forward -p1 < '../ocaml-migrate-parsetree2.diff'
+}
+
 build() {
 	cd "$srcdir/$_sourcedirectory/"
 	dune build --release --verbose
diff --git a/ocaml-migrate-parsetree2.diff b/ocaml-migrate-parsetree2.diff
new file mode 100644
index 000000000000..3c3edca7f932
--- /dev/null
+++ b/ocaml-migrate-parsetree2.diff
@@ -0,0 +1,219 @@
+diff --git a/ast/ast_helper_lite.ml b/ast/ast_helper_lite.ml
+index f774f76..a362c98 100644
+--- a/ast/ast_helper_lite.ml
++++ b/ast/ast_helper_lite.ml
+@@ -20,7 +20,7 @@ open Ocaml_common
+ module Location = Location
+ module Longident = Longident
+
+-open Migrate_parsetree.Ast_410
++open Migrate_parsetree2.Ast_410
+
+ [@@@warning "-9"]
+ open Asttypes
+diff --git a/ast/ast_helper_lite.mli b/ast/ast_helper_lite.mli
+index 55ad921..216c1a4 100644
+--- a/ast/ast_helper_lite.mli
++++ b/ast/ast_helper_lite.mli
+@@ -16,7 +16,7 @@
+ (** Copy of Ast_helper from OCaml 4.10 with docstring related stuff removed *)
+
+ open Ocaml_common
+-open Migrate_parsetree.Ast_410
++open Migrate_parsetree2.Ast_410
+
+ open Asttypes
+ open Parsetree
+diff --git a/ast/dune b/ast/dune
+index 08158a0..cc0f05c 100644
+--- a/ast/dune
++++ b/ast/dune
+@@ -5,7 +5,7 @@
+   ocaml-compiler-libs.shadow
+   ocaml-compiler-libs.common
+   compiler-libs.common
+-  ocaml-migrate-parsetree
++  ocaml-migrate-parsetree2
+   stdlib-shims)
+  (flags (:standard -open Ocaml_shadow -safe-string) -w -9-27-32)
+  (preprocess (action (run %{exe:pp/pp.exe} %{ocaml_version} %{input-file})))
+diff --git a/ast/versions.ml b/ast/versions.ml
+index dbad548..2d08a0e 100644
+--- a/ast/versions.ml
++++ b/ast/versions.ml
+@@ -399,8 +399,8 @@ end
+
+ (*$ foreach_version (fun n version ->
+     printf "module OCaml_%d = struct\n" n;
+-    printf "  module Ast = Migrate_parsetree.Ast_%d\n" n;
+-    printf "  include Make_witness(Migrate_parsetree.Ast_%d)\n" n;
++    printf "  module Ast = Migrate_parsetree2.Ast_%d\n" n;
++    printf "  include Make_witness(Migrate_parsetree2.Ast_%d)\n" n;
+     printf "  let version = %d\n" n;
+     printf "  let string_version = %S\n" version;
+     printf "end\n";
+@@ -409,71 +409,71 @@ end
+   )
+ *)
+ module OCaml_402 = struct
+-  module Ast = Migrate_parsetree.Ast_402
+-  include Make_witness(Migrate_parsetree.Ast_402)
++  module Ast = Migrate_parsetree2.Ast_402
++  include Make_witness(Migrate_parsetree2.Ast_402)
+   let version = 402
+   let string_version = "4.02"
+ end
+ let ocaml_402 : OCaml_402.types ocaml_version = (module OCaml_402)
+ module OCaml_403 = struct
+-  module Ast = Migrate_parsetree.Ast_403
+-  include Make_witness(Migrate_parsetree.Ast_403)
++  module Ast = Migrate_parsetree2.Ast_403
++  include Make_witness(Migrate_parsetree2.Ast_403)
+   let version = 403
+   let string_version = "4.03"
+ end
+ let ocaml_403 : OCaml_403.types ocaml_version = (module OCaml_403)
+ module OCaml_404 = struct
+-  module Ast = Migrate_parsetree.Ast_404
+-  include Make_witness(Migrate_parsetree.Ast_404)
++  module Ast = Migrate_parsetree2.Ast_404
++  include Make_witness(Migrate_parsetree2.Ast_404)
+   let version = 404
+   let string_version = "4.04"
+ end
+ let ocaml_404 : OCaml_404.types ocaml_version = (module OCaml_404)
+ module OCaml_405 = struct
+-  module Ast = Migrate_parsetree.Ast_405
+-  include Make_witness(Migrate_parsetree.Ast_405)
++  module Ast = Migrate_parsetree2.Ast_405
++  include Make_witness(Migrate_parsetree2.Ast_405)
+   let version = 405
+   let string_version = "4.05"
+ end
+ let ocaml_405 : OCaml_405.types ocaml_version = (module OCaml_405)
+ module OCaml_406 = struct
+-  module Ast = Migrate_parsetree.Ast_406
+-  include Make_witness(Migrate_parsetree.Ast_406)
++  module Ast = Migrate_parsetree2.Ast_406
++  include Make_witness(Migrate_parsetree2.Ast_406)
+   let version = 406
+   let string_version = "4.06"
+ end
+ let ocaml_406 : OCaml_406.types ocaml_version = (module OCaml_406)
+ module OCaml_407 = struct
+-  module Ast = Migrate_parsetree.Ast_407
+-  include Make_witness(Migrate_parsetree.Ast_407)
++  module Ast = Migrate_parsetree2.Ast_407
++  include Make_witness(Migrate_parsetree2.Ast_407)
+   let version = 407
+   let string_version = "4.07"
+ end
+ let ocaml_407 : OCaml_407.types ocaml_version = (module OCaml_407)
+ module OCaml_408 = struct
+-  module Ast = Migrate_parsetree.Ast_408
+-  include Make_witness(Migrate_parsetree.Ast_408)
++  module Ast = Migrate_parsetree2.Ast_408
++  include Make_witness(Migrate_parsetree2.Ast_408)
+   let version = 408
+   let string_version = "4.08"
+ end
+ let ocaml_408 : OCaml_408.types ocaml_version = (module OCaml_408)
+ module OCaml_409 = struct
+-  module Ast = Migrate_parsetree.Ast_409
+-  include Make_witness(Migrate_parsetree.Ast_409)
++  module Ast = Migrate_parsetree2.Ast_409
++  include Make_witness(Migrate_parsetree2.Ast_409)
+   let version = 409
+   let string_version = "4.09"
+ end
+ let ocaml_409 : OCaml_409.types ocaml_version = (module OCaml_409)
+ module OCaml_410 = struct
+-  module Ast = Migrate_parsetree.Ast_410
+-  include Make_witness(Migrate_parsetree.Ast_410)
++  module Ast = Migrate_parsetree2.Ast_410
++  include Make_witness(Migrate_parsetree2.Ast_410)
+   let version = 410
+   let string_version = "4.10"
+ end
+ let ocaml_410 : OCaml_410.types ocaml_version = (module OCaml_410)
+ module OCaml_411 = struct
+-  module Ast = Migrate_parsetree.Ast_411
+-  include Make_witness(Migrate_parsetree.Ast_411)
++  module Ast = Migrate_parsetree2.Ast_411
++  include Make_witness(Migrate_parsetree2.Ast_411)
+   let version = 411
+   let string_version = "4.11"
+ end
+@@ -482,27 +482,27 @@ let ocaml_411 : OCaml_411.types ocaml_version = (module OCaml_411)
+
+ (*$foreach_version_pair (fun a b ->
+     printf "include Register_migration(OCaml_%d)(OCaml_%d)\n" a b;
+-    printf "    (Migrate_parsetree.Migrate_%d_%d)(Migrate_parsetree.Migrate_%d_%d)\n" a b b a
++    printf "    (Migrate_parsetree2.Migrate_%d_%d)(Migrate_parsetree2.Migrate_%d_%d)\n" a b b a
+   )
+ *)
+ include Register_migration(OCaml_402)(OCaml_403)
+-    (Migrate_parsetree.Migrate_402_403)(Migrate_parsetree.Migrate_403_402)
++    (Migrate_parsetree2.Migrate_402_403)(Migrate_parsetree2.Migrate_403_402)
+ include Register_migration(OCaml_403)(OCaml_404)
+-    (Migrate_parsetree.Migrate_403_404)(Migrate_parsetree.Migrate_404_403)
++    (Migrate_parsetree2.Migrate_403_404)(Migrate_parsetree2.Migrate_404_403)
+ include Register_migration(OCaml_404)(OCaml_405)
+-    (Migrate_parsetree.Migrate_404_405)(Migrate_parsetree.Migrate_405_404)
++    (Migrate_parsetree2.Migrate_404_405)(Migrate_parsetree2.Migrate_405_404)
+ include Register_migration(OCaml_405)(OCaml_406)
+-    (Migrate_parsetree.Migrate_405_406)(Migrate_parsetree.Migrate_406_405)
++    (Migrate_parsetree2.Migrate_405_406)(Migrate_parsetree2.Migrate_406_405)
+ include Register_migration(OCaml_406)(OCaml_407)
+-    (Migrate_parsetree.Migrate_406_407)(Migrate_parsetree.Migrate_407_406)
++    (Migrate_parsetree2.Migrate_406_407)(Migrate_parsetree2.Migrate_407_406)
+ include Register_migration(OCaml_407)(OCaml_408)
+-    (Migrate_parsetree.Migrate_407_408)(Migrate_parsetree.Migrate_408_407)
++    (Migrate_parsetree2.Migrate_407_408)(Migrate_parsetree2.Migrate_408_407)
+ include Register_migration(OCaml_408)(OCaml_409)
+-    (Migrate_parsetree.Migrate_408_409)(Migrate_parsetree.Migrate_409_408)
++    (Migrate_parsetree2.Migrate_408_409)(Migrate_parsetree2.Migrate_409_408)
+ include Register_migration(OCaml_409)(OCaml_410)
+-    (Migrate_parsetree.Migrate_409_410)(Migrate_parsetree.Migrate_410_409)
++    (Migrate_parsetree2.Migrate_409_410)(Migrate_parsetree2.Migrate_410_409)
+ include Register_migration(OCaml_410)(OCaml_411)
+-    (Migrate_parsetree.Migrate_410_411)(Migrate_parsetree.Migrate_411_410)
++    (Migrate_parsetree2.Migrate_410_411)(Migrate_parsetree2.Migrate_411_410)
+ (*$*)
+
+ module OCaml_current = OCaml_OCAML_VERSION
+diff --git a/ast/versions.mli b/ast/versions.mli
+index f36bef5..bc4fee8 100644
+--- a/ast/versions.mli
++++ b/ast/versions.mli
+@@ -112,19 +112,19 @@ end
+ (** {1 Concrete frontend instances} *)
+
+ (*$foreach_version (fun n _ ->
+-    printf "module OCaml_%d : OCaml_version with module Ast = Migrate_parsetree.Ast_%d\n"
++    printf "module OCaml_%d : OCaml_version with module Ast = Migrate_parsetree2.Ast_%d\n"
+       n n
+   )*)
+-module OCaml_402 : OCaml_version with module Ast = Migrate_parsetree.Ast_402
+-module OCaml_403 : OCaml_version with module Ast = Migrate_parsetree.Ast_403
+-module OCaml_404 : OCaml_version with module Ast = Migrate_parsetree.Ast_404
+-module OCaml_405 : OCaml_version with module Ast = Migrate_parsetree.Ast_405
+-module OCaml_406 : OCaml_version with module Ast = Migrate_parsetree.Ast_406
+-module OCaml_407 : OCaml_version with module Ast = Migrate_parsetree.Ast_407
+-module OCaml_408 : OCaml_version with module Ast = Migrate_parsetree.Ast_408
+-module OCaml_409 : OCaml_version with module Ast = Migrate_parsetree.Ast_409
+-module OCaml_410 : OCaml_version with module Ast = Migrate_parsetree.Ast_410
+-module OCaml_411 : OCaml_version with module Ast = Migrate_parsetree.Ast_411
++module OCaml_402 : OCaml_version with module Ast = Migrate_parsetree2.Ast_402
++module OCaml_403 : OCaml_version with module Ast = Migrate_parsetree2.Ast_403
++module OCaml_404 : OCaml_version with module Ast = Migrate_parsetree2.Ast_404
++module OCaml_405 : OCaml_version with module Ast = Migrate_parsetree2.Ast_405
++module OCaml_406 : OCaml_version with module Ast = Migrate_parsetree2.Ast_406
++module OCaml_407 : OCaml_version with module Ast = Migrate_parsetree2.Ast_407
++module OCaml_408 : OCaml_version with module Ast = Migrate_parsetree2.Ast_408
++module OCaml_409 : OCaml_version with module Ast = Migrate_parsetree2.Ast_409
++module OCaml_410 : OCaml_version with module Ast = Migrate_parsetree2.Ast_410
++module OCaml_411 : OCaml_version with module Ast = Migrate_parsetree2.Ast_411
+ (*$*)
+
+ (* An alias to the current compiler version *)