| 1 |
commit: c7bcaa96595392b720c47d3a9a5a5bebf7307d5c |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 1 18:22:22 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 3 09:13:52 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7bcaa96 |
| 7 |
|
| 8 |
dev-ml/ppx_sexp_conv: use more recent upstream patch for ocaml 4.03 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ml/ppx_sexp_conv/files/oc43.patch | 62 +++++++++++++++++++++++++++++++---- |
| 14 |
1 file changed, 55 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-ml/ppx_sexp_conv/files/oc43.patch b/dev-ml/ppx_sexp_conv/files/oc43.patch |
| 17 |
index d95c46c..efb85e2 100644 |
| 18 |
--- a/dev-ml/ppx_sexp_conv/files/oc43.patch |
| 19 |
+++ b/dev-ml/ppx_sexp_conv/files/oc43.patch |
| 20 |
@@ -1,6 +1,6 @@ |
| 21 |
-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 |
| 22 |
+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 |
| 23 |
--- ppx_sexp_conv-113.33.00/expander/ppx_sexp_conv_expander.ml 2016-03-09 16:44:54.000000000 +0100 |
| 24 |
-+++ ppx_sexp_conv-113.33.00+4.03/expander/ppx_sexp_conv_expander.ml 2016-03-22 15:13:51.000000000 +0100 |
| 25 |
++++ ppx_sexp_conv-113.33.01+4.03/expander/ppx_sexp_conv_expander.ml 2016-04-18 12:09:44.000000000 +0200 |
| 26 |
@@ -491,30 +491,33 @@ |
| 27 |
let lid = Located.map lident cnstr in |
| 28 |
let str = estring ~loc cnstr.txt in |
| 29 |
@@ -59,6 +59,15 @@ diff -uNr ppx_sexp_conv-113.33.00/expander/ppx_sexp_conv_expander.ml ppx_sexp_co |
| 30 |
|
| 31 |
let sexp_of_sum tps cds = Fun_or_match.Match (branch_sum tps cds) |
| 32 |
|
| 33 |
+@@ -721,7 +724,7 @@ |
| 34 |
+ let sexp_of_tds ~loc ~path:_ (rec_flag, tds) = |
| 35 |
+ let rec_flag = really_recursive rec_flag tds in |
| 36 |
+ let bindings = List.map tds ~f:sexp_of_td |> List.concat in |
| 37 |
+- [pstr_value ~loc rec_flag bindings] |
| 38 |
++ pstr_value_list ~loc rec_flag bindings |
| 39 |
+ |
| 40 |
+ let sexp_of_exn ~loc:_ ~path ec = |
| 41 |
+ let renaming = Renaming.identity in |
| 42 |
@@ -730,14 +733,14 @@ |
| 43 |
let expr = |
| 44 |
match ec with |
| 45 |
@@ -120,9 +129,48 @@ diff -uNr ppx_sexp_conv-113.33.00/expander/ppx_sexp_conv_expander.ml ppx_sexp_co |
| 46 |
let lcstr = pstring ~loc (String.uncapitalize cnstr.txt) in |
| 47 |
let str = pstring ~loc cnstr.txt in |
| 48 |
[%pat? Sexplib.Sexp.Atom ([%p lcstr] | [%p str]) as sexp] --> |
| 49 |
-diff -uNr ppx_sexp_conv-113.33.00/_oasis ppx_sexp_conv-113.33.00+4.03/_oasis |
| 50 |
+@@ -1479,13 +1486,14 @@ |
| 51 |
+ internals @ externals) |
| 52 |
+ |> List.concat |
| 53 |
+ in |
| 54 |
+- [pstr_value ~loc Recursive bindings] |
| 55 |
++ pstr_value_list ~loc Recursive bindings |
| 56 |
+ | Nonrecursive -> |
| 57 |
+ let bindings = |
| 58 |
+ List.map tds ~f:(fun td -> |
| 59 |
+ let internals,externals = td_of_sexp ~loc ~poly ~path td in |
| 60 |
+- [pstr_value ~loc Nonrecursive internals; |
| 61 |
+- pstr_value ~loc Nonrecursive externals]) |
| 62 |
++ pstr_value_list ~loc Nonrecursive internals @ |
| 63 |
++ pstr_value_list ~loc Nonrecursive externals |
| 64 |
++ ) |
| 65 |
+ |> List.concat |
| 66 |
+ in |
| 67 |
+ bindings |
| 68 |
+@@ -1496,7 +1504,7 @@ |
| 69 |
+ internals @ externals) |
| 70 |
+ |> List.concat |
| 71 |
+ in |
| 72 |
+- [pstr_value ~loc rec_flag bindings] |
| 73 |
++ pstr_value_list ~loc rec_flag bindings |
| 74 |
+ end |
| 75 |
+ |
| 76 |
+ let type_of_sexp ~path ctyp = |
| 77 |
+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 |
| 78 |
+--- ppx_sexp_conv-113.33.00/js-utils/gen_install.ml 2016-03-09 16:44:54.000000000 +0100 |
| 79 |
++++ ppx_sexp_conv-113.33.01+4.03/js-utils/gen_install.ml 2016-04-18 12:09:44.000000000 +0200 |
| 80 |
+@@ -31,7 +31,7 @@ |
| 81 |
+ |> List.map (fun line -> Scanf.sscanf line "%[^=]=%S" (fun k v -> (k, v))) |
| 82 |
+ |
| 83 |
+ let remove_cwd = |
| 84 |
+- let prefix = Sys.getcwd () ^ "/" in |
| 85 |
++ let prefix = Sys.getcwd () ^ Filename.dir_sep in |
| 86 |
+ let len_prefix = String.length prefix in |
| 87 |
+ fun fn -> |
| 88 |
+ let len = String.length fn in |
| 89 |
+diff -uNr ppx_sexp_conv-113.33.00/_oasis ppx_sexp_conv-113.33.01+4.03/_oasis |
| 90 |
--- ppx_sexp_conv-113.33.00/_oasis 2016-03-09 16:44:54.000000000 +0100 |
| 91 |
-+++ ppx_sexp_conv-113.33.00+4.03/_oasis 2016-03-22 15:13:51.000000000 +0100 |
| 92 |
++++ ppx_sexp_conv-113.33.01+4.03/_oasis 2016-04-18 12:09:44.000000000 +0200 |
| 93 |
@@ -1,8 +1,8 @@ |
| 94 |
OASISFormat: 0.4 |
| 95 |
-OCamlVersion: >= 4.02.3 |
| 96 |
@@ -130,13 +178,13 @@ diff -uNr ppx_sexp_conv-113.33.00/_oasis ppx_sexp_conv-113.33.00+4.03/_oasis |
| 97 |
FindlibVersion: >= 1.3.2 |
| 98 |
Name: ppx_sexp_conv |
| 99 |
-Version: 113.33.00 |
| 100 |
-+Version: 113.33.00+4.03 |
| 101 |
++Version: 113.33.01+4.03 |
| 102 |
Synopsis: Generation of S-expression conversion functions from type definitions |
| 103 |
Authors: Jane Street Group, LLC <opensource@××××××××××.com> |
| 104 |
Copyrights: (C) 2015-2016 Jane Street Group LLC <opensource@××××××××××.com> |
| 105 |
-diff -uNr ppx_sexp_conv-113.33.00/opam ppx_sexp_conv-113.33.00+4.03/opam |
| 106 |
+diff -uNr ppx_sexp_conv-113.33.00/opam ppx_sexp_conv-113.33.01+4.03/opam |
| 107 |
--- ppx_sexp_conv-113.33.00/opam 2016-03-18 12:08:01.000000000 +0100 |
| 108 |
-+++ ppx_sexp_conv-113.33.00+4.03/opam 2016-03-22 17:51:37.000000000 +0100 |
| 109 |
++++ ppx_sexp_conv-113.33.01+4.03/opam 2016-04-18 12:27:13.000000000 +0200 |
| 110 |
@@ -17,4 +17,4 @@ |
| 111 |
"ppx_type_conv" |
| 112 |
"sexplib" |
Archives