From 4bd5f21dd6b033bf8c0f1f9549255629325b86eb Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 22 Apr 2020 10:17:03 +0100
Subject: [PATCH] xgettext: Ignore extra Loc.t parameter of Pconst_string.

---
 src/bin/ocaml-xgettext/xgettext.ml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/bin/ocaml-xgettext/xgettext.ml b/src/bin/ocaml-xgettext/xgettext.ml
index 3b42ac1..92ab016 100644
--- a/src/bin/ocaml-xgettext/xgettext.ml
+++ b/src/bin/ocaml-xgettext/xgettext.ml
@@ -121,7 +121,7 @@ let visit_expr (iterator : Ast_iterator.iterator) expr =
   | Pexp_apply
       ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ },
         ( Asttypes.Nolabel,
-          { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } )
+          { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } )
         :: _ )
     when is_like lid [ "s_"; "f_" ] ->
       (* Add a singular / default domain string *)
@@ -129,9 +129,9 @@ let visit_expr (iterator : Ast_iterator.iterator) expr =
   | Pexp_apply
       ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ },
         ( Asttypes.Nolabel,
-          { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } )
+          { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } )
         :: ( Asttypes.Nolabel,
-             { pexp_desc = Pexp_constant (Pconst_string (plural, _)); _ } )
+             { pexp_desc = Pexp_constant (Pconst_string (plural, _, _)); _ } )
            :: _ )
     when is_like lid [ "sn_"; "fn_" ] ->
       (* Add a plural / default domain string *)
@@ -140,7 +140,7 @@ let visit_expr (iterator : Ast_iterator.iterator) expr =
       ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ },
         _
         :: ( Asttypes.Nolabel,
-             { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } )
+             { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } )
            :: _ )
     when is_like lid [ "gettext"; "fgettext" ] ->
       (* Add a singular / default domain string *)
@@ -149,9 +149,9 @@ let visit_expr (iterator : Ast_iterator.iterator) expr =
       ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ },
         _
         :: ( Asttypes.Nolabel,
-             { pexp_desc = Pexp_constant (Pconst_string (domain, _)); _ } )
+             { pexp_desc = Pexp_constant (Pconst_string (domain, _, _)); _ } )
            :: ( Asttypes.Nolabel,
-                { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ }
+                { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ }
               )
               :: _ )
     when is_like lid [ "dgettext"; "fdgettext"; "dcgettext"; "fdcgettext" ] ->
@@ -161,9 +161,9 @@ let visit_expr (iterator : Ast_iterator.iterator) expr =
       ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ },
         _
         :: ( Asttypes.Nolabel,
-             { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } )
+             { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } )
            :: ( Asttypes.Nolabel,
-                { pexp_desc = Pexp_constant (Pconst_string (plural, _)); _ } )
+                { pexp_desc = Pexp_constant (Pconst_string (plural, _, _)); _ } )
               :: _ )
     when is_like lid [ "ngettext"; "fngettext" ] ->
       (* Add a plural / default domain string *)
@@ -172,12 +172,12 @@ let visit_expr (iterator : Ast_iterator.iterator) expr =
       ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ },
         _
         :: ( Asttypes.Nolabel,
-             { pexp_desc = Pexp_constant (Pconst_string (domain, _)); _ } )
+             { pexp_desc = Pexp_constant (Pconst_string (domain, _, _)); _ } )
            :: ( Asttypes.Nolabel,
-                { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ }
+                { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ }
               )
               :: ( Asttypes.Nolabel,
-                   { pexp_desc = Pexp_constant (Pconst_string (plural, _)); _ }
+                   { pexp_desc = Pexp_constant (Pconst_string (plural, _, _)); _ }
                  )
                  :: _ )
     when is_like lid [ "dngettext"; "fdngettext"; "dcngettext"; "fdcngettext" ]
-- 
2.24.1