Module Name: src
Committed By: rillig
Date: Sat Jun 3 21:44:08 UTC 2023
Modified Files:
src/tests/usr.bin/indent: indent_off_on.c lsym_lbrace.c lsym_rbrace.c
src/usr.bin/indent: indent.c
Log Message:
indent: fix indentation of adjacent '{'
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/usr.bin/indent/indent_off_on.c
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/indent/lsym_lbrace.c
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/indent/lsym_rbrace.c
cvs rdiff -u -r1.316 -r1.317 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/indent_off_on.c
diff -u src/tests/usr.bin/indent/indent_off_on.c:1.13 src/tests/usr.bin/indent/indent_off_on.c:1.14
--- src/tests/usr.bin/indent/indent_off_on.c:1.13 Sun May 21 10:18:44 2023
+++ src/tests/usr.bin/indent/indent_off_on.c Sat Jun 3 21:44:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: indent_off_on.c,v 1.13 2023/05/21 10:18:44 rillig Exp $ */
+/* $NetBSD: indent_off_on.c,v 1.14 2023/06/03 21:44:08 rillig Exp $ */
/*
* Tests for the comments 'INDENT OFF' and 'INDENT ON', which temporarily
@@ -134,8 +134,8 @@ int format( void ) {{{
/* No formatting takes place here. */
int format( void ) {{{
/*INDENT ON*/
-}
-}
+ }
+ }
}
//indent end
Index: src/tests/usr.bin/indent/lsym_lbrace.c
diff -u src/tests/usr.bin/indent/lsym_lbrace.c:1.6 src/tests/usr.bin/indent/lsym_lbrace.c:1.7
--- src/tests/usr.bin/indent/lsym_lbrace.c:1.6 Sun Apr 24 09:04:12 2022
+++ src/tests/usr.bin/indent/lsym_lbrace.c Sat Jun 3 21:44:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lsym_lbrace.c,v 1.6 2022/04/24 09:04:12 rillig Exp $ */
+/* $NetBSD: lsym_lbrace.c,v 1.7 2023/06/03 21:44:08 rillig Exp $ */
/*
* Tests for the token lsym_lbrace, which represents a '{' in these contexts:
@@ -40,11 +40,12 @@ void function(void) {{{ body(); }}}
//indent run
void
function(void)
-/* $ FIXME: Each '{' must be properly indented. */
-{{{
+{
+ {
+ {
body();
-}
-}
+ }
+ }
}
//indent end
Index: src/tests/usr.bin/indent/lsym_rbrace.c
diff -u src/tests/usr.bin/indent/lsym_rbrace.c:1.4 src/tests/usr.bin/indent/lsym_rbrace.c:1.5
--- src/tests/usr.bin/indent/lsym_rbrace.c:1.4 Sun Apr 24 09:04:12 2022
+++ src/tests/usr.bin/indent/lsym_rbrace.c Sat Jun 3 21:44:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: lsym_rbrace.c,v 1.4 2022/04/24 09:04:12 rillig Exp $ */
+/* $NetBSD: lsym_rbrace.c,v 1.5 2023/06/03 21:44:08 rillig Exp $ */
/*
* Tests for the token lsym_rbrace, which represents a '}' in these contexts:
@@ -43,11 +43,12 @@ void function(void) {{{ body(); }}}
//indent run
void
function(void)
-/* $ FIXME: Each '{' must be properly indented. */
-{{{
+{
+ {
+ {
body();
-}
-}
+ }
+ }
}
//indent end
Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.316 src/usr.bin/indent/indent.c:1.317
--- src/usr.bin/indent/indent.c:1.316 Sat Jun 3 21:24:26 2023
+++ src/usr.bin/indent/indent.c Sat Jun 3 21:44:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.316 2023/06/03 21:24:26 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.317 2023/06/03 21:44:08 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: indent.c,v 1.316 2023/06/03 21:24:26 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.317 2023/06/03 21:44:08 rillig Exp $");
#include <sys/param.h>
#include <err.h>
@@ -425,7 +425,8 @@ maybe_break_line(lexer_symbol lsym)
return;
if (lsym == lsym_semicolon)
return;
- if (lsym == lsym_lbrace && opt.brace_same_line)
+ if (lsym == lsym_lbrace && opt.brace_same_line
+ && ps.prev_token != lsym_lbrace)
return;
if (opt.verbose)
