GNU logs - #75335, boring messages

Message sent to bug-cppi@HIDDEN:

Subject: bug#75335: cppi: Support C23 #elifdef and #elifndef
Resent-From: Collin Funk <collinfunk38@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-cppi@HIDDEN
Resent-Date: Sat, 04 Jan 2025 02:49:01 +0000
Resent-Message-ID: <handler.75335.B.173595889612741 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 75335 <at> debbugs.gnu.org, jim@HIDDEN
From: Collin Funk <collinfunk38@HIDDEN>
Date: Fri, 03 Jan 2025 18:47:57 -0800
Message-ID: <87r05ji9b6.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Received-SPF: pass client-ip=2607:f8b0:4864:20::102e;
 envelope-from=collinfunk38@HIDDEN; helo=mail-pj1-x102e.google.com
X-Spam_score_int: -17
X-Spam_score: -1.8
X-Spam_bar: -
X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.2 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  Hi Jim, C23 added #elifdef and #elifndef. I've attached a
 patch to have cppi recognize them. Collin 
 Content analysis details:   (1.2 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
 no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org]
 0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
 provider (collinfunk38[at]gmail.com)
 1.0 SPF_SOFTFAIL           SPF: sender does not match SPF record (softfail)
 -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends
 in digit (collinfunk38[at]gmail.com)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.2 (/)

--=-=-=
Content-Type: text/plain

Hi Jim,

C23 added #elifdef and #elifndef. I've attached a patch to have cppi
recognize them.

Collin


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
 filename=0001-cppi-Support-C23-elifdef-and-elifndef.patch

From 02d7a219c9adaa159d5eec4ea011892859da1eb1 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.funk1@HIDDEN>
Date: Fri, 3 Jan 2025 18:38:09 -0800
Subject: [PATCH] cppi: Support C23 #elifdef and #elifndef

* src/cpp.gp: Add EIC_ELIFDEF and EIC_ELIFNDEF.
* src/cppi.l (emit_indented_cpp, [^a-zA-Z_\n]): Check for EIC_ELIFDEF
and EIC_ELIFNDEF.
* tests/e10: New file.
* tests/e11: New file.
* tests/f10: New file.
* tests/f11: New file.
* tests/local.mk (TESTS): Add the new tests.
* NEWS: Mention the change.
---
 NEWS           |  3 +++
 src/cpp.gp     |  2 ++
 src/cppi.l     |  5 ++++-
 tests/e10      | 19 +++++++++++++++++++
 tests/e11      | 19 +++++++++++++++++++
 tests/f10      | 25 +++++++++++++++++++++++++
 tests/f11      | 21 +++++++++++++++++++++
 tests/local.mk |  4 ++++
 8 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100755 tests/e10
 create mode 100755 tests/e11
 create mode 100755 tests/f10
 create mode 100755 tests/f11

diff --git a/NEWS b/NEWS
index 68ecb03..a600801 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ GNU cppi NEWS                                               -*- outline -*-
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** Improvements
+
+  cppi now supports the #elifdef and #elifndef directives added by C23.
 
 * Noteworthy changes in release 1.18 (2013-03-16) [stable]
 
diff --git a/src/cpp.gp b/src/cpp.gp
index 4841aa7..ca865cf 100644
--- a/src/cpp.gp
+++ b/src/cpp.gp
@@ -5,6 +5,8 @@ if, EIC_IF
 ifdef, EIC_IFDEF
 ifndef, EIC_IFNDEF
 elif, EIC_ELIF
+elifdef, EIC_ELIFDEF
+elifndef, EIC_ELIFNDEF
 else, EIC_ELSE
 endif, EIC_ENDIF
 define, EIC_DEFINE
