commit: c7bcaa96595392b720c47d3a9a5a5bebf7307d5c
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun May 1 18:22:22 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue May 3 09:13:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7bcaa96
dev-ml/ppx_sexp_conv: use more recent upstream patch for ocaml 4.03
Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ml/ppx_sexp_conv/files/oc43.patch | 62 +++++++++++++++++++++++++++++++----
1 file changed, 55 insertions(+), 7 deletions(-)
diff --git a/dev-ml/ppx_sexp_conv/files/oc43.patch
b/dev-ml/ppx_sexp_conv/files/oc43.patch
index d95c46c..efb85e2 100644
--- a/dev-ml/ppx_sexp_conv/files/oc43.patch
+++ b/dev-ml/ppx_sexp_conv/files/oc43.patch
@@ -1,6 +1,6 @@
-diff -uNr ppx_sexp_conv-113.33.00/expander/ppx_sexp_conv_expander.ml
ppx_sexp_conv-113.33.00+4.03/expander/ppx_sexp_conv_expander.ml
+diff -uNr ppx_sexp_conv-113.33.00/expander/ppx_sexp_conv_expander.ml
ppx_sexp_conv-113.33.01+4.03/expander/ppx_sexp_conv_expander.ml
--- ppx_sexp_conv-113.33.00/expander/ppx_sexp_conv_expander.ml 2016-03-09
16:44:54.000000000 +0100
-+++ ppx_sexp_conv-113.33.00+4.03/expander/ppx_sexp_conv_expander.ml
2016-03-22 15:13:51.000000000 +0100
++++ ppx_sexp_conv-113.33.01+4.03/expander/ppx_sexp_conv_expander.ml
2016-04-18 12:09:44.000000000 +0200
@@ -491,30 +491,33 @@
let lid = Located.map lident cnstr in
let str = estring ~loc cnstr.txt in
@@ -59,6 +59,15 @@ diff -uNr
ppx_sexp_conv-113.33.00/expander/ppx_sexp_conv_expander.ml ppx_sexp_co
let sexp_of_sum tps cds = Fun_or_match.Match (branch_sum tps cds)
+@@ -721,7 +724,7 @@
+ let sexp_of_tds ~loc ~path:_ (rec_flag, tds) =
+ let rec_flag = really_recursive rec_flag tds in
+ let bindings = List.map tds ~f:sexp_of_td |> List.concat in
+- [pstr_value ~loc rec_flag bindings]
++ pstr_value_list ~loc rec_flag bindings
+
+ let sexp_of_exn ~loc:_ ~path ec =
+ let renaming = Renaming.identity in
@@ -730,14 +733,14 @@
let expr =
match ec with
@@ -120,9 +129,48 @@ diff -uNr
ppx_sexp_conv-113.33.00/expander/ppx_sexp_conv_expander.ml ppx_sexp_co
let lcstr = pstring ~loc (String.uncapitalize cnstr.txt) in
let str = pstring ~loc cnstr.txt in
[%pat? Sexplib.Sexp.Atom ([%p lcstr] | [%p str]) as sexp] -->
-diff -uNr ppx_sexp_conv-113.33.00/_oasis ppx_sexp_conv-113.33.00+4.03/_oasis
+@@ -1479,13 +1486,14 @@
+ internals @ externals)
+ |> List.concat
+ in
+- [pstr_value ~loc Recursive bindings]
++ pstr_value_list ~loc Recursive bindings
+ | Nonrecursive ->
+ let bindings =
+ List.map tds ~f:(fun td ->
+ let internals,externals = td_of_sexp ~loc ~poly ~path td in
+- [pstr_value ~loc Nonrecursive internals;
+- pstr_value ~loc Nonrecursive externals])
++ pstr_value_list ~loc Nonrecursive internals @
++ pstr_value_list ~loc Nonrecursive externals
++ )
+ |> List.concat
+ in
+ bindings
+@@ -1496,7 +1504,7 @@
+ internals @ externals)
+ |> List.concat
+ in
+- [pstr_value ~loc rec_flag bindings]
++ pstr_value_list ~loc rec_flag bindings
+ end
+
+ let type_of_sexp ~path ctyp =
+diff -uNr ppx_sexp_conv-113.33.00/js-utils/gen_install.ml
ppx_sexp_conv-113.33.01+4.03/js-utils/gen_install.ml
+--- ppx_sexp_conv-113.33.00/js-utils/gen_install.ml 2016-03-09
16:44:54.000000000 +0100
++++ ppx_sexp_conv-113.33.01+4.03/js-utils/gen_install.ml 2016-04-18
12:09:44.000000000 +0200
+@@ -31,7 +31,7 @@
+ |> List.map (fun line -> Scanf.sscanf line "%[^=]=%S" (fun k v -> (k, v)))
+
+ let remove_cwd =
+- let prefix = Sys.getcwd () ^ "/" in
++ let prefix = Sys.getcwd () ^ Filename.dir_sep in
+ let len_prefix = String.length prefix in
+ fun fn ->
+ let len = String.length fn in
+diff -uNr ppx_sexp_conv-113.33.00/_oasis ppx_sexp_conv-113.33.01+4.03/_oasis
--- ppx_sexp_conv-113.33.00/_oasis 2016-03-09 16:44:54.000000000 +0100
-+++ ppx_sexp_conv-113.33.00+4.03/_oasis 2016-03-22 15:13:51.000000000
+0100
++++ ppx_sexp_conv-113.33.01+4.03/_oasis 2016-04-18 12:09:44.000000000
+0200
@@ -1,8 +1,8 @@
OASISFormat: 0.4
-OCamlVersion: >= 4.02.3
@@ -130,13 +178,13 @@ diff -uNr ppx_sexp_conv-113.33.00/_oasis
ppx_sexp_conv-113.33.00+4.03/_oasis
FindlibVersion: >= 1.3.2
Name: ppx_sexp_conv
-Version: 113.33.00
-+Version: 113.33.00+4.03
++Version: 113.33.01+4.03
Synopsis: Generation of S-expression conversion functions from type
definitions
Authors: Jane Street Group, LLC <[email protected]>
Copyrights: (C) 2015-2016 Jane Street Group LLC
<[email protected]>
-diff -uNr ppx_sexp_conv-113.33.00/opam ppx_sexp_conv-113.33.00+4.03/opam
+diff -uNr ppx_sexp_conv-113.33.00/opam ppx_sexp_conv-113.33.01+4.03/opam
--- ppx_sexp_conv-113.33.00/opam 2016-03-18 12:08:01.000000000 +0100
-+++ ppx_sexp_conv-113.33.00+4.03/opam 2016-03-22 17:51:37.000000000 +0100
++++ ppx_sexp_conv-113.33.01+4.03/opam 2016-04-18 12:27:13.000000000 +0200
@@ -17,4 +17,4 @@
"ppx_type_conv"
"sexplib"
