Module Name: src
Committed By: rillig
Date: Sun Oct 31 22:38:12 UTC 2021
Modified Files:
src/usr.bin/indent: args.c indent.c indent.h lexi.c
Log Message:
indent: clean up
Initialize buffers in reading order, make comments more expressive,
rename add_typename to register_typename, remove unused macro.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/usr.bin/indent/args.c
cvs rdiff -u -r1.202 -r1.203 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/indent/indent.h
cvs rdiff -u -r1.127 -r1.128 src/usr.bin/indent/lexi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/indent/args.c
diff -u src/usr.bin/indent/args.c:1.67 src/usr.bin/indent/args.c:1.68
--- src/usr.bin/indent/args.c:1.67 Fri Oct 29 19:52:59 2021
+++ src/usr.bin/indent/args.c Sun Oct 31 22:38:12 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.67 2021/10/29 19:52:59 rillig Exp $ */
+/* $NetBSD: args.c,v 1.68 2021/10/31 22:38:12 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)args.c 8.1 (
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__RCSID("$NetBSD: args.c,v 1.67 2021/10/29 19:52:59 rillig Exp $");
+__RCSID("$NetBSD: args.c,v 1.68 2021/10/31 22:38:12 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/args.c 336318 2018-07-15 21:04:21Z pstef $");
#endif
@@ -142,7 +142,7 @@ add_typedefs_from_file(const char *fname
while ((fgets(line, BUFSIZ, file)) != NULL) {
/* Remove trailing whitespace */
line[strcspn(line, " \t\n\r")] = '\0';
- add_typename(line);
+ register_typename(line);
}
(void)fclose(file);
}
@@ -184,7 +184,7 @@ set_special_option(const char *arg, cons
arg_end = arg + 1;
if (arg_end[0] == '\0')
goto need_param;
- add_typename(arg_end);
+ register_typename(arg_end);
return true;
}
Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.202 src/usr.bin/indent/indent.c:1.203
--- src/usr.bin/indent/indent.c:1.202 Sun Oct 31 21:43:43 2021
+++ src/usr.bin/indent/indent.c Sun Oct 31 22:38:12 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.202 2021/10/31 21:43:43 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.203 2021/10/31 22:38:12 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.202 2021/10/31 21:43:43 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.203 2021/10/31 22:38:12 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
#endif
@@ -507,9 +507,9 @@ main_init_globals(void)
buf_init(&token);
- buf_init(&com);
buf_init(&lab);
buf_init(&code);
+ buf_init(&com);
ps.s_sym[0] = psym_stmt_list;
ps.prev_token = lsym_semicolon;
Index: src/usr.bin/indent/indent.h
diff -u src/usr.bin/indent/indent.h:1.73 src/usr.bin/indent/indent.h:1.74
--- src/usr.bin/indent/indent.h:1.73 Sun Oct 31 20:40:42 2021
+++ src/usr.bin/indent/indent.h Sun Oct 31 22:38:12 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.h,v 1.73 2021/10/31 20:40:42 rillig Exp $ */
+/* $NetBSD: indent.h,v 1.74 2021/10/31 22:38:12 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -76,14 +76,14 @@ typedef enum lexer_symbol {
lsym_preprocessing, /* '#' */
lsym_newline,
lsym_form_feed,
- lsym_comment, /* the initial '/' '*' or '//' of a comment */
+ lsym_comment, /* the initial '/ *' or '//' of a comment */
lsym_lparen_or_lbracket,
lsym_rparen_or_rbracket,
lsym_lbrace,
lsym_rbrace,
lsym_period,
- lsym_unary_op, /* e.g. '+' or '&' */
- lsym_binary_op, /* e.g. '<<' or '+' or '&&' or '/=' */
+ lsym_unary_op, /* e.g. '*', '&', '-' or leading '++' */
+ lsym_binary_op, /* e.g. '*', '&', '<<', '&&' or '/=' */
lsym_postfix_op, /* trailing '++' or '--' */
lsym_question, /* the '?' from a '?:' expression */
lsym_colon,
@@ -360,7 +360,7 @@ void debug_println(const char *, ...)__p
#define debug_vis_range(prefix, s, e, suffix) do { } while (false)
#endif
-void add_typename(const char *);
+void register_typename(const char *);
int compute_code_indent(void);
int compute_label_indent(void);
int indentation_after_range(int, const char *, const char *);
Index: src/usr.bin/indent/lexi.c
diff -u src/usr.bin/indent/lexi.c:1.127 src/usr.bin/indent/lexi.c:1.128
--- src/usr.bin/indent/lexi.c:1.127 Sun Oct 31 20:59:26 2021
+++ src/usr.bin/indent/lexi.c Sun Oct 31 22:38:12 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lexi.c,v 1.127 2021/10/31 20:59:26 rillig Exp $ */
+/* $NetBSD: lexi.c,v 1.128 2021/10/31 22:38:12 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)lexi.c 8.1 (
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__RCSID("$NetBSD: lexi.c,v 1.127 2021/10/31 20:59:26 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.128 2021/10/31 22:38:12 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 337862 2018-08-15 18:19:45Z pstef $");
#endif
@@ -272,9 +272,6 @@ debug_print_buf(const char *name, const
#define debug_ps_int(name) \
if (ps.name != prev_ps.name) \
debug_println("%3d ps." #name, ps.name)
-#define debug_ps_keyword(name) \
- if (ps.name != kw_0) \
- debug_println(" ps." #name " = %s", kw_name(ps.name))
static void
debug_lexi(lexer_symbol lsym)
@@ -750,7 +747,7 @@ lexi(void)
}
void
-add_typename(const char *name)
+register_typename(const char *name)
{
if (typenames.len >= typenames.cap) {
typenames.cap = 16 + 2 * typenames.cap;