diff --git a/src/cppi.l b/src/cppi.l
index b8dba99..f393be4 100644
--- a/src/cppi.l
+++ b/src/cppi.l
@@ -297,6 +297,8 @@ emit_indented_cpp (char const *in_file, unsigned int line_number,
 
     case EIC_ELSE:
     case EIC_ELIF:
+    case EIC_ELIFDEF:
+    case EIC_ELIFNDEF:
       if (i_depth <= initial_i_depth)
         {
           if (!list_files_only)
@@ -477,7 +479,8 @@ b [^a-zA-Z_\n]
 
   t = emit_indented_cpp (in_file, lineno, yytext, yyleng, &fail);
 
-  if (t == EIC_IF || t == EIC_IFNDEF || t == EIC_ELIF || t == EIC_DEFINE)
+  if (t == EIC_IF || t == EIC_IFNDEF || t == EIC_ELIF || t == EIC_ELIFDEF
+      || t == EIC_ELIFNDEF || t == EIC_DEFINE)
     {
       int c;
       if (inhibit_output)
diff --git a/tests/e10 b/tests/e10
new file mode 100755
index 0000000..679c6c3
--- /dev/null
+++ b/tests/e10
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+t=`basename $0`
+
+cat > $t.I <<\EOF
+#elifdef(FOO)
+EOF
+
+cat > $t.EO <<\EOF
+#elifdef (FOO)
+EOF
+
+cat > $t.Ee <<\EOF
+cppi: standard input: line 1: found #elifdef without matching #if
+EOF
+
+expected_status=2
+
+. $top_srcdir/tests/test-common
diff --git a/tests/e11 b/tests/e11
new file mode 100755
index 0000000..1399e01
--- /dev/null
+++ b/tests/e11
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+t=`basename $0`
+
+cat > $t.I <<\EOF
+#elifndef(FOO)
+EOF
+
+cat > $t.EO <<\EOF
+#elifndef (FOO)
+EOF
+
+cat > $t.Ee <<\EOF
+cppi: standard input: line 1: found #elifndef without matching #if
+EOF
+
+expected_status=2
+
+. $top_srcdir/tests/test-common
diff --git a/tests/f10 b/tests/f10
new file mode 100755
index 0000000..9c7e0d0
--- /dev/null
+++ b/tests/f10
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+t=`basename $0`
+
+cat > $t.I <<\EOF
+#if(FOO)
+#elifdef(NO_BLANK_AFTER_ELIF)
+#error
+#endif
+EOF
+
+cat > $t.EO <<\EOF
+#if (FOO)
+#elifdef (NO_BLANK_AFTER_ELIF)
+# error
+#endif
+EOF
+
+cat > $t.Ee <<\EOF
+EOF
+
+options=
+expected_status=0
+
+. $top_srcdir/tests/test-common
diff --git a/tests/f11 b/tests/f11
new file mode 100755
index 0000000..bcd8042
--- /dev/null
+++ b/tests/f11
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+t=`basename $0`
+
+cat > $t.I <<\EOF
+#if (FOO)
+#elifndef (NO_BLANK_AFTER_ELIF)
+# undef FOOBAR
+#endif
+EOF
+
+cat > $t.EO <<\EOF
+EOF
+
+cat > $t.Ee <<\EOF
+EOF
+
+options=-c
+expected_status=0
+
+. $top_srcdir/tests/test-common
diff --git a/tests/local.mk b/tests/local.mk
index e227e7b..94ecd90 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -16,6 +16,8 @@ TESTS = \
   tests/e7	\
   tests/e8	\
   tests/e9	\
+  tests/e10	\
+  tests/e11	\
   tests/f1	\
   tests/f2	\
   tests/f3	\
@@ -24,6 +26,8 @@ TESTS = \
   tests/f7	\
   tests/f8	\
   tests/f9	\
+  tests/f10	\
+  tests/f11	\
   tests/stringify-1	\
   tests/stringify-2	\
   tests/stringify-3	\
-- 
2.47.1


--=-=-=--

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Collin Funk <collinfunk38@HIDDEN>
Subject: bug#75335: Acknowledgement (cppi: Support C23 #elifdef and #elifndef)
Message-ID: <handler.75335.B.173595889612741.ack <at> debbugs.gnu.org>
References: <87r05ji9b6.fsf@HIDDEN>
X-Gnu-PR-Message: ack 75335
X-Gnu-PR-Package: cppi
Reply-To: 75335 <at> debbugs.gnu.org
Date: Sat, 04 Jan 2025 02:49:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 bug-cppi@HIDDEN

If you wish to submit further information on this problem, please
send it to 75335 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
75335: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75335
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to bug-cppi@HIDDEN:

Subject: bug#75335: cppi: Support C23 #elifdef and #elifndef
Resent-From: Jim Meyering <jim@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-cppi@HIDDEN
Resent-Date: Sat, 04 Jan 2025 06:48:01 +0000
Resent-Message-ID: <handler.75335.B.173597325524030 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Collin Funk <collinfunk38@HIDDEN>
Cc: 75335 <at> debbugs.gnu.org
MIME-Version: 1.0
References: <87r05ji9b6.fsf@HIDDEN>
In-Reply-To: <87r05ji9b6.fsf@HIDDEN>
From: Jim Meyering <jim@HIDDEN>
Date: Fri, 3 Jan 2025 22:47:10 -0800
Message-ID: <CA+8g5KG-bamjND9EuHZfq0f=S_o=54GoQK4YOyS+S=Aq2Jt_ng@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass client-ip=209.85.216.41; envelope-from=meyering@HIDDEN;
 helo=mail-pj1-f41.google.com
X-Spam_score_int: -16
X-Spam_score: -1.7
X-Spam_bar: -
X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9,
 FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001,
 HEADER_FROM_DIFFERENT_DOMAINS=0.204, RCVD_IN_DNSWL_NONE=-0.0001,
 RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001,
 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
 SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.2 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.

 Content preview:  On Fri, Jan 3, 2025 at =?UTF-8?Q?6:48=E2=80=AFPM?= Collin Funk <collinfunk38@HIDDEN>
    wrote: > Hi Jim, > > C23 added #elifdef and #elifndef. I've attached a patch
    to have cppi > recognize them. Hi Collin, thank you. That looked perfect,
    so I pushed it as-is. 

 Content analysis details:   (1.2 points, 10.0 required)

  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
                             provider (meyering[at]gmail.com)
  1.0 SPF_SOFTFAIL           SPF: sender does not match SPF record (softfail)
 -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
  0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level
                             mail domains are different
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
                              no trust
                             [2001:470:142:0:0:0:0:17 listed in]
                             [list.dnswl.org]
  0.0 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and
                             EnvelopeFrom freemail headers are
                             different
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.2 (/)

On Fri, Jan 3, 2025 at 6:48=E2=80=AFPM Collin Funk <collinfunk38@HIDDEN>=
 wrote:
> Hi Jim,
>
> C23 added #elifdef and #elifndef. I've attached a patch to have cppi
> recognize them.

Hi Collin, thank you. That looked perfect, so I pushed it as-is.

The size of this change is borderline, but ok for a first contribution
with no copyright on file.
If you make a future change to cppi, please submit the usual copyright
assignment.

Last modified: Sun, 12 Jan 2025 05:45:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.