[arch-commits] Commit in camlp4/repos/community-x86_64 (5 files)

Felix Yan felixonmars at archlinux.org
Fri Jun 11 00:32:16 UTC 2021


    Date: Friday, June 11, 2021 @ 00:32:15
  Author: felixonmars
Revision: 961942

archrelease: copy trunk to community-x86_64

Added:
  camlp4/repos/community-x86_64/0001-compile-with-4.10-AST.patch
    (from rev 961941, camlp4/trunk/0001-compile-with-4.10-AST.patch)
  camlp4/repos/community-x86_64/PKGBUILD
    (from rev 961941, camlp4/trunk/PKGBUILD)
Deleted:
  camlp4/repos/community-x86_64/0001-compile-with-4.10-AST.patch
  camlp4/repos/community-x86_64/4.11.patch
  camlp4/repos/community-x86_64/PKGBUILD

----------------------------------+
 0001-compile-with-4.10-AST.patch |  460 ++++++++++++++++++-------------------
 4.11.patch                       |  226 ------------------
 PKGBUILD                         |   71 ++---
 3 files changed, 262 insertions(+), 495 deletions(-)

Deleted: 0001-compile-with-4.10-AST.patch
===================================================================
--- 0001-compile-with-4.10-AST.patch	2021-06-11 00:32:03 UTC (rev 961941)
+++ 0001-compile-with-4.10-AST.patch	2021-06-11 00:32:15 UTC (rev 961942)
@@ -1,230 +0,0 @@
-From 98e094a7c3c01c6375c63e7b944d83142ea3166e Mon Sep 17 00:00:00 2001
-From: ygrek <ygrek at autistici.org>
-Date: Wed, 25 Mar 2020 16:04:36 -0400
-Subject: [PATCH 1/2] compile with 4.10 AST
-
----
- camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml | 20 ++++++++++----------
- camlp4/Camlp4Top/Rprint.ml                 |  8 ++++----
- camlp4/boot/Camlp4.ml                      | 22 ++++++++++------------
- configure                                  |  4 ++--
- opam                                       |  2 +-
- 5 files changed, 27 insertions(+), 29 deletions(-)
-
-diff --git a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
-index c0bdf54e3..6ba906f4e 100644
---- a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
-+++ b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
-@@ -713,7 +713,7 @@ and row_field =
-     | PaTyp loc i -> mkpat loc (Ppat_type (long_type_ident i))
-     | PaVrn loc s -> mkpat loc (Ppat_variant (conv_con s) None)
-     | PaLaz loc p -> mkpat loc (Ppat_lazy (patt p))
--    | PaMod loc m -> mkpat loc (Ppat_unpack (with_loc m loc))
-+    | PaMod loc m -> mkpat loc (Ppat_unpack (with_loc (Some m) loc))
-     | PaExc loc p -> mkpat loc (Ppat_exception (patt p))
-     | PaAtt loc s str e ->
-         let e = patt e in
-@@ -931,7 +931,7 @@ value varify_constructors var_names =
-         match binding bi [] with
-         [ [] -> e
-         | bi -> mkexp loc (Pexp_let (mkrf rf) bi e) ]
--    | ExLmd loc i me e -> mkexp loc (Pexp_letmodule (with_loc i loc) (module_expr me) (expr e))
-+    | ExLmd loc i me e -> mkexp loc (Pexp_letmodule (with_loc (Some i) loc) (module_expr me) (expr e))
-     | ExMat loc e a -> mkexp loc (Pexp_match (expr e) (match_case a []))
-     | ExNew loc id -> mkexp loc (Pexp_new (long_type_ident id))
-     | ExObj loc po cfl ->
-@@ -1132,9 +1132,9 @@ value varify_constructors var_names =
-     [ <:module_type at loc<>> -> error loc "abstract/nil module type not allowed here"
-     | <:module_type at loc< $id:i$ >> -> mkmty loc (Pmty_ident (long_uident i))
-     | Ast.MtFun(loc, "*", Ast.MtNil _, mt) ->
--        mkmty loc (Pmty_functor (with_loc "*" loc) None (module_type mt))
-+        mkmty loc (Pmty_functor Unit (module_type mt))
-     | <:module_type at loc< functor ($n$ : $nt$) -> $mt$ >> ->
--        mkmty loc (Pmty_functor (with_loc n loc) (Some (module_type nt)) (module_type mt))
-+        mkmty loc (Pmty_functor (Named (with_loc (Some n) loc) (module_type nt)) (module_type mt))
-     | <:module_type at loc< '$_$ >> -> error loc "module type variable not allowed here"
-     | <:module_type at loc< sig $sl$ end >> ->
-         mkmty loc (Pmty_signature (sig_item sl []))
-@@ -1185,7 +1185,7 @@ value varify_constructors var_names =
-     | SgInc loc mt -> [mksig loc (Psig_include {pincl_mod=module_type mt;
-                                                 pincl_attributes=[];
-                                                 pincl_loc = mkloc loc}) :: l]
--    | SgMod loc n mt -> [mksig loc (Psig_module {pmd_loc=mkloc loc; pmd_name=with_loc n loc; pmd_type=module_type mt; pmd_attributes=[]}) :: l]
-+    | SgMod loc n mt -> [mksig loc (Psig_module {pmd_loc=mkloc loc; pmd_name=with_loc (Some n) loc; pmd_type=module_type mt; pmd_attributes=[]}) :: l]
-     | SgRecMod loc mb ->
-         [mksig loc (Psig_recmodule (module_sig_binding mb [])) :: l]
-     | SgMty loc n mt ->
-@@ -1215,7 +1215,7 @@ value varify_constructors var_names =
-     [ <:module_binding< $x$ and $y$ >> ->
-         module_sig_binding x (module_sig_binding y acc)
-     | <:module_binding at loc< $s$ : $mt$ >> ->
--        [{pmd_loc=mkloc loc; pmd_name=with_loc s loc; pmd_type=module_type mt; pmd_attributes=[]} :: acc]
-+        [{pmd_loc=mkloc loc; pmd_name=with_loc (Some s) loc; pmd_type=module_type mt; pmd_attributes=[]} :: acc]
-     | _ -> assert False ]
-   and module_str_binding x acc =
-     match x with
-@@ -1223,7 +1223,7 @@ value varify_constructors var_names =
-         module_str_binding x (module_str_binding y acc)
-     | <:module_binding at loc< $s$ : $mt$ = $me$ >> ->
-         [{pmb_loc=mkloc loc;
--          pmb_name=with_loc s loc;
-+          pmb_name=with_loc (Some s) loc;
-           pmb_expr=
-           {pmod_loc=Location.none;
-            pmod_desc=Pmod_constraint(module_expr me,module_type mt);
-@@ -1238,9 +1238,9 @@ value varify_constructors var_names =
-     | <:module_expr at loc< $me1$ $me2$ >> ->
-         mkmod loc (Pmod_apply (module_expr me1) (module_expr me2))
-     | Ast.MeFun(loc, "*", Ast.MtNil _, me) ->
--        mkmod loc (Pmod_functor (with_loc "*" loc) None (module_expr me))
-+        mkmod loc (Pmod_functor Unit (module_expr me))
-     | <:module_expr at loc< functor ($n$ : $mt$) -> $me$ >> ->
--        mkmod loc (Pmod_functor (with_loc n loc) (Some (module_type mt)) (module_expr me))
-+        mkmod loc (Pmod_functor (Named (with_loc (Some n) loc) (module_type mt)) (module_expr me))
-     | <:module_expr at loc< struct $sl$ end >> ->
-         mkmod loc (Pmod_structure (str_item sl []))
-     | <:module_expr at loc< ($me$ : $mt$) >> ->
-@@ -1299,7 +1299,7 @@ value varify_constructors var_names =
-     | StInc loc me -> [mkstr loc (Pstr_include {pincl_mod=module_expr me;
-                                                 pincl_attributes=[];
-                                                 pincl_loc=mkloc loc}) :: l]
--    | StMod loc n me -> [mkstr loc (Pstr_module {pmb_loc=mkloc loc; pmb_name=with_loc n loc;pmb_expr=module_expr me;pmb_attributes=[]}) :: l]
-+    | StMod loc n me -> [mkstr loc (Pstr_module {pmb_loc=mkloc loc; pmb_name=with_loc (Some n) loc;pmb_expr=module_expr me;pmb_attributes=[]}) :: l]
-     | StRecMod loc mb ->
-         [mkstr loc (Pstr_recmodule (module_str_binding mb [])) :: l]
-     | StMty loc n mt ->
-diff --git a/camlp4/Camlp4Top/Rprint.ml b/camlp4/Camlp4Top/Rprint.ml
-index c785b1d68..8961bc8b7 100644
---- a/camlp4/Camlp4Top/Rprint.ml
-+++ b/camlp4/Camlp4Top/Rprint.ml
-@@ -366,11 +366,11 @@ value rec print_out_module_type ppf =
-   | Omty_signature sg ->
-       fprintf ppf "@[<hv 2>sig@ %a@;<1 -2>end@]"
-         Toploop.print_out_signature.val sg
--  | Omty_functor name None mty_res ->
--      fprintf ppf "@[<2>functor@ (%s) ->@ %a@]" name
-+  | Omty_functor None mty_res ->
-+      fprintf ppf "@[<2>functor@ () ->@ %a@]"
-         print_out_module_type mty_res
--  | Omty_functor name (Some mty_arg) mty_res ->
--      fprintf ppf "@[<2>functor@ (%s : %a) ->@ %a@]" name
-+  | Omty_functor (Some name mty_arg) mty_res ->
-+      fprintf ppf "@[<2>functor@ (%s : %a) ->@ %a@]" (match name with [ None -> "_" | Some n -> n ])
-         print_out_module_type mty_arg print_out_module_type mty_res
-   | Omty_abstract -> () ]
- and needs_semi =
-diff --git a/camlp4/boot/Camlp4.ml b/camlp4/boot/Camlp4.ml
-index dcb6a996b..32b8a8865 100644
---- a/camlp4/boot/Camlp4.ml
-+++ b/camlp4/boot/Camlp4.ml
-@@ -16216,7 +16216,7 @@ module Struct =
-               | PaVrn (loc, s) ->
-                   mkpat loc (Ppat_variant ((conv_con s), None))
-               | PaLaz (loc, p) -> mkpat loc (Ppat_lazy (patt p))
--              | PaMod (loc, m) -> mkpat loc (Ppat_unpack (with_loc m loc))
-+              | PaMod (loc, m) -> mkpat loc (Ppat_unpack (with_loc (Some m) loc))
-               | PaExc (loc, p) -> mkpat loc (Ppat_exception (patt p))
-               | PaAtt (loc, s, str, e) ->
-                   let e = patt e
-@@ -16483,7 +16483,7 @@ module Struct =
-                      | bi -> mkexp loc (Pexp_let ((mkrf rf), bi, e)))
-               | ExLmd (loc, i, me, e) ->
-                   mkexp loc
--                    (Pexp_letmodule ((with_loc i loc), (module_expr me),
-+                    (Pexp_letmodule ((with_loc (Some i) loc), (module_expr me),
-                        (expr e)))
-               | ExMat (loc, e, a) ->
-                   mkexp loc (Pexp_match ((expr e), (match_case a [])))
-@@ -16735,11 +16735,10 @@ module Struct =
-               | Ast.MtId (loc, i) -> mkmty loc (Pmty_ident (long_uident i))
-               | Ast.MtFun ((loc, "*", Ast.MtNil _, mt)) ->
-                   mkmty loc
--                    (Pmty_functor ((with_loc "*" loc), None,
--                       (module_type mt)))
-+                    (Pmty_functor (Unit, (module_type mt)))
-               | Ast.MtFun (loc, n, nt, mt) ->
-                   mkmty loc
--                    (Pmty_functor ((with_loc n loc), (Some (module_type nt)),
-+                    (Pmty_functor (Named ((with_loc (Some n) loc), (module_type nt)),
-                        (module_type mt)))
-               | Ast.MtQuo (loc, _) ->
-                   error loc "module type variable not allowed here"
-@@ -16835,7 +16834,7 @@ module Struct =
-                      (Psig_module
-                         {
-                           pmd_loc = mkloc loc;
--                          pmd_name = with_loc n loc;
-+                          pmd_name = with_loc (Some n) loc;
-                           pmd_type = module_type mt;
-                           pmd_attributes = [];
-                         })) ::
-@@ -16890,7 +16889,7 @@ module Struct =
-               | Ast.MbCol (loc, s, mt) ->
-                   {
-                     pmd_loc = mkloc loc;
--                    pmd_name = with_loc s loc;
-+                    pmd_name = with_loc (Some s) loc;
-                     pmd_type = module_type mt;
-                     pmd_attributes = [];
-                   } :: acc
-@@ -16902,7 +16901,7 @@ module Struct =
-               | Ast.MbColEq (loc, s, mt, me) ->
-                   {
-                     pmb_loc = mkloc loc;
--                    pmb_name = with_loc s loc;
-+                    pmb_name = with_loc (Some s) loc;
-                     pmb_expr =
-                       {
-                         pmod_loc = Location.none;
-@@ -16923,11 +16922,10 @@ module Struct =
-                     (Pmod_apply ((module_expr me1), (module_expr me2)))
-               | Ast.MeFun ((loc, "*", Ast.MtNil _, me)) ->
-                   mkmod loc
--                    (Pmod_functor ((with_loc "*" loc), None,
--                       (module_expr me)))
-+                    (Pmod_functor (Unit, (module_expr me)))
-               | Ast.MeFun (loc, n, mt, me) ->
-                   mkmod loc
--                    (Pmod_functor ((with_loc n loc), (Some (module_type mt)),
-+                    (Pmod_functor (Named ((with_loc (Some n) loc), (module_type mt)),
-                        (module_expr me)))
-               | Ast.MeStr (loc, sl) ->
-                   mkmod loc (Pmod_structure (str_item sl []))
-@@ -17050,7 +17048,7 @@ module Struct =
-                      (Pstr_module
-                         {
-                           pmb_loc = mkloc loc;
--                          pmb_name = with_loc n loc;
-+                          pmb_name = with_loc (Some n) loc;
-                           pmb_expr = module_expr me;
-                           pmb_attributes = [];
-                         })) ::
-diff --git a/configure b/configure
-index 277556b63..7bb18bb6c 100755
---- a/configure
-+++ b/configure
-@@ -39,8 +39,8 @@ if [ $major -lt 4 -o \( $major -eq 4 -a $minor -lt 2 \) ]; then
-     echo "The standalone Camlp4 requires OCaml >= 4.02."
-     echo "For previous versions of OCaml use the Camlp4 distributed with OCaml."
-     exit 2
--elif [ $major -ne 4 -o $minor -ne 9 ]; then
--    echo "This version of Camlp4 is for OCaml 4.09 but you are using OCaml $ocaml_version."
-+elif [ $major -ne 4 -o $minor -ne 10 ]; then
-+    echo "This version of Camlp4 is for OCaml 4.10 but you are using OCaml $ocaml_version."
-     if [ -d .git ] ; then
-       if [ $PINNED -eq 1 ] ; then
-         echo "You've used the wrong opam pin URL for this switch.">&2
-diff --git a/opam b/opam
-index 273e79aab..402d2d0f9 100644
---- a/opam
-+++ b/opam
-@@ -1,5 +1,5 @@
- opam-version: "1.2"
--version: "4.09"
-+version: "4.10"
- authors: ["Daniel de Rauglaudre" "Nicolas Pouillard"]
- maintainer: "ygrek at autistici.org"
- homepage: "https://github.com/ocaml/camlp4"
--- 
-2.26.2
-

Copied: camlp4/repos/community-x86_64/0001-compile-with-4.10-AST.patch (from rev 961941, camlp4/trunk/0001-compile-with-4.10-AST.patch)
===================================================================
--- 0001-compile-with-4.10-AST.patch	                        (rev 0)
+++ 0001-compile-with-4.10-AST.patch	2021-06-11 00:32:15 UTC (rev 961942)
@@ -0,0 +1,230 @@
+From 98e094a7c3c01c6375c63e7b944d83142ea3166e Mon Sep 17 00:00:00 2001
+From: ygrek <ygrek at autistici.org>
+Date: Wed, 25 Mar 2020 16:04:36 -0400
+Subject: [PATCH 1/2] compile with 4.10 AST
+
+---
+ camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml | 20 ++++++++++----------
+ camlp4/Camlp4Top/Rprint.ml                 |  8 ++++----
+ camlp4/boot/Camlp4.ml                      | 22 ++++++++++------------
+ configure                                  |  4 ++--
+ opam                                       |  2 +-
+ 5 files changed, 27 insertions(+), 29 deletions(-)
+
+diff --git a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
+index c0bdf54e3..6ba906f4e 100644
+--- a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
++++ b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
+@@ -713,7 +713,7 @@ and row_field =
+     | PaTyp loc i -> mkpat loc (Ppat_type (long_type_ident i))
+     | PaVrn loc s -> mkpat loc (Ppat_variant (conv_con s) None)
+     | PaLaz loc p -> mkpat loc (Ppat_lazy (patt p))
+-    | PaMod loc m -> mkpat loc (Ppat_unpack (with_loc m loc))
++    | PaMod loc m -> mkpat loc (Ppat_unpack (with_loc (Some m) loc))
+     | PaExc loc p -> mkpat loc (Ppat_exception (patt p))
+     | PaAtt loc s str e ->
+         let e = patt e in
+@@ -931,7 +931,7 @@ value varify_constructors var_names =
+         match binding bi [] with
+         [ [] -> e
+         | bi -> mkexp loc (Pexp_let (mkrf rf) bi e) ]
+-    | ExLmd loc i me e -> mkexp loc (Pexp_letmodule (with_loc i loc) (module_expr me) (expr e))
++    | ExLmd loc i me e -> mkexp loc (Pexp_letmodule (with_loc (Some i) loc) (module_expr me) (expr e))
+     | ExMat loc e a -> mkexp loc (Pexp_match (expr e) (match_case a []))
+     | ExNew loc id -> mkexp loc (Pexp_new (long_type_ident id))
+     | ExObj loc po cfl ->
+@@ -1132,9 +1132,9 @@ value varify_constructors var_names =
+     [ <:module_type at loc<>> -> error loc "abstract/nil module type not allowed here"
+     | <:module_type at loc< $id:i$ >> -> mkmty loc (Pmty_ident (long_uident i))
+     | Ast.MtFun(loc, "*", Ast.MtNil _, mt) ->
+-        mkmty loc (Pmty_functor (with_loc "*" loc) None (module_type mt))
++        mkmty loc (Pmty_functor Unit (module_type mt))
+     | <:module_type at loc< functor ($n$ : $nt$) -> $mt$ >> ->
+-        mkmty loc (Pmty_functor (with_loc n loc) (Some (module_type nt)) (module_type mt))
++        mkmty loc (Pmty_functor (Named (with_loc (Some n) loc) (module_type nt)) (module_type mt))
+     | <:module_type at loc< '$_$ >> -> error loc "module type variable not allowed here"
+     | <:module_type at loc< sig $sl$ end >> ->
+         mkmty loc (Pmty_signature (sig_item sl []))
+@@ -1185,7 +1185,7 @@ value varify_constructors var_names =
+     | SgInc loc mt -> [mksig loc (Psig_include {pincl_mod=module_type mt;
+                                                 pincl_attributes=[];
+                                                 pincl_loc = mkloc loc}) :: l]
+-    | SgMod loc n mt -> [mksig loc (Psig_module {pmd_loc=mkloc loc; pmd_name=with_loc n loc; pmd_type=module_type mt; pmd_attributes=[]}) :: l]
++    | SgMod loc n mt -> [mksig loc (Psig_module {pmd_loc=mkloc loc; pmd_name=with_loc (Some n) loc; pmd_type=module_type mt; pmd_attributes=[]}) :: l]
+     | SgRecMod loc mb ->
+         [mksig loc (Psig_recmodule (module_sig_binding mb [])) :: l]
+     | SgMty loc n mt ->
+@@ -1215,7 +1215,7 @@ value varify_constructors var_names =
+     [ <:module_binding< $x$ and $y$ >> ->
+         module_sig_binding x (module_sig_binding y acc)
+     | <:module_binding at loc< $s$ : $mt$ >> ->
+-        [{pmd_loc=mkloc loc; pmd_name=with_loc s loc; pmd_type=module_type mt; pmd_attributes=[]} :: acc]
++        [{pmd_loc=mkloc loc; pmd_name=with_loc (Some s) loc; pmd_type=module_type mt; pmd_attributes=[]} :: acc]
+     | _ -> assert False ]
+   and module_str_binding x acc =
+     match x with
+@@ -1223,7 +1223,7 @@ value varify_constructors var_names =
+         module_str_binding x (module_str_binding y acc)
+     | <:module_binding at loc< $s$ : $mt$ = $me$ >> ->
+         [{pmb_loc=mkloc loc;
+-          pmb_name=with_loc s loc;
++          pmb_name=with_loc (Some s) loc;
+           pmb_expr=
+           {pmod_loc=Location.none;
+            pmod_desc=Pmod_constraint(module_expr me,module_type mt);
+@@ -1238,9 +1238,9 @@ value varify_constructors var_names =
+     | <:module_expr at loc< $me1$ $me2$ >> ->
+         mkmod loc (Pmod_apply (module_expr me1) (module_expr me2))
+     | Ast.MeFun(loc, "*", Ast.MtNil _, me) ->
+-        mkmod loc (Pmod_functor (with_loc "*" loc) None (module_expr me))
++        mkmod loc (Pmod_functor Unit (module_expr me))
+     | <:module_expr at loc< functor ($n$ : $mt$) -> $me$ >> ->
+-        mkmod loc (Pmod_functor (with_loc n loc) (Some (module_type mt)) (module_expr me))
++        mkmod loc (Pmod_functor (Named (with_loc (Some n) loc) (module_type mt)) (module_expr me))
+     | <:module_expr at loc< struct $sl$ end >> ->
+         mkmod loc (Pmod_structure (str_item sl []))
+     | <:module_expr at loc< ($me$ : $mt$) >> ->
+@@ -1299,7 +1299,7 @@ value varify_constructors var_names =
+     | StInc loc me -> [mkstr loc (Pstr_include {pincl_mod=module_expr me;
+                                                 pincl_attributes=[];
+                                                 pincl_loc=mkloc loc}) :: l]
+-    | StMod loc n me -> [mkstr loc (Pstr_module {pmb_loc=mkloc loc; pmb_name=with_loc n loc;pmb_expr=module_expr me;pmb_attributes=[]}) :: l]
++    | StMod loc n me -> [mkstr loc (Pstr_module {pmb_loc=mkloc loc; pmb_name=with_loc (Some n) loc;pmb_expr=module_expr me;pmb_attributes=[]}) :: l]
+     | StRecMod loc mb ->
+         [mkstr loc (Pstr_recmodule (module_str_binding mb [])) :: l]
+     | StMty loc n mt ->
+diff --git a/camlp4/Camlp4Top/Rprint.ml b/camlp4/Camlp4Top/Rprint.ml
+index c785b1d68..8961bc8b7 100644
+--- a/camlp4/Camlp4Top/Rprint.ml
++++ b/camlp4/Camlp4Top/Rprint.ml
+@@ -366,11 +366,11 @@ value rec print_out_module_type ppf =
+   | Omty_signature sg ->
+       fprintf ppf "@[<hv 2>sig@ %a@;<1 -2>end@]"
+         Toploop.print_out_signature.val sg
+-  | Omty_functor name None mty_res ->
+-      fprintf ppf "@[<2>functor@ (%s) ->@ %a@]" name
++  | Omty_functor None mty_res ->
++      fprintf ppf "@[<2>functor@ () ->@ %a@]"
+         print_out_module_type mty_res
+-  | Omty_functor name (Some mty_arg) mty_res ->
+-      fprintf ppf "@[<2>functor@ (%s : %a) ->@ %a@]" name
++  | Omty_functor (Some name mty_arg) mty_res ->
++      fprintf ppf "@[<2>functor@ (%s : %a) ->@ %a@]" (match name with [ None -> "_" | Some n -> n ])
+         print_out_module_type mty_arg print_out_module_type mty_res
+   | Omty_abstract -> () ]
+ and needs_semi =
+diff --git a/camlp4/boot/Camlp4.ml b/camlp4/boot/Camlp4.ml
+index dcb6a996b..32b8a8865 100644
+--- a/camlp4/boot/Camlp4.ml
++++ b/camlp4/boot/Camlp4.ml
+@@ -16216,7 +16216,7 @@ module Struct =
+               | PaVrn (loc, s) ->
+                   mkpat loc (Ppat_variant ((conv_con s), None))
+               | PaLaz (loc, p) -> mkpat loc (Ppat_lazy (patt p))
+-              | PaMod (loc, m) -> mkpat loc (Ppat_unpack (with_loc m loc))
++              | PaMod (loc, m) -> mkpat loc (Ppat_unpack (with_loc (Some m) loc))
+               | PaExc (loc, p) -> mkpat loc (Ppat_exception (patt p))
+               | PaAtt (loc, s, str, e) ->
+                   let e = patt e
+@@ -16483,7 +16483,7 @@ module Struct =
+                      | bi -> mkexp loc (Pexp_let ((mkrf rf), bi, e)))
+               | ExLmd (loc, i, me, e) ->
+                   mkexp loc
+-                    (Pexp_letmodule ((with_loc i loc), (module_expr me),
++                    (Pexp_letmodule ((with_loc (Some i) loc), (module_expr me),
+                        (expr e)))
+               | ExMat (loc, e, a) ->
+                   mkexp loc (Pexp_match ((expr e), (match_case a [])))
+@@ -16735,11 +16735,10 @@ module Struct =
+               | Ast.MtId (loc, i) -> mkmty loc (Pmty_ident (long_uident i))
+               | Ast.MtFun ((loc, "*", Ast.MtNil _, mt)) ->
+                   mkmty loc
+-                    (Pmty_functor ((with_loc "*" loc), None,
+-                       (module_type mt)))
++                    (Pmty_functor (Unit, (module_type mt)))
+               | Ast.MtFun (loc, n, nt, mt) ->
+                   mkmty loc
+-                    (Pmty_functor ((with_loc n loc), (Some (module_type nt)),
++                    (Pmty_functor (Named ((with_loc (Some n) loc), (module_type nt)),
+                        (module_type mt)))
+               | Ast.MtQuo (loc, _) ->
+                   error loc "module type variable not allowed here"
+@@ -16835,7 +16834,7 @@ module Struct =
+                      (Psig_module
+                         {
+                           pmd_loc = mkloc loc;
+-                          pmd_name = with_loc n loc;
++                          pmd_name = with_loc (Some n) loc;
+                           pmd_type = module_type mt;
+                           pmd_attributes = [];
+                         })) ::
+@@ -16890,7 +16889,7 @@ module Struct =
+               | Ast.MbCol (loc, s, mt) ->
+                   {
+                     pmd_loc = mkloc loc;
+-                    pmd_name = with_loc s loc;
++                    pmd_name = with_loc (Some s) loc;
+                     pmd_type = module_type mt;
+                     pmd_attributes = [];
+                   } :: acc
+@@ -16902,7 +16901,7 @@ module Struct =
+               | Ast.MbColEq (loc, s, mt, me) ->
+                   {
+                     pmb_loc = mkloc loc;
+-                    pmb_name = with_loc s loc;
++                    pmb_name = with_loc (Some s) loc;
+                     pmb_expr =
+                       {
+                         pmod_loc = Location.none;
+@@ -16923,11 +16922,10 @@ module Struct =
+                     (Pmod_apply ((module_expr me1), (module_expr me2)))
+               | Ast.MeFun ((loc, "*", Ast.MtNil _, me)) ->
+                   mkmod loc
+-                    (Pmod_functor ((with_loc "*" loc), None,
+-                       (module_expr me)))
++                    (Pmod_functor (Unit, (module_expr me)))
+               | Ast.MeFun (loc, n, mt, me) ->
+                   mkmod loc
+-                    (Pmod_functor ((with_loc n loc), (Some (module_type mt)),
++                    (Pmod_functor (Named ((with_loc (Some n) loc), (module_type mt)),
+                        (module_expr me)))
+               | Ast.MeStr (loc, sl) ->
+                   mkmod loc (Pmod_structure (str_item sl []))
+@@ -17050,7 +17048,7 @@ module Struct =
+                      (Pstr_module
+                         {
+                           pmb_loc = mkloc loc;
+-                          pmb_name = with_loc n loc;
++                          pmb_name = with_loc (Some n) loc;
+                           pmb_expr = module_expr me;
+                           pmb_attributes = [];
+                         })) ::
+diff --git a/configure b/configure
+index 277556b63..7bb18bb6c 100755
+--- a/configure
++++ b/configure
+@@ -39,8 +39,8 @@ if [ $major -lt 4 -o \( $major -eq 4 -a $minor -lt 2 \) ]; then
+     echo "The standalone Camlp4 requires OCaml >= 4.02."
+     echo "For previous versions of OCaml use the Camlp4 distributed with OCaml."
+     exit 2
+-elif [ $major -ne 4 -o $minor -ne 9 ]; then
+-    echo "This version of Camlp4 is for OCaml 4.09 but you are using OCaml $ocaml_version."
++elif [ $major -ne 4 -o $minor -ne 10 ]; then
++    echo "This version of Camlp4 is for OCaml 4.10 but you are using OCaml $ocaml_version."
+     if [ -d .git ] ; then
+       if [ $PINNED -eq 1 ] ; then
+         echo "You've used the wrong opam pin URL for this switch.">&2
+diff --git a/opam b/opam
+index 273e79aab..402d2d0f9 100644
+--- a/opam
++++ b/opam
+@@ -1,5 +1,5 @@
+ opam-version: "1.2"
+-version: "4.09"
++version: "4.10"
+ authors: ["Daniel de Rauglaudre" "Nicolas Pouillard"]
+ maintainer: "ygrek at autistici.org"
+ homepage: "https://github.com/ocaml/camlp4"
+-- 
+2.26.2
+

Deleted: 4.11.patch
===================================================================
--- 4.11.patch	2021-06-11 00:32:03 UTC (rev 961941)
+++ 4.11.patch	2021-06-11 00:32:15 UTC (rev 961942)
@@ -1,226 +0,0 @@
-From 6cd51b88f0d651fc92f686e9b25180ac5e0b7bd4 Mon Sep 17 00:00:00 2001
-From: ygrek <ygrek at autistici.org>
-Date: Sun, 24 May 2020 09:26:27 -0400
-Subject: ci: build for matching branch
-
----
- .travis-ci.sh |  4 ++--
- .travis.yml   | 12 +++++++++++-
- configure     |  6 ++++++
- 3 files changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/.travis-ci.sh b/.travis-ci.sh
-index 532221c01..879afb0d1 100644
---- a/.travis-ci.sh
-+++ b/.travis-ci.sh
-@@ -2,7 +2,7 @@ case $XARCH in
- i386)
-   uname -a
- 
--  git clone git://github.com/ocaml/ocaml -b trunk --depth 1
-+  git clone git://github.com/ocaml/ocaml -b $OCAML_BRANCH --depth 1
-   cd ocaml
-   ./configure
-   make world.opt
-@@ -17,7 +17,7 @@ i386)
-   cd ..
-   rm -rf ocamlbuild
- 
--  ./configure && make && sudo make install
-+  ./configure $CONFIGURE_ARGS && make && sudo make install
-   ;;
- *)
-   echo unknown arch
-diff --git a/.travis.yml b/.travis.yml
-index 3015c16d3..c20da1ef8 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -1,4 +1,14 @@
- language: c
- script: bash -ex .travis-ci.sh
- env:
--   - XARCH=i386
-+  - OCAML_BRANCH=4.10
-+    XARCH=i386
-+  - OCAML_BRANCH=4.11
-+    XARCH=i386
-+    CONFIGURE_ARGS=--skip-version-check
-+  - OCAML_BRANCH=trunk
-+    XARCH=i386
-+    CONFIGURE_ARGS=--skip-version-check
-+jobs:
-+  allow_failures:
-+    - if: CONFIGURE_ARGS = --skip-version-check
-diff --git a/configure b/configure
-index 7bb18bb6c..67ef85e92 100755
---- a/configure
-+++ b/configure
-@@ -7,6 +7,7 @@ unset LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
- set -e
- 
- PINNED=0
-+SKIP_VERSION_CHECK=0
- for i in "$@"; do
-   case $i in
-     --bindir=*)
-@@ -21,6 +22,9 @@ for i in "$@"; do
-     --pinned*)
-       PINNED=1
-       ;;
-+    --skip-version-check)
-+      SKIP_VERSION_CHECK=1
-+      ;;
-     *)
-       echo "usage: ./configure [--bindir=<dir>] [--libdir=<dir>] [--pkgdir=<dir>]" 1>&2
-       exit 2
-@@ -39,6 +43,8 @@ if [ $major -lt 4 -o \( $major -eq 4 -a $minor -lt 2 \) ]; then
-     echo "The standalone Camlp4 requires OCaml >= 4.02."
-     echo "For previous versions of OCaml use the Camlp4 distributed with OCaml."
-     exit 2
-+elif [ $SKIP_VERSION_CHECK -eq 1 ]; then
-+    echo "Skipping OCaml version check"
- elif [ $major -ne 4 -o $minor -ne 10 ]; then
-     echo "This version of Camlp4 is for OCaml 4.10 but you are using OCaml $ocaml_version."
-     if [ -d .git ] ; then
--- 
-2.27.0
-
-
-From aadf267a6b69bce8207caf7d607afd17873e39c2 Mon Sep 17 00:00:00 2001
-From: Kate <kit.ty.kate at disroot.org>
-Date: Tue, 9 Jun 2020 18:49:36 +0100
-Subject: OCaml 4.11 support
-
----
- camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml | 4 ++--
- camlp4/boot/Camlp4.ml                      | 4 ++--
- configure                                  | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
-index 6ba906f4e..3040753d4 100644
---- a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
-+++ b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
-@@ -704,7 +704,7 @@ and row_field =
-         let is_closed = if wildcards = [] then Closed else Open in
-         mkpat loc (Ppat_record (List.map mklabpat ps, is_closed))
-     | PaStr loc s ->
--        mkpat loc (Ppat_constant (Pconst_string (string_of_string_token loc s) None))
-+        mkpat loc (Ppat_constant (Pconst_string (string_of_string_token loc s) (Loc.to_ocaml_location loc) None))
-     | <:patt at loc< ($p1$, $p2$) >> ->
-          mkpat loc (Ppat_tuple
-            (List.map patt (list_of_patt p1 (list_of_patt p2 []))))
-@@ -969,7 +969,7 @@ value varify_constructors var_names =
-           (Pexp_apply (mkexp loc (Pexp_ident (array_function loc "String" "get")))
-             [(Nolabel, expr e1); (Nolabel, expr e2)])
-     | ExStr loc s ->
--        mkexp loc (Pexp_constant (Pconst_string (string_of_string_token loc s) None))
-+        mkexp loc (Pexp_constant (Pconst_string (string_of_string_token loc s) (Loc.to_ocaml_location loc) None))
-     | ExTry loc e a -> mkexp loc (Pexp_try (expr e) (match_case a []))
-     | <:expr at loc< ($e1$, $e2$) >> ->
-          mkexp loc (Pexp_tuple (List.map expr (list_of_expr e1 (list_of_expr e2 []))))
-diff --git a/camlp4/boot/Camlp4.ml b/camlp4/boot/Camlp4.ml
-index 32b8a8865..029e306d7 100644
---- a/camlp4/boot/Camlp4.ml
-+++ b/camlp4/boot/Camlp4.ml
-@@ -16204,7 +16204,7 @@ module Struct =
-               | PaStr (loc, s) ->
-                   mkpat loc
-                     (Ppat_constant
--                       (Pconst_string ((string_of_string_token loc s), None)))
-+                       (Pconst_string ((string_of_string_token loc s), Loc.to_ocaml_location loc, None)))
-               | Ast.PaTup (loc, (Ast.PaCom (_, p1, p2))) ->
-                   mkpat loc
-                     (Ppat_tuple
-@@ -16529,7 +16529,7 @@ module Struct =
-               | ExStr (loc, s) ->
-                   mkexp loc
-                     (Pexp_constant
--                       (Pconst_string ((string_of_string_token loc s), None)))
-+                       (Pconst_string ((string_of_string_token loc s), Loc.to_ocaml_location loc, None)))
-               | ExTry (loc, e, a) ->
-                   mkexp loc (Pexp_try ((expr e), (match_case a [])))
-               | Ast.ExTup (loc, (Ast.ExCom (_, e1, e2))) ->
-diff --git a/configure b/configure
-index 67ef85e92..b7e3b04f8 100755
---- a/configure
-+++ b/configure
-@@ -45,7 +45,7 @@ if [ $major -lt 4 -o \( $major -eq 4 -a $minor -lt 2 \) ]; then
-     exit 2
- elif [ $SKIP_VERSION_CHECK -eq 1 ]; then
-     echo "Skipping OCaml version check"
--elif [ $major -ne 4 -o $minor -ne 10 ]; then
-+elif [ $major -ne 4 -o $minor -ne 11 ]; then
-     echo "This version of Camlp4 is for OCaml 4.10 but you are using OCaml $ocaml_version."
-     if [ -d .git ] ; then
-       if [ $PINNED -eq 1 ] ; then
--- 
-2.27.0
-
-
-From 9ec08f767b6a6f71163a1b5ee6d4f6ceb6c2e915 Mon Sep 17 00:00:00 2001
-From: ygrek <ygrek at autistici.org>
-Date: Tue, 9 Jun 2020 15:23:36 -0400
-Subject: ci: switch to 4.11
-
----
- .travis.yml | 3 ---
- configure   | 8 ++++++--
- opam        | 2 +-
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index c20da1ef8..3b58395fe 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -1,11 +1,8 @@
- language: c
- script: bash -ex .travis-ci.sh
- env:
--  - OCAML_BRANCH=4.10
--    XARCH=i386
-   - OCAML_BRANCH=4.11
-     XARCH=i386
--    CONFIGURE_ARGS=--skip-version-check
-   - OCAML_BRANCH=trunk
-     XARCH=i386
-     CONFIGURE_ARGS=--skip-version-check
-diff --git a/configure b/configure
-index b7e3b04f8..bf1505841 100755
---- a/configure
-+++ b/configure
-@@ -39,14 +39,18 @@ ocaml_version=`ocamlc -version`
- major=`echo $ocaml_version | cut -d. -f1`
- minor=`echo $ocaml_version | cut -d. -f2`
- 
-+camlp4_version=4.11
-+camlp4_major=`echo $camlp4_version | cut -d. -f1`
-+camlp4_minor=`echo $camlp4_version | cut -d. -f2`
-+
- if [ $major -lt 4 -o \( $major -eq 4 -a $minor -lt 2 \) ]; then
-     echo "The standalone Camlp4 requires OCaml >= 4.02."
-     echo "For previous versions of OCaml use the Camlp4 distributed with OCaml."
-     exit 2
- elif [ $SKIP_VERSION_CHECK -eq 1 ]; then
-     echo "Skipping OCaml version check"
--elif [ $major -ne 4 -o $minor -ne 11 ]; then
--    echo "This version of Camlp4 is for OCaml 4.10 but you are using OCaml $ocaml_version."
-+elif [ $major -ne $camlp4_major -o $minor -ne $camlp4_minor ]; then
-+    echo "This version of Camlp4 is for OCaml $camlp4_version but you are using OCaml $ocaml_version."
-     if [ -d .git ] ; then
-       if [ $PINNED -eq 1 ] ; then
-         echo "You've used the wrong opam pin URL for this switch.">&2
-diff --git a/opam b/opam
-index be0ce8b47..7866c87f6 100644
---- a/opam
-+++ b/opam
-@@ -1,5 +1,5 @@
- opam-version: "2.0"
--version: "4.10"
-+version: "4.11"
- authors: ["Daniel de Rauglaudre" "Nicolas Pouillard"]
- maintainer: "ygrek at autistici.org"
- homepage: "https://github.com/camlp4/camlp4"
--- 
-2.27.0
-

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-11 00:32:03 UTC (rev 961941)
+++ PKGBUILD	2021-06-11 00:32:15 UTC (rev 961942)
@@ -1,39 +0,0 @@
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=camlp4
-pkgver=4.10
-pkgrel=1
-pkgdesc='Caml preprocessor and pretty-printer'
-arch=('x86_64')
-license=('GPL2')
-url='https://github.com/ocaml/camlp4/releases'
-depends=('ocaml>=4.11.0')
-makedepends=('git' 'ocamlbuild' 'ocaml-compiler-libs')
-options=('!makeflags' '!emptydirs' 'staticlibs')
-source=("https://github.com/ocaml/camlp4/archive/4.10+1.tar.gz" "4.11.patch")
-sha256sums=('9d9b18810e834ee11e62736a680313cf90c1551e22c084ca2b70c68338eef29e'
-            'd32a4db79e00244eab83da4e811eaea4cc947b3f6dc2a34030d94427ff7f360b')
-
-prepare() {
-  cd "${srcdir}/$pkgname-${pkgver}-1"
-  patch -i "${srcdir}/4.11.patch" -p1
-}
-
-
-build() {
-  cd "${srcdir}/$pkgname-${pkgver}-1"
-  ./configure
-  make all camlp4/META
-}
-
-package() {
-  cd "${srcdir}/$pkgname-${pkgver}-1"
-  make \
-    BINDIR="$pkgdir/usr/bin" \
-    LIBDIR="$pkgdir/usr/lib/ocaml" \
-    PKGDIR="$pkgdir/usr/lib/ocaml" \
-    install install-META
-}
-
-# vim:set ts=2 sw=2 et:

Copied: camlp4/repos/community-x86_64/PKGBUILD (from rev 961941, camlp4/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-06-11 00:32:15 UTC (rev 961942)
@@ -0,0 +1,32 @@
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=camlp4
+pkgver=4.11
+pkgrel=1
+pkgdesc='Caml preprocessor and pretty-printer'
+arch=('x86_64')
+license=('GPL2')
+url='https://github.com/ocaml/camlp4/releases'
+depends=('ocaml>=4.11.0')
+makedepends=('git' 'ocamlbuild' 'ocaml-compiler-libs')
+options=('!makeflags' '!emptydirs' 'staticlibs')
+source=("https://github.com/ocaml/camlp4/archive/$pkgver.tar.gz")
+sha256sums=('52a21e1a011c8697516a91455c19a3b27dedd85c510a32c470f944ccb9331498')
+
+build() {
+  cd "${srcdir}/$pkgname-${pkgver}"
+  ./configure
+  make all camlp4/META
+}
+
+package() {
+  cd "${srcdir}/$pkgname-${pkgver}"
+  make \
+    BINDIR="$pkgdir/usr/bin" \
+    LIBDIR="$pkgdir/usr/lib/ocaml" \
+    PKGDIR="$pkgdir/usr/lib/ocaml" \
+    install install-META
+}
+
+# vim:set ts=2 sw=2 et:



More information about the arch-commits mailing list