coccinelle: Add more patches for Seq -> Stdlib.Seq adjustments

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: coccinelle: Add more patches for Seq -> Stdlib.Seq adjustments
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Tue, 07 Jul 2020 21:32:55 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue Jul 7 23:32:55 2020 +0200
Changeset:	c6a155c1d52e2168f5d9cf73d49711543ce6135a

Modified Files:
	coccinelle/TODO
	coccinelle/distinfo
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____hashtbl__s.mli.in
Added Files:
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____arrayLabels__s.mli.in
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____array__s.mli.in
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____ephemeron__s.mli.in
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____option__s.mli.in
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____queue__s.mli.in
	coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____result__s.mli.in

Log Message:
coccinelle: Add more patches for Seq -> Stdlib.Seq adjustments

...and update TODO with a snippet of pyml error (still not investigated).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c6a155c1d52e2168f5d9cf73d49711543ce6135a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 coccinelle/TODO                                    | 23 +++++-------
 coccinelle/distinfo                                |  8 ++++-
 ...mpat-current_stdcompat____arrayLabels__s.mli.in | 31 ++++++++++++++++
 ..._stdcompat-current_stdcompat____array__s.mli.in | 31 ++++++++++++++++
 ...compat-current_stdcompat____ephemeron__s.mli.in | 42 ++++++++++++++++++++++
 ...tdcompat-current_stdcompat____hashtbl__s.mli.in | 38 --------------------
 ...stdcompat-current_stdcompat____option__s.mli.in | 13 +++++++
 ..._stdcompat-current_stdcompat____queue__s.mli.in | 31 ++++++++++++++++
 ...stdcompat-current_stdcompat____result__s.mli.in | 13 +++++++
 9 files changed, 176 insertions(+), 54 deletions(-)

diffs:
diff --git a/coccinelle/TODO b/coccinelle/TODO
index cf1159d834..28d87580f5 100644
--- a/coccinelle/TODO
+++ b/coccinelle/TODO
@@ -3,21 +3,14 @@ should be investigated further and if possible fixed:
 
  - Build fails with:
 
-    ocamlfind ocamlc -c -package result -package seq -package uchar -bin-annot -no-alias-deps -I . stdcompat__hashtbl.ml -o stdcompat__hashtbl.cmo
-    File "stdcompat__hashtbl.ml", line 1:
-    Error: The implementation stdcompat__hashtbl.ml
-           does not match the interface stdcompat__hashtbl.cmi:
-           ...
-           At position module type S = <here>
-           Values do not match:
-             val to_seq : 'a t -> (key * 'a) Stdcompat__seq.t
-           is not included in
-             val to_seq : 'a t -> (key * 'a) Seq.t
-           File "stdcompat__hashtbl_s.mli", line 55, characters 4-48:
-             Expected declaration
-           File "stdcompat__hashtbl.ml", line 185, characters 2-50:
-             Actual declaration
-    make[3]: *** [Makefile:1570: stdcompat__hashtbl.cmo] Error 2
+    /usr/pkg/bin/gmake -C bundles/pyml all
+    gmake[1]: Entering directory
+    '/tmp/pkgsrc/wip/coccinelle/work/coccinelle-1.0.8/bundles/pyml'
+    Makefile:34: *** recipe commences before first target.  Stop.
+    gmake[1]: Leaving directory
+    '/tmp/pkgsrc/wip/coccinelle/work/coccinelle-1.0.8/bundles/pyml'
+    gmake: *** [Makefile:480:
+    /tmp/pkgsrc/wip/coccinelle/work/coccinelle-1.0.8/bundles/pyml/pyml.cmxa] Error 2
 
     -- leot (2020/07/07)
 
diff --git a/coccinelle/distinfo b/coccinelle/distinfo
index a891eef085..aaa646edf6 100644
--- a/coccinelle/distinfo
+++ b/coccinelle/distinfo
@@ -5,12 +5,18 @@ RMD160 (coccinelle-1.0.8.tar.gz) = 2c7676dc5c0bdb6839b665e78cc7ca65db0c15f0
 SHA512 (coccinelle-1.0.8.tar.gz) = 496b1632c92cc026fbe28f784f56d4cd78f89a8ccd28dc7db1069c0c6b2b239675a10da305e37ed2a03c605668ecd3399aeed522f12ec3fbbf3ca07277ab7bce
 Size (coccinelle-1.0.8.tar.gz) = 2670961 bytes
 SHA1 (patch-Makefile) = 834190a7229cfd4c5942c31cb59e9b77cda16a30
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____arrayLabels__s.mli.in) = ce10bd3db37f072fe4842ed294462567129d5bf8
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____array__s.mli.in) = 138eadb0fbe37118c1676459e9247732e3443cfd
 SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____buffer__s.mli.in) = 16d56373a98f5be8b2dc0eb64a4e07f2bfdf97d4
 SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____bytesLabels__s.mli.in) = d4c6abc691acaf3bb1ddb5394ec4967f8516d551
 SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____bytes__s.mli.in) = edb3869638883705d84ee1804a405e745547eb00
-SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____hashtbl__s.mli.in) = ded3902d568bfb6479b2722f9e696e5ec8d34801
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____ephemeron__s.mli.in) = 72cf246a7dd812bd4874abc1083a750e08c8039d
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____hashtbl__s.mli.in) = 2b64cb1f19a07a3c54130ec437af30b23ac2156f
 SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____listLabels__s.mli.in) = b0cbec47d1a5e7e55b24a46bf474556bf91ba21a
 SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____list__s.mli.in) = e1a1556b3df60dcd00a5942eec9e636adf7c463f
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____option__s.mli.in) = 2080b5e995a90a15be83f52847e41409bdb5a97a
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____queue__s.mli.in) = 1dc9997d4438534ee3fbc95add6e98606d4b9e4c
+SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____result__s.mli.in) = 5b767f81e120e301618375fb2edbeda5a0e9f9e8
 SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____stack__s.mli.in) = 9f1ddb25b41146418040143dee6f065dd065b3cf
 SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____stringLabels__s.mli.in) = 1a1c9ed6b080aee32eec5a98543067c23ad20354
 SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____string__s.mli.in) = b692472e0df91603da8f46f870ac9d2c032f2d60
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____arrayLabels__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____arrayLabels__s.mli.in
new file mode 100644
index 0000000000..6adbfc0b02
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____arrayLabels__s.mli.in
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__arrayLabels_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__arrayLabels_s.mli.in
+@@ -26,7 +26,7 @@ end
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq : 'a array -> 'a Seq.t
++val to_seq : 'a array -> 'a Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq : 'a array -> 'a Stdcompat__seq.t
+@@ -35,7 +35,7 @@ val to_seq : 'a array -> 'a Stdcompat__s
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seqi : 'a array -> (int * 'a) Seq.t
++val to_seqi : 'a array -> (int * 'a) Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seqi : 'a array -> (int * 'a) Stdcompat__seq.t
+@@ -44,7 +44,7 @@ val to_seqi : 'a array -> (int * 'a) Std
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val of_seq : 'a Seq.t -> 'a array
++val of_seq : 'a Stdlib.Seq.t -> 'a array
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val of_seq : 'a Stdcompat__seq.t -> 'a array
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____array__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____array__s.mli.in
new file mode 100644
index 0000000000..53533176c8
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____array__s.mli.in
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__array_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__array_s.mli.in
+@@ -26,7 +26,7 @@ end
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq : 'a array -> 'a Seq.t
++val to_seq : 'a array -> 'a Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq : 'a array -> 'a Stdcompat__seq.t
+@@ -35,7 +35,7 @@ val to_seq : 'a array -> 'a Stdcompat__s
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seqi : 'a array -> (int * 'a) Seq.t
++val to_seqi : 'a array -> (int * 'a) Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seqi : 'a array -> (int * 'a) Stdcompat__seq.t
+@@ -44,7 +44,7 @@ val to_seqi : 'a array -> (int * 'a) Std
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val of_seq : 'a Seq.t -> 'a array
++val of_seq : 'a Stdlib.Seq.t -> 'a array
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val of_seq : 'a Stdcompat__seq.t -> 'a array
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____ephemeron__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____ephemeron__s.mli.in
new file mode 100644
index 0000000000..ba0cf0e8e6
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____ephemeron__s.mli.in
@@ -0,0 +1,42 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__ephemeron_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__ephemeron_s.mli.in
+@@ -20,12 +20,12 @@ module type S  =
+     val fold : (key -> 'a -> 'b -> 'b) -> 'a t -> 'b -> 'b
+     val length : 'a t -> int
+     val stats : 'a t -> Hashtbl.statistics
+-    val to_seq : 'a t -> (key * 'a) Seq.t
+-    val to_seq_keys : 'a t -> key Seq.t
+-    val to_seq_values : 'a t -> 'a Seq.t
+-    val add_seq : 'a t -> (key * 'a) Seq.t -> unit
+-    val replace_seq : 'a t -> (key * 'a) Seq.t -> unit
+-    val of_seq : (key * 'a) Seq.t -> 'a t
++    val to_seq : 'a t -> (key * 'a) Stdlib.Seq.t
++    val to_seq_keys : 'a t -> key Stdlib.Seq.t
++    val to_seq_values : 'a t -> 'a Stdlib.Seq.t
++    val add_seq : 'a t -> (key * 'a) Stdlib.Seq.t -> unit
++    val replace_seq : 'a t -> (key * 'a) Stdlib.Seq.t -> unit
++    val of_seq : (key * 'a) Stdlib.Seq.t -> 'a t
+     val clean : 'a t -> unit
+     val stats_alive : 'a t -> Hashtbl.statistics
+   end
+@@ -114,12 +114,12 @@ module type SeededS  =
+     val fold : (key -> 'a -> 'b -> 'b) -> 'a t -> 'b -> 'b
+     val length : 'a t -> int
+     val stats : 'a t -> Hashtbl.statistics
+-    val to_seq : 'a t -> (key * 'a) Seq.t
+-    val to_seq_keys : 'a t -> key Seq.t
+-    val to_seq_values : 'a t -> 'a Seq.t
+-    val add_seq : 'a t -> (key * 'a) Seq.t -> unit
+-    val replace_seq : 'a t -> (key * 'a) Seq.t -> unit
+-    val of_seq : (key * 'a) Seq.t -> 'a t
++    val to_seq : 'a t -> (key * 'a) Stdlib.Seq.t
++    val to_seq_keys : 'a t -> key Stdlib.Seq.t
++    val to_seq_values : 'a t -> 'a Stdlib.Seq.t
++    val add_seq : 'a t -> (key * 'a) Stdlib.Seq.t -> unit
++    val replace_seq : 'a t -> (key * 'a) Stdlib.Seq.t -> unit
++    val of_seq : (key * 'a) Stdlib.Seq.t -> 'a t
+     val clean : 'a t -> unit
+     val stats_alive : 'a t -> Hashtbl.statistics
+   end
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____hashtbl__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____hashtbl__s.mli.in
index 62816d411a..07eeed8e6e 100644
--- a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____hashtbl__s.mli.in
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____hashtbl__s.mli.in
@@ -2,44 +2,6 @@ $NetBSD$
 
 --- bundles/stdcompat/stdcompat-current/stdcompat__hashtbl_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
 +++ bundles/stdcompat/stdcompat-current/stdcompat__hashtbl_s.mli.in
-@@ -52,12 +52,12 @@ module type S  =
-     val fold : (key -> 'a -> 'b -> 'b) -> 'a t -> 'b -> 'b
-     val length : 'a t -> int
-     val stats : 'a t -> statistics
--    val to_seq : 'a t -> (key * 'a) Seq.t
--    val to_seq_keys : 'a t -> key Seq.t
--    val to_seq_values : 'a t -> 'a Seq.t
--    val add_seq : 'a t -> (key * 'a) Seq.t -> unit
--    val replace_seq : 'a t -> (key * 'a) Seq.t -> unit
--    val of_seq : (key * 'a) Seq.t -> 'a t
-+    val to_seq : 'a t -> (key * 'a) Stdlib.Seq.t
-+    val to_seq_keys : 'a t -> key Stdlib.Seq.t
-+    val to_seq_values : 'a t -> 'a Stdlib.Seq.t
-+    val add_seq : 'a t -> (key * 'a) Stdlib.Seq.t -> unit
-+    val replace_seq : 'a t -> (key * 'a) Stdlib.Seq.t -> unit
-+    val of_seq : (key * 'a) Stdlib.Seq.t -> 'a t
-   end
- @END_FROM_4_07_0@
- @BEGIN_BEFORE_4_07_0@
-@@ -189,12 +189,12 @@ module type SeededS  =
-     val fold : (key -> 'a -> 'b -> 'b) -> 'a t -> 'b -> 'b
-     val length : 'a t -> int
-     val stats : 'a t -> statistics
--    val to_seq : 'a t -> (key * 'a) Seq.t
--    val to_seq_keys : 'a t -> key Seq.t
--    val to_seq_values : 'a t -> 'a Seq.t
--    val add_seq : 'a t -> (key * 'a) Seq.t -> unit
--    val replace_seq : 'a t -> (key * 'a) Seq.t -> unit
--    val of_seq : (key * 'a) Seq.t -> 'a t
-+    val to_seq : 'a t -> (key * 'a) Stdlib.Seq.t
-+    val to_seq_keys : 'a t -> key Stdlib.Seq.t
-+    val to_seq_values : 'a t -> 'a Stdlib.Seq.t
-+    val add_seq : 'a t -> (key * 'a) Stdlib.Seq.t -> unit
-+    val replace_seq : 'a t -> (key * 'a) Stdlib.Seq.t -> unit
-+    val of_seq : (key * 'a) Stdlib.Seq.t -> 'a t
-   end
- @END_FROM_4_07_0@
- @BEGIN_BEFORE_4_07_0@
 @@ -293,7 +293,7 @@ functor (H : SeededHashedType) ->
   *)
  
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____option__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____option__s.mli.in
new file mode 100644
index 0000000000..e8e22ef136
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____option__s.mli.in
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__option_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__option_s.mli.in
+@@ -68,7 +68,7 @@ val to_list : 'a option -> 'a list
+ (** @since 4.08.0: val to_list : 'a option -> 'a list *)
+ 
+ @BEGIN_FROM_4_08_0@
+-val to_seq : 'a option -> 'a Seq.t
++val to_seq : 'a option -> 'a Stdlib.Seq.t
+ @END_FROM_4_08_0@
+ @BEGIN_BEFORE_4_08_0@
+ val to_seq : 'a option -> 'a Stdcompat__seq.t
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____queue__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____queue__s.mli.in
new file mode 100644
index 0000000000..6590e2bf55
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____queue__s.mli.in
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__queue_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__queue_s.mli.in
+@@ -12,7 +12,7 @@ val peek_opt : 'a t -> 'a option
+ (** @since 4.08.0: val peek_opt : 'a t -> 'a option *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val to_seq : 'a t -> 'a Seq.t
++val to_seq : 'a t -> 'a Stdlib.Seq.t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val to_seq : 'a t -> 'a Stdcompat__seq.t
+@@ -21,7 +21,7 @@ val to_seq : 'a t -> 'a Stdcompat__seq.t
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val add_seq : 'a t -> 'a Seq.t -> unit
++val add_seq : 'a t -> 'a Stdlib.Seq.t -> unit
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val add_seq : 'a t -> 'a Stdcompat__seq.t -> unit
+@@ -30,7 +30,7 @@ val add_seq : 'a t -> 'a Stdcompat__seq.
+  *)
+ 
+ @BEGIN_FROM_4_07_0@
+-val of_seq : 'a Seq.t -> 'a t
++val of_seq : 'a Stdlib.Seq.t -> 'a t
+ @END_FROM_4_07_0@
+ @BEGIN_BEFORE_4_07_0@
+ val of_seq : 'a Stdcompat__seq.t -> 'a t
diff --git a/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____result__s.mli.in b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____result__s.mli.in
new file mode 100644
index 0000000000..7a32b0ff21
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_stdcompat_stdcompat-current_stdcompat____result__s.mli.in
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- bundles/stdcompat/stdcompat-current/stdcompat__result_s.mli.in.orig	2019-09-25 09:19:54.000000000 +0000
++++ bundles/stdcompat/stdcompat-current/stdcompat__result_s.mli.in
+@@ -214,7 +214,7 @@ val to_list : ('a, 'e) Stdcompat__pervas
+  *)
+ 
+ @BEGIN_FROM_4_08_0@
+-val to_seq : ('a, 'e) result -> 'a Seq.t
++val to_seq : ('a, 'e) result -> 'a Stdlib.Seq.t
+ @END_FROM_4_08_0@
+ @BEGIN_BEFORE_4_08_0@
+ val to_seq : ('a, 'e) Stdcompat__pervasives.result -> 'a Stdcompat__seq.t
Prev by Date: coccinelle: Add support for *BSD
Next by Date: coccinelle: Adjust TEST_TARGET to current one and add info about failed tests
Previous by Thread: coccinelle: Add support for *BSD
Next by Thread: coccinelle: Adjust TEST_TARGET to current one and add info about failed tests
Indexes:
Home | Main Index | Thread Index | Old Index