From: Bruno Haible <bruno@clisp.org>
Date: Sun, 7 Jan 2018 02:20:06 +0000 (+0100)
Subject: xgettext: Support 'p'/'P' exponent markers in number tokens also in C.
X-Git-Tag: v0.20~424
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=746bd58ccb2dedb94a20e2ccabaf593e0831dae9;p=thirdparty%2Fgettext.git

xgettext: Support 'p'/'P' exponent markers in number tokens also in C.

* gettext-tools/src/x-c.c (phase5_get): Recognize sign after 'p' or 'P' also
in C.
* NEWS: Update.
---

diff --git a/NEWS b/NEWS
index bdfb2689e..57933c35d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,12 @@
   - update-po target in Makefile.in.in now uses msgfmt --previous.
 
 * Programming languages support:
+  - C, C++:
+    xgettext now supports 'p'/'P' exponent markers in number tokens, as
+    specified in C99 and C++17.
   - C++:
-    xgettext now supports single-quotes and 'p'/'P' exponent markers in
-    number tokens, as specified in C++14 and C++17, respectively.
+    xgettext now supports single-quotes in number tokens, as specified in
+    C++14.
   - Java:
     xgettext now supports UTF-8 encoded .properties files (a new feature
     of Java 9).
diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index 8debf01cf..3dd25499a 100644
--- a/gettext-tools/src/x-c.c
+++ b/gettext-tools/src/x-c.c
@@ -1404,9 +1404,8 @@ phase5_get (token_ty *tp)
             {
             case 'p':
             case 'P':
-              if (!cxx_extensions)
-                continue;
-              /* In C++17, 'p' and 'P' can be used as an exponent marker.  */
+              /* In C99 and C++17, 'p' and 'P' can be used as an exponent
+                 marker.  */
               /* FALLTHROUGH */
             case 'e':
             case 'E':