CVS commit: src

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Sun Nov  7 18:49:02 UTC 2021

Modified Files:
        src/tests/usr.bin/indent: token_form_feed.c
        src/usr.bin/indent: indent.c

Log Message:
indent: demonstrate disappearing form feed


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/indent/token_form_feed.c
cvs rdiff -u -r1.216 -r1.217 src/usr.bin/indent/indent.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/tests/usr.bin/indent/token_form_feed.c
diff -u src/tests/usr.bin/indent/token_form_feed.c:1.2 src/tests/usr.bin/indent/token_form_feed.c:1.3
--- src/tests/usr.bin/indent/token_form_feed.c:1.2	Sun Nov  7 18:38:34 2021
+++ src/tests/usr.bin/indent/token_form_feed.c	Sun Nov  7 18:49:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: token_form_feed.c,v 1.2 2021/11/07 18:38:34 rillig Exp $ */
+/* $NetBSD: token_form_feed.c,v 1.3 2021/11/07 18:49:02 rillig Exp $ */
 /* $FreeBSD$ */
 
 /*
@@ -19,3 +19,28 @@ void function_1(void);
 
 void function_2(void);
 #indent end
+
+
+/*
+ * Test form feed after 'if (expr)', which is handled in search_stmt.
+ */
+#indent input
+void function(void)
+{
+	if (expr)
+	 /* <-- form feed */
+	{
+	}
+}
+#indent end
+
+#indent run
+void
+function(void)
+{
+	if (expr) {
+		/* $ XXX: The form feed has disappeared. */
+		/* <-- form feed */
+	}
+}
+#indent end

Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.216 src/usr.bin/indent/indent.c:1.217
--- src/usr.bin/indent/indent.c:1.216	Sun Nov  7 18:26:17 2021
+++ src/usr.bin/indent/indent.c	Sun Nov  7 18:49:02 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.c,v 1.216 2021/11/07 18:26:17 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.217 2021/11/07 18:49:02 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)indent.c	5.1
 
 #include <sys/cdefs.h>
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.216 2021/11/07 18:26:17 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.217 2021/11/07 18:49:02 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
 #endif
@@ -475,6 +475,7 @@ search_stmt(lexer_symbol *lsym, bool *fo
 	    search_stmt_newline(force_nl);
 	    break;
 	case lsym_form_feed:
+	    /* XXX: Is simply removed from the source code. */
 	    break;
 	case lsym_comment:
 	    search_stmt_comment();