Fri Jun 9 07:20:31 2023 UTC ()
indent: format its own code
(rillig)
diff -r1.341 -r1.342 src/usr.bin/indent/indent.c
diff -r1.205 -r1.206 src/usr.bin/indent/io.c
diff -r1.217 -r1.218 src/usr.bin/indent/lexi.c
diff -r1.69 -r1.70 src/usr.bin/indent/parse.c
diff -r1.157 -r1.158 src/usr.bin/indent/pr_comment.c
--- src/usr.bin/indent/indent.c 2023/06/08 21:18:54 1.341
+++ src/usr.bin/indent/indent.c 2023/06/09 07:20:30 1.342
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.341 2023/06/08 21:18:54 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.342 2023/06/09 07:20:30 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: indent.c,v 1.341 2023/06/08 21:18:54 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.342 2023/06/09 07:20:30 rillig Exp $");
#include <sys/param.h>
#include <err.h>
@@ -569,7 +569,7 @@
indent_declarator(ind, ps.tabs_to_var);
ps.want_blank = false;
} else if ((token.s[0] == '+' || token.s[0] == '-')
- && code.len > 0 && code.s[code.len - 1] == token.s[0])
+ && code.len > 0 && code.s[code.len - 1] == token.s[0])
ps.want_blank = true;
if (ps.want_blank)
@@ -682,7 +682,7 @@
if (ps.prev_lsym == lsym_rparen
&& ps.psyms.top >= 2
&& !(psym == psym_for_exprs || psym == psym_if_expr
- || psym == psym_switch_expr || psym == psym_while_expr)) {
+ || psym == psym_switch_expr || psym == psym_while_expr)) {
ps.block_init = true;
ps.init_or_struct = true;
}
@@ -901,8 +901,8 @@
ps.block_init = false;
int typical_varname_length = 8;
if (ps.break_after_comma && (opt.break_after_comma ||
- ind_add(compute_code_indent(), code.s, code.len)
- >= opt.max_line_length - typical_varname_length))
+ ind_add(compute_code_indent(), code.s, code.len)
+ >= opt.max_line_length - typical_varname_length))
ps.force_nl = true;
}
}
--- src/usr.bin/indent/io.c 2023/06/09 06:36:57 1.205
+++ src/usr.bin/indent/io.c 2023/06/09 07:20:30 1.206
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.205 2023/06/09 06:36:57 rillig Exp $ */
+/* $NetBSD: io.c,v 1.206 2023/06/09 07:20:30 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: io.c,v 1.205 2023/06/09 06:36:57 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.206 2023/06/09 07:20:30 rillig Exp $");
#include <stdio.h>
@@ -375,7 +375,7 @@
if (ps.extra_expr_indent == eei_last)
ps.extra_expr_indent = eei_no;
if (!(ps.psyms.sym[ps.psyms.top] == psym_if_expr_stmt_else
- && ps.nparen > 0))
+ && ps.nparen > 0))
ps.ind_level = ps.ind_level_follow;
ps.line_start_nparen = ps.nparen;
ps.want_blank = false;
--- src/usr.bin/indent/lexi.c 2023/06/08 21:18:54 1.217
+++ src/usr.bin/indent/lexi.c 2023/06/09 07:20:30 1.218
@@ -1,4 +1,4 @@
-/* $NetBSD: lexi.c,v 1.217 2023/06/08 21:18:54 rillig Exp $ */
+/* $NetBSD: lexi.c,v 1.218 2023/06/09 07:20:30 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: lexi.c,v 1.217 2023/06/08 21:18:54 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.218 2023/06/09 07:20:30 rillig Exp $");
#include <stdlib.h>
#include <string.h>
@@ -689,7 +689,7 @@
if (typenames.len >= typenames.cap) {
typenames.cap = 16 + 2 * typenames.cap;
typenames.items = nonnull(realloc(typenames.items,
- sizeof(typenames.items[0]) * typenames.cap));
+ sizeof(typenames.items[0]) * typenames.cap));
}
int pos = bsearch_typenames(name);
--- src/usr.bin/indent/parse.c 2023/06/07 15:46:12 1.69
+++ src/usr.bin/indent/parse.c 2023/06/09 07:20:30 1.70
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.69 2023/06/07 15:46:12 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.70 2023/06/09 07:20:30 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: parse.c,v 1.69 2023/06/07 15:46:12 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.70 2023/06/09 07:20:30 rillig Exp $");
#include <err.h>
@@ -236,7 +236,7 @@
case psym_rbrace:
/* stack should have <lbrace> <stmt> or <lbrace> <stmt_list> */
if (!(psyms->top > 0
- && is_lbrace(psyms->sym[psyms->top - 1]))) {
+ && is_lbrace(psyms->sym[psyms->top - 1]))) {
diag(1, "Statement nesting error");
break;
}
--- src/usr.bin/indent/pr_comment.c 2023/06/09 07:18:52 1.157
+++ src/usr.bin/indent/pr_comment.c 2023/06/09 07:20:30 1.158