Module Name: src
Committed By: rillig
Date: Thu May 11 10:39:26 UTC 2023
Modified Files:
src/tests/usr.bin/indent: lsym_do.c
src/usr.bin/indent: indent.c
Log Message:
indent: remove unnecessary assignments to last_else
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/indent/lsym_do.c
cvs rdiff -u -r1.246 -r1.247 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/lsym_do.c
diff -u src/tests/usr.bin/indent/lsym_do.c:1.4 src/tests/usr.bin/indent/lsym_do.c:1.5
--- src/tests/usr.bin/indent/lsym_do.c:1.4 Sun Apr 24 10:36:37 2022
+++ src/tests/usr.bin/indent/lsym_do.c Thu May 11 10:39:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lsym_do.c,v 1.4 2022/04/24 10:36:37 rillig Exp $ */
+/* $NetBSD: lsym_do.c,v 1.5 2023/05/11 10:39:26 rillig Exp $ */
/*
* Tests for the token lsym_do, which represents the keyword 'do' that starts
@@ -28,3 +28,24 @@ function(void)
while (cond);
}
//indent end
+
+
+//indent input
+void
+else_do(int i)
+{
+ if (i > 0) return; else do {} while (0);
+}
+//indent end
+
+//indent run
+void
+else_do(int i)
+{
+ if (i > 0)
+ return;
+ else
+ do {
+ } while (0);
+}
+//indent end
Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.246 src/usr.bin/indent/indent.c:1.247
--- src/usr.bin/indent/indent.c:1.246 Thu May 11 09:28:53 2023
+++ src/usr.bin/indent/indent.c Thu May 11 10:39:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.246 2023/05/11 09:28:53 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.247 2023/05/11 10:39:25 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.246 2023/05/11 09:28:53 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.247 2023/05/11 10:39:25 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
#endif
@@ -794,7 +794,7 @@ process_rbrace(bool *spaced_expr, int *d
}
static void
-process_do(bool *force_nl, bool *last_else)
+process_do(bool *force_nl)
{
ps.in_stmt_or_decl = false;
@@ -806,12 +806,11 @@ process_do(bool *force_nl, bool *last_el
}
*force_nl = true; /* following stuff must go onto new line */
- *last_else = false;
parse(psym_do);
}
static void
-process_else(bool *force_nl, bool *last_else)
+process_else(bool *force_nl)
{
ps.in_stmt_or_decl = false;
@@ -823,7 +822,6 @@ process_else(bool *force_nl, bool *last_
}
*force_nl = true; /* following stuff must go onto new line */
- *last_else = true;
parse(psym_else);
}
@@ -1057,7 +1055,7 @@ process_preprocessing(void)
*/
}
-static void __attribute__((__noreturn__))
+__dead static void
main_loop(void)
{
bool force_nl = false; /* when true, code must be broken */
@@ -1181,11 +1179,12 @@ main_loop(void)
goto copy_token;
case lsym_do:
- process_do(&force_nl, &last_else);
+ process_do(&force_nl);
goto copy_token;
case lsym_else:
- process_else(&force_nl, &last_else);
+ process_else(&force_nl);
+ last_else = true;
goto copy_token;
case lsym_typedef:
