Module Name: src
Committed By: rillig
Date: Sun Nov 7 07:06:00 UTC 2021
Modified Files:
src/usr.bin/indent: indent.c indent.h io.c lexi.c pr_comment.c
Log Message:
indent: rename 'inbuf' functions to 'inp'
The variable 'inp' used to be named 'inbuf'. Make the function names
correspond to the variable name again.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/indent/indent.h
cvs rdiff -u -r1.115 -r1.116 src/usr.bin/indent/io.c
cvs rdiff -u -r1.132 -r1.133 src/usr.bin/indent/lexi.c
cvs rdiff -u -r1.97 -r1.98 src/usr.bin/indent/pr_comment.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/indent.c
diff -u src/usr.bin/indent/indent.c:1.209 src/usr.bin/indent/indent.c:1.210
--- src/usr.bin/indent/indent.c:1.209 Fri Nov 5 19:42:48 2021
+++ src/usr.bin/indent/indent.c Sun Nov 7 07:06:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.209 2021/11/05 19:42:48 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.210 2021/11/07 07:06:00 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.209 2021/11/05 19:42:48 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.210 2021/11/07 07:06:00 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
#endif
@@ -320,9 +320,9 @@ search_stmt_comment(void)
sc_add_char('*');
for (;;) { /* loop until the end of the comment */
- sc_add_char(inbuf_next());
+ sc_add_char(inp_next());
if (sc_end[-1] == '*' && *inp.s == '/') {
- sc_add_char(inbuf_next());
+ sc_add_char(inp_next());
debug_save_com("search_stmt_comment end");
break;
}
@@ -345,7 +345,7 @@ search_stmt_lbrace(void)
* resulting from the "{" before, it must be scanned now and ignored.
*/
while (isspace((unsigned char)*inp.s)) {
- inbuf_skip();
+ inp_skip();
if (*inp.s == '\n')
break;
}
@@ -444,7 +444,7 @@ search_stmt_lookahead(lexer_symbol *lsym
*/
if (sc_end != NULL) {
while (ch_isblank(*inp.s))
- sc_add_char(inbuf_next());
+ sc_add_char(inp_next());
debug_save_com(__func__);
}
@@ -627,7 +627,7 @@ main_parse_command_line(int argc, char *
static void
main_prepare_parsing(void)
{
- inbuf_read_line();
+ inp_read_line();
int ind = 0;
for (const char *p = inp.s;; p++) {
@@ -1246,15 +1246,15 @@ read_preprocessing_line(void)
int com_start = 0, com_end = 0;
while (ch_isblank(*inp.s))
- inbuf_skip();
+ inp_skip();
while (*inp.s != '\n' || (state == COMM && !had_eof)) {
buf_reserve(&lab, 2);
- *lab.e++ = inbuf_next();
+ *lab.e++ = inp_next();
switch (lab.e[-1]) {
case '\\':
if (state != COMM)
- *lab.e++ = inbuf_next();
+ *lab.e++ = inp_next();
break;
case '/':
if (*inp.s == '*' && state == PLAIN) {
Index: src/usr.bin/indent/indent.h
diff -u src/usr.bin/indent/indent.h:1.78 src/usr.bin/indent/indent.h:1.79
--- src/usr.bin/indent/indent.h:1.78 Fri Nov 5 21:39:12 2021
+++ src/usr.bin/indent/indent.h Sun Nov 7 07:06:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.h,v 1.78 2021/11/05 21:39:12 rillig Exp $ */
+/* $NetBSD: indent.h,v 1.79 2021/11/07 07:06:00 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -367,13 +367,13 @@ int compute_code_indent(void);
int compute_label_indent(void);
int ind_add(int, const char *, const char *);
-void inbuf_skip(void);
-char inbuf_next(void);
+void inp_skip(void);
+char inp_next(void);
lexer_symbol lexi(void);
void diag(int, const char *, ...)__printflike(2, 3);
void dump_line(void);
void dump_line_ff(void);
-void inbuf_read_line(void);
+void inp_read_line(void);
void parse(parser_symbol);
void parse_stmt_head(stmt_head);
void process_comment(void);
Index: src/usr.bin/indent/io.c
diff -u src/usr.bin/indent/io.c:1.115 src/usr.bin/indent/io.c:1.116
--- src/usr.bin/indent/io.c:1.115 Fri Nov 5 21:39:12 2021
+++ src/usr.bin/indent/io.c Sun Nov 7 07:06:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.115 2021/11/05 21:39:12 rillig Exp $ */
+/* $NetBSD: io.c,v 1.116 2021/11/07 07:06:00 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)io.c 8.1 (Be
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__RCSID("$NetBSD: io.c,v 1.115 2021/11/05 21:39:12 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.116 2021/11/07 07:06:00 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/io.c 334927 2018-06-10 16:44:18Z pstef $");
#endif
@@ -406,7 +406,7 @@ parse_indent_comment(void)
* All rights reserved
*/
void
-inbuf_read_line(void)
+inp_read_line(void)
{
char *p;
int ch;
Index: src/usr.bin/indent/lexi.c
diff -u src/usr.bin/indent/lexi.c:1.132 src/usr.bin/indent/lexi.c:1.133
--- src/usr.bin/indent/lexi.c:1.132 Fri Nov 5 22:06:43 2021
+++ src/usr.bin/indent/lexi.c Sun Nov 7 07:06:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lexi.c,v 1.132 2021/11/05 22:06:43 rillig Exp $ */
+/* $NetBSD: lexi.c,v 1.133 2021/11/07 07:06:00 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.132 2021/11/05 22:06:43 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.133 2021/11/07 07:06:00 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 337862 2018-08-15 18:19:45Z pstef $");
#endif
@@ -179,24 +179,24 @@ static const unsigned char lex_number_ro
};
static char
-inbuf_peek(void)
+inp_peek(void)
{
return *inp.s;
}
void
-inbuf_skip(void)
+inp_skip(void)
{
inp.s++;
if (inp.s >= inp.e)
- inbuf_read_line();
+ inp_read_line();
}
char
-inbuf_next(void)
+inp_next(void)
{
- char ch = inbuf_peek();
- inbuf_skip();
+ char ch = inp_peek();
+ inp_skip();
return ch;
}
@@ -367,7 +367,7 @@ lex_number(void)
}
s = lex_number_state[row][s - 'A'];
- token_add_char(inbuf_next());
+ token_add_char(inp_next());
}
}
@@ -382,12 +382,12 @@ lex_word(void)
if (inp.s[1] == '\n') {
inp.s += 2;
if (inp.s >= inp.e)
- inbuf_read_line();
+ inp_read_line();
} else
break;
}
- token_add_char(inbuf_next());
+ token_add_char(inp_next());
}
}
@@ -400,14 +400,14 @@ lex_char_or_string(void)
return;
}
- token_add_char(inbuf_next());
+ token_add_char(inp_next());
if (token.e[-1] == delim)
return;
if (token.e[-1] == '\\') {
if (*inp.s == '\n')
++line_no;
- token_add_char(inbuf_next());
+ token_add_char(inp_next());
}
}
}
@@ -486,8 +486,8 @@ lexi_alnum(void)
(*inp.s == '"' || *inp.s == '\''))
return lsym_string_prefix;
- while (ch_isblank(inbuf_peek()))
- inbuf_skip();
+ while (ch_isblank(inp_peek()))
+ inp_skip();
if (ps.prev_token == lsym_tag && ps.p_l_follow == 0) {
ps.next_unary = true;
@@ -559,7 +559,7 @@ lexi(void)
while (ch_isblank(*inp.s)) {
ps.curr_col_1 = false;
- inbuf_skip();
+ inp_skip();
}
lexer_symbol alnum_lsym = lexi_alnum();
@@ -569,7 +569,7 @@ lexi(void)
/* Scan a non-alphanumeric token */
check_size_token(3); /* for things like "<<=" */
- *token.e++ = inbuf_next();
+ *token.e++ = inp_next();
*token.e = '\0';
lexer_symbol lsym;
@@ -686,7 +686,7 @@ lexi(void)
case '<':
case '!': /* ops like <, <<, <=, !=, etc */
if (*inp.s == '>' || *inp.s == '<' || *inp.s == '=')
- *token.e++ = inbuf_next();
+ *token.e++ = inp_next();
if (*inp.s == '=')
*token.e++ = *inp.s++;
lsym = ps.next_unary ? lsym_unary_op : lsym_binary_op;
@@ -705,7 +705,7 @@ lexi(void)
while (*inp.s == '*' || isspace((unsigned char)*inp.s)) {
if (*inp.s == '*')
token_add_char('*');
- inbuf_skip();
+ inp_skip();
}
if (ps.in_decl) {
@@ -714,7 +714,7 @@ lexi(void)
while (isalpha((unsigned char)*tp) ||
isspace((unsigned char)*tp)) {
if (++tp >= inp.e)
- inbuf_read_line();
+ inp_read_line();
}
if (*tp == '(')
ps.procname[0] = ' ';
@@ -725,7 +725,7 @@ lexi(void)
default:
if (token.e[-1] == '/' && (*inp.s == '*' || *inp.s == '/')) {
- *token.e++ = inbuf_next();
+ *token.e++ = inp_next();
lsym = lsym_comment;
unary_delim = ps.next_unary;
break;
@@ -733,14 +733,14 @@ lexi(void)
/* handle '||', '&&', etc., and also things as in 'int *****i' */
while (token.e[-1] == *inp.s || *inp.s == '=')
- token_add_char(inbuf_next());
+ token_add_char(inp_next());
lsym = ps.next_unary ? lsym_unary_op : lsym_binary_op;
unary_delim = true;
}
if (inp.s >= inp.e)
- inbuf_read_line();
+ inp_read_line();
ps.next_unary = unary_delim;
Index: src/usr.bin/indent/pr_comment.c
diff -u src/usr.bin/indent/pr_comment.c:1.97 src/usr.bin/indent/pr_comment.c:1.98
--- src/usr.bin/indent/pr_comment.c:1.97 Fri Nov 5 19:33:28 2021
+++ src/usr.bin/indent/pr_comment.c Sun Nov 7 07:06:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pr_comment.c,v 1.97 2021/11/05 19:33:28 rillig Exp $ */
+/* $NetBSD: pr_comment.c,v 1.98 2021/11/07 07:06:00 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)pr_comment.c
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__RCSID("$NetBSD: pr_comment.c,v 1.97 2021/11/05 19:33:28 rillig Exp $");
+__RCSID("$NetBSD: pr_comment.c,v 1.98 2021/11/07 07:06:00 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/pr_comment.c 334927 2018-06-10 16:44:18Z pstef $");
#endif
@@ -217,7 +217,7 @@ copy_comment(int adj_max_line_length, bo
while (ch_isblank(*inp.s))
inp.s++;
} else {
- inbuf_skip();
+ inp_skip();
com_add_char('\f');
}
break;
@@ -256,23 +256,23 @@ copy_comment(int adj_max_line_length, bo
bool skip_asterisk = true;
do { /* flush any blanks and/or tabs at start of
* next line */
- inbuf_skip();
+ inp_skip();
if (*inp.s == '*' && skip_asterisk) {
skip_asterisk = false;
- inbuf_skip();
+ inp_skip();
if (*inp.s == '/')
goto end_of_comment;
}
} while (ch_isblank(*inp.s));
} else
- inbuf_skip();
+ inp_skip();
break; /* end of case for newline */
case '*':
- inbuf_skip();
+ inp_skip();
if (*inp.s == '/' && token.e[-1] == '*') {
end_of_comment:
- inbuf_skip();
+ inp_skip();
end_of_line_comment:
if (break_delim) {
@@ -300,7 +300,7 @@ copy_comment(int adj_max_line_length, bo
;
int now_len = ind_add(ps.com_ind, com.s, com.e);
for (;;) {
- char ch = inbuf_next();
+ char ch = inp_next();
if (ch_isblank(ch))
last_blank = com.e - com.buf;
com_add_char(ch);
