New Upstream Release - camlp4
Ready changes
Summary
Merged new upstream version: 4.14+1 (was: 4.13+1).
Diff
diff --git a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
index bd55af6..131583a 100644
--- a/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
+++ b/camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml
@@ -420,6 +420,7 @@ and row_field =
; pcd_res = None
; pcd_loc = mkloc loc
; pcd_attributes = []
+ ; pcd_vars = []
}
| <:ctyp@loc< $id:(<:ident@sloc< $uid:s$ >>)$ of $t$ >> ->
{ pcd_name = with_loc (conv_con s) sloc
@@ -427,6 +428,7 @@ and row_field =
; pcd_res = None
; pcd_loc = mkloc loc
; pcd_attributes = []
+ ; pcd_vars = []
}
| <:ctyp@loc< $id:(<:ident@sloc< $uid:s$ >>)$ : ($t$ -> $u$) >> ->
{ pcd_name = with_loc (conv_con s) sloc
@@ -434,6 +436,7 @@ and row_field =
; pcd_res = Some (ctyp u)
; pcd_loc = mkloc loc
; pcd_attributes = []
+ ; pcd_vars = []
}
| <:ctyp@loc< $id:(<:ident@sloc< $uid:s$ >>)$ : $t$ >> ->
{ pcd_name = with_loc (conv_con s) sloc
@@ -441,28 +444,29 @@ and row_field =
; pcd_res = Some (ctyp t)
; pcd_loc = mkloc loc
; pcd_attributes = []
+ ; pcd_vars = []
}
| _ -> assert False (*FIXME*) ];
value mkextension_constructor =
fun
[ <:ctyp@loc< $id:(<:ident@sloc< $uid:s$ >>)$ >> ->
{pext_name = with_loc (conv_con s) sloc;
- pext_kind = Pext_decl (Pcstr_tuple []) None;
+ pext_kind = Pext_decl [] (Pcstr_tuple []) None;
pext_loc = mkloc loc;
pext_attributes = []}
| <:ctyp@loc< $id:(<:ident@sloc< $uid:s$ >>)$ of $t$ >> ->
{pext_name = with_loc (conv_con s) sloc;
- pext_kind = Pext_decl (Pcstr_tuple (List.map ctyp (list_of_ctyp t []))) None;
+ pext_kind = Pext_decl [] (Pcstr_tuple (List.map ctyp (list_of_ctyp t []))) None;
pext_loc = mkloc loc;
pext_attributes = []}
| <:ctyp@loc< $id:(<:ident@sloc< $uid:s$ >>)$ : ($t$ -> $u$) >> ->
{pext_name = with_loc (conv_con s) sloc;
- pext_kind = Pext_decl (Pcstr_tuple (List.map ctyp (list_of_ctyp t []))) (Some (ctyp u));
+ pext_kind = Pext_decl [] (Pcstr_tuple (List.map ctyp (list_of_ctyp t []))) (Some (ctyp u));
pext_loc = mkloc loc;
pext_attributes = []}
| <:ctyp@loc< $id:(<:ident@sloc< $uid:s$ >>)$ : $t$ >> ->
{pext_name = with_loc (conv_con s) sloc;
- pext_kind = Pext_decl (Pcstr_tuple []) (Some (ctyp t));
+ pext_kind = Pext_decl [] (Pcstr_tuple []) (Some (ctyp t));
pext_loc = mkloc loc;
pext_attributes = []}
| <:ctyp@loc< $id:(<:ident@sloc< $uid:s$ >>)$ == $id:r$ >> ->
@@ -1163,7 +1167,7 @@ value varify_constructors var_names =
[mksig loc (Psig_exception { ptyexn_constructor =
{
pext_name = with_loc (conv_con s) loc;
- pext_kind = Pext_decl (((Pcstr_tuple []), None));
+ pext_kind = Pext_decl (([], (Pcstr_tuple []), None));
pext_attributes = [];
pext_loc = mkloc loc;
};
@@ -1176,7 +1180,7 @@ value varify_constructors var_names =
; ptyexn_attributes = []
; ptyexn_constructor =
{ pext_name = with_loc (conv_con s) loc
- ; pext_kind = Pext_decl (Pcstr_tuple (List.map ctyp (list_of_ctyp t [])), None)
+ ; pext_kind = Pext_decl ([], Pcstr_tuple (List.map ctyp (list_of_ctyp t [])), None)
; pext_attributes = []
; pext_loc = mkloc loc } })
:: l]
@@ -1271,7 +1275,7 @@ value varify_constructors var_names =
;ptyexn_attributes=[]
; ptyexn_constructor =
{ pext_name = with_loc (conv_con s) loc
- ; pext_kind = Pext_decl (Pcstr_tuple [], None)
+ ; pext_kind = Pext_decl ([], Pcstr_tuple [], None)
; pext_attributes = []
; pext_loc = mkloc loc } })
:: l ]
@@ -1279,7 +1283,7 @@ value varify_constructors var_names =
[mkstr loc (Pstr_exception {ptyexn_loc=mkloc loc
;ptyexn_attributes=[]
; ptyexn_constructor ={ pext_name = with_loc (conv_con s) loc
- ; pext_kind = Pext_decl (Pcstr_tuple (List.map ctyp (list_of_ctyp t [])), None)
+ ; pext_kind = Pext_decl ([], Pcstr_tuple (List.map ctyp (list_of_ctyp t [])), None)
; pext_attributes = []
; pext_loc = mkloc loc } })
:: l ]
diff --git a/camlp4/Camlp4Top/Rprint.ml b/camlp4/Camlp4Top/Rprint.ml
index c409209..557ae67 100644
--- a/camlp4/Camlp4Top/Rprint.ml
+++ b/camlp4/Camlp4Top/Rprint.ml
@@ -226,7 +226,12 @@ and print_simple_out_type ppf =
| Otyp_attribute (_, _) -> ()]
in
print_tkind ppf
-and print_out_constr ppf (name, tyl, ret) =
+and print_out_constr ppf constr =
+ let {
+ ocstr_name = name;
+ ocstr_args = tyl;
+ ocstr_return_type = ret;
+ } = constr in
match (tyl,ret) with
[ ([], None) -> fprintf ppf "%s" name
| ([], Some r) -> fprintf ppf "@[<2>%s:@ %a@]" name print_out_type r
@@ -261,7 +266,7 @@ and print_out_extension_constructor ppf ext =
fprintf ppf "@[<hv 2>type %t +=%s@;<1 2>%a@]"
print_extended_type
(if ext.oext_private = Asttypes.Private then " private" else "")
- print_out_constr (ext.oext_name, ext.oext_args, ext.oext_ret_type)
+ print_out_constr {ocstr_name = ext.oext_name; ocstr_args = ext.oext_args; ocstr_return_type = ext.oext_ret_type}
and print_fields rest ppf =
fun
[ [] ->
@@ -409,7 +414,7 @@ and print_out_sig_item ppf =
name Toploop.print_out_class_type.val clt
| Osig_typext ext Oext_exception ->
fprintf ppf "@[<2>exception %a@]"
- print_out_constr (ext.oext_name, ext.oext_args, ext.oext_ret_type)
+ print_out_constr {ocstr_name = ext.oext_name; ocstr_args = ext.oext_args; ocstr_return_type = ext.oext_ret_type}
| Osig_typext ext _es ->
print_out_extension_constructor ppf ext
| Osig_modtype name Omty_abstract ->
diff --git a/camlp4/boot/Camlp4.ml b/camlp4/boot/Camlp4.ml
index 8218aca..fde630a 100644
--- a/camlp4/boot/Camlp4.ml
+++ b/camlp4/boot/Camlp4.ml
@@ -15835,6 +15835,7 @@ module Struct =
pcd_res = None;
pcd_loc = mkloc loc;
pcd_attributes = [];
+ pcd_vars = [];
}
| Ast.TyOf (loc, (Ast.TyId (_, (Ast.IdUid (sloc, s)))), t) ->
{
@@ -15844,6 +15845,7 @@ module Struct =
pcd_res = None;
pcd_loc = mkloc loc;
pcd_attributes = [];
+ pcd_vars = [];
}
| Ast.TyCol (loc, (Ast.TyId (_, (Ast.IdUid (sloc, s)))),
(Ast.TyArr (_, t, u))) ->
@@ -15854,6 +15856,7 @@ module Struct =
pcd_res = Some (ctyp u);
pcd_loc = mkloc loc;
pcd_attributes = [];
+ pcd_vars = [];
}
| Ast.TyCol (loc, (Ast.TyId (_, (Ast.IdUid (sloc, s)))), t) ->
{
@@ -15862,6 +15865,7 @@ module Struct =
pcd_res = Some (ctyp t);
pcd_loc = mkloc loc;
pcd_attributes = [];
+ pcd_vars = [];
}
| _ -> assert false
@@ -15870,7 +15874,7 @@ module Struct =
| Ast.TyId (loc, (Ast.IdUid (sloc, s))) ->
{
pext_name = with_loc (conv_con s) sloc;
- pext_kind = Pext_decl ((Pcstr_tuple []), None);
+ pext_kind = Pext_decl ([], (Pcstr_tuple []), None);
pext_loc = mkloc loc;
pext_attributes = [];
}
@@ -15879,7 +15883,7 @@ module Struct =
pext_name = with_loc (conv_con s) sloc;
pext_kind =
Pext_decl
- ((Pcstr_tuple (List.map ctyp (list_of_ctyp t []))),
+ ([], (Pcstr_tuple (List.map ctyp (list_of_ctyp t []))),
None);
pext_loc = mkloc loc;
pext_attributes = [];
@@ -15890,7 +15894,7 @@ module Struct =
pext_name = with_loc (conv_con s) sloc;
pext_kind =
Pext_decl
- ((Pcstr_tuple (List.map ctyp (list_of_ctyp t []))),
+ ([], (Pcstr_tuple (List.map ctyp (list_of_ctyp t []))),
(Some (ctyp u)));
pext_loc = mkloc loc;
pext_attributes = [];
@@ -15898,7 +15902,7 @@ module Struct =
| Ast.TyCol (loc, (Ast.TyId (_, (Ast.IdUid (sloc, s)))), t) ->
{
pext_name = with_loc (conv_con s) sloc;
- pext_kind = Pext_decl ((Pcstr_tuple []), (Some (ctyp t)));
+ pext_kind = Pext_decl ([], (Pcstr_tuple []), (Some (ctyp t)));
pext_loc = mkloc loc;
pext_attributes = [];
}
@@ -16785,7 +16789,7 @@ module Struct =
{
pext_name = with_loc (conv_con s) loc;
pext_kind =
- Pext_decl (((Pcstr_tuple []), None));
+ Pext_decl ([], (Pcstr_tuple []), None);
pext_attributes = [];
pext_loc = mkloc loc;
};
@@ -16805,9 +16809,9 @@ module Struct =
pext_name = with_loc (conv_con s) loc;
pext_kind =
Pext_decl
- (((Pcstr_tuple
+ ([], (Pcstr_tuple
(List.map ctyp (list_of_ctyp t []))),
- None));
+ None);
pext_attributes = [];
pext_loc = mkloc loc;
};
@@ -16979,7 +16983,7 @@ module Struct =
{
pext_name = with_loc (conv_con s) loc;
pext_kind =
- Pext_decl (((Pcstr_tuple []), None));
+ Pext_decl ([], (Pcstr_tuple []), None);
pext_attributes = [];
pext_loc = mkloc loc;
};
@@ -16998,9 +17002,9 @@ module Struct =
pext_name = with_loc (conv_con s) loc;
pext_kind =
Pext_decl
- (((Pcstr_tuple
+ ([], (Pcstr_tuple
(List.map ctyp (list_of_ctyp t []))),
- None));
+ None);
pext_attributes = [];
pext_loc = mkloc loc;
};
diff --git a/configure b/configure
index b2e3b21..b09b301 100755
--- a/configure
+++ b/configure
@@ -39,7 +39,7 @@ ocaml_version=`ocamlc -version`
major=`echo $ocaml_version | cut -d. -f1`
minor=`echo $ocaml_version | cut -d. -f2`
-camlp4_version=4.13
+camlp4_version=4.14
camlp4_major=`echo $camlp4_version | cut -d. -f1`
camlp4_minor=`echo $camlp4_version | cut -d. -f2`
diff --git a/debian/changelog b/debian/changelog
index 5f01a92..e4762d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+camlp4 (4.14+1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sat, 25 Feb 2023 17:18:10 -0000
+
camlp4 (4.13+1-1) unstable; urgency=medium
* New upstream release
diff --git a/opam b/opam
index 9bc7b72..67729cb 100644
--- a/opam
+++ b/opam
@@ -1,5 +1,5 @@
opam-version: "2.0"
-version: "4.13"
+version: "4.14"
authors: ["Daniel de Rauglaudre" "Nicolas Pouillard"]
maintainer: "ygrek@autistici.org"
homepage: "https://github.com/camlp4/camlp4"
More details
Historical runs
- failed: make[2]: *** [debian/rules:18: override_dh_auto_configure] Error 2
- push-failed: Failed to push result branch: Connection closed: Connection closed early The remote server unexpectedly closed the connection.
- push-failed: Failed to push result branch: Connection closed: Connection closed early The remote server unexpectedly closed the connection.
- build-failed-stage-build: make[2]: *** [debian/rules:18: override_dh_auto_configure] Error 2