Module Name: src
Committed By: rillig
Date: Thu Jun 29 09:58:36 UTC 2023
Modified Files:
src/usr.bin/xlint/lint1: cgram.y decl.c externs1.h func.c
Log Message:
lint: clean up function names
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.437 -r1.438 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.319 -r1.320 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.179 -r1.180 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.157 -r1.158 src/usr.bin/xlint/lint1/func.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/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.437 src/usr.bin/xlint/lint1/cgram.y:1.438
--- src/usr.bin/xlint/lint1/cgram.y:1.437 Thu Jun 29 05:03:03 2023
+++ src/usr.bin/xlint/lint1/cgram.y Thu Jun 29 09:58:36 2023
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.437 2023/06/29 05:03:03 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.438 2023/06/29 09:58:36 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: cgram.y,v 1.437 2023/06/29 05:03:03 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.438 2023/06/29 09:58:36 rillig Exp $");
#endif
#include <limits.h>
@@ -988,23 +988,23 @@ struct_declaration: /* C99 6.7.2.1 */
notype_struct_declarators:
notype_struct_declarator {
- $$ = declarator_1_struct_union($1);
+ $$ = declare_member($1);
}
| notype_struct_declarators {
symtyp = FMEMBER;
} T_COMMA type_struct_declarator {
- $$ = concat_lists($1, declarator_1_struct_union($4));
+ $$ = concat_lists($1, declare_member($4));
}
;
type_struct_declarators:
type_struct_declarator {
- $$ = declarator_1_struct_union($1);
+ $$ = declare_member($1);
}
| type_struct_declarators {
symtyp = FMEMBER;
} T_COMMA type_struct_declarator {
- $$ = concat_lists($1, declarator_1_struct_union($4));
+ $$ = concat_lists($1, declare_member($4));
}
;
@@ -1387,16 +1387,16 @@ type_name: /* C99 6.7.6 */
abstract_declaration: /* specific to lint */
begin_type_qualifier_list end_type {
- $$ = declare_1_abstract(abstract_name());
+ $$ = declare_abstract_type(abstract_name());
}
| begin_type_specifier_qualifier_list end_type {
- $$ = declare_1_abstract(abstract_name());
+ $$ = declare_abstract_type(abstract_name());
}
| begin_type_qualifier_list end_type abstract_declarator {
- $$ = declare_1_abstract($3);
+ $$ = declare_abstract_type($3);
}
| begin_type_specifier_qualifier_list end_type abstract_declarator {
- $$ = declare_1_abstract($3);
+ $$ = declare_abstract_type($3);
}
;
@@ -1726,27 +1726,27 @@ expression_statement: /* C99 6.8.3 */
selection_statement: /* C99 6.8.4 */
if_without_else %prec T_THEN {
save_warning_flags();
- if2();
- if3(false);
+ stmt_if_then_stmt();
+ stmt_if_else_stmt(false);
}
| if_without_else T_ELSE {
save_warning_flags();
- if2();
+ stmt_if_then_stmt();
} statement {
clear_warning_flags();
- if3(true);
+ stmt_if_else_stmt(true);
}
| if_without_else T_ELSE error {
clear_warning_flags();
- if3(false);
+ stmt_if_else_stmt(false);
}
| switch_expr statement {
clear_warning_flags();
- switch2();
+ stmt_switch_expr_stmt();
}
| switch_expr error {
clear_warning_flags();
- switch2();
+ stmt_switch_expr_stmt();
}
;
@@ -1757,14 +1757,14 @@ if_without_else: /* see C99 6.8.4 */
if_expr: /* see C99 6.8.4 */
T_IF T_LPAREN expression T_RPAREN {
- if1($3);
+ stmt_if_expr($3);
clear_warning_flags();
}
;
switch_expr: /* see C99 6.8.4 */
T_SWITCH T_LPAREN expression T_RPAREN {
- switch1($3);
+ stmt_switch_expr($3);
clear_warning_flags();
}
;
@@ -1772,29 +1772,29 @@ switch_expr: /* see C99 6.8.4 */
iteration_statement: /* C99 6.8.5 */
while_expr statement {
clear_warning_flags();
- while2();
+ stmt_while_expr_stmt();
}
| while_expr error {
clear_warning_flags();
- while2();
+ stmt_while_expr_stmt();
}
| do_statement do_while_expr {
- do2($2);
+ stmt_do_while_expr($2);
seen_fallthrough = false;
}
| do error {
clear_warning_flags();
- do2(NULL);
+ stmt_do_while_expr(NULL);
}
| for_exprs statement {
clear_warning_flags();
- for2();
+ stmt_for_exprs_stmt();
end_declaration_level();
block_level--;
}
| for_exprs error {
clear_warning_flags();
- for2();
+ stmt_for_exprs_stmt();
end_declaration_level();
block_level--;
}
@@ -1802,7 +1802,7 @@ iteration_statement: /* C99 6.8.5 */
while_expr: /* see C99 6.8.5 */
T_WHILE T_LPAREN expression T_RPAREN {
- while1($3);
+ stmt_while_expr($3);
clear_warning_flags();
}
;
@@ -1815,7 +1815,7 @@ do_statement: /* see C99 6.8.5 */
do: /* see C99 6.8.5 */
T_DO {
- do1();
+ stmt_do();
}
;
@@ -1840,36 +1840,36 @@ for_exprs: /* see C99 6.8.5 */
expression_opt T_RPAREN {
/* variable declaration in for loop */
c99ism(325);
- for1(NULL, $6, $8);
+ stmt_for_exprs(NULL, $6, $8);
clear_warning_flags();
}
| for_start
expression_opt T_SEMI
expression_opt T_SEMI
expression_opt T_RPAREN {
- for1($2, $4, $6);
+ stmt_for_exprs($2, $4, $6);
clear_warning_flags();
}
;
jump_statement: /* C99 6.8.6 */
goto identifier T_SEMI {
- do_goto(getsym($2));
+ stmt_goto(getsym($2));
}
| goto error T_SEMI {
symtyp = FVFT;
}
| T_CONTINUE T_SEMI {
- do_continue();
+ stmt_continue();
}
| T_BREAK T_SEMI {
- do_break();
+ stmt_break();
}
| T_RETURN sys T_SEMI {
- do_return($2, NULL);
+ stmt_return($2, NULL);
}
| T_RETURN sys expression T_SEMI {
- do_return($2, $3);
+ stmt_return($2, $3);
}
;
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.319 src/usr.bin/xlint/lint1/decl.c:1.320
--- src/usr.bin/xlint/lint1/decl.c:1.319 Thu Jun 29 05:03:03 2023
+++ src/usr.bin/xlint/lint1/decl.c Thu Jun 29 09:58:36 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.319 2023/06/29 05:03:03 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.320 2023/06/29 09:58:36 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: decl.c,v 1.319 2023/06/29 05:03:03 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.320 2023/06/29 09:58:36 rillig Exp $");
#endif
#include <sys/param.h>
@@ -1103,11 +1103,8 @@ declare_bit_field(sym_t *dsym, tspec_t *
}
}
-/*
- * Process the declarator of a struct/union element.
- */
sym_t *
-declarator_1_struct_union(sym_t *dsym)
+declare_member(sym_t *dsym)
{
type_t *tp;
tspec_t t;
@@ -2945,11 +2942,8 @@ global_clean_up(void)
global_clean_up_decl(true);
}
-/*
- * Process an abstract type declaration
- */
sym_t *
-declare_1_abstract(sym_t *sym)
+declare_abstract_type(sym_t *sym)
{
check_function_definition(sym, true);
Index: src/usr.bin/xlint/lint1/externs1.h
diff -u src/usr.bin/xlint/lint1/externs1.h:1.179 src/usr.bin/xlint/lint1/externs1.h:1.180
--- src/usr.bin/xlint/lint1/externs1.h:1.179 Thu Jun 29 05:03:03 2023
+++ src/usr.bin/xlint/lint1/externs1.h Thu Jun 29 09:58:36 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: externs1.h,v 1.179 2023/06/29 05:03:03 rillig Exp $ */
+/* $NetBSD: externs1.h,v 1.180 2023/06/29 09:58:36 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -203,7 +203,7 @@ int length_in_bits(const type_t *, const
unsigned int alignment_in_bits(const type_t *);
sym_t *concat_lists(sym_t *, sym_t *);
void check_type(sym_t *);
-sym_t *declarator_1_struct_union(sym_t *);
+sym_t *declare_member(sym_t *);
sym_t *set_bit_field_width(sym_t *, int);
qual_ptr *merge_qualified_pointer(qual_ptr *, qual_ptr *);
sym_t *add_pointer(sym_t *, qual_ptr *);
@@ -230,7 +230,7 @@ void check_func_old_style_arguments(void
void declare_local(sym_t *, bool);
sym_t *abstract_name(void);
void global_clean_up(void);
-sym_t *declare_1_abstract(sym_t *);
+sym_t *declare_abstract_type(sym_t *);
void check_size(sym_t *);
void mark_as_set(sym_t *);
void mark_as_used(sym_t *, bool, bool);
@@ -309,21 +309,21 @@ void end_function(void);
void named_label(sym_t *);
void case_label(tnode_t *);
void default_label(void);
-void if1(tnode_t *);
-void if2(void);
-void if3(bool);
-void switch1(tnode_t *);
-void switch2(void);
-void while1(tnode_t *);
-void while2(void);
-void do1(void);
-void do2(tnode_t *);
-void for1(tnode_t *, tnode_t *, tnode_t *);
-void for2(void);
-void do_goto(sym_t *);
-void do_continue(void);
-void do_break(void);
-void do_return(bool, tnode_t *);
+void stmt_if_expr(tnode_t *);
+void stmt_if_then_stmt(void);
+void stmt_if_else_stmt(bool);
+void stmt_switch_expr(tnode_t *);
+void stmt_switch_expr_stmt(void);
+void stmt_while_expr(tnode_t *);
+void stmt_while_expr_stmt(void);
+void stmt_do(void);
+void stmt_do_while_expr(tnode_t *);
+void stmt_for_exprs(tnode_t *, tnode_t *, tnode_t *);
+void stmt_for_exprs_stmt(void);
+void stmt_goto(sym_t *);
+void stmt_continue(void);
+void stmt_break(void);
+void stmt_return(bool, tnode_t *);
void global_clean_up_decl(bool);
void argsused(int);
void constcond(int);
Index: src/usr.bin/xlint/lint1/func.c
diff -u src/usr.bin/xlint/lint1/func.c:1.157 src/usr.bin/xlint/lint1/func.c:1.158
--- src/usr.bin/xlint/lint1/func.c:1.157 Sat Jun 24 20:50:54 2023
+++ src/usr.bin/xlint/lint1/func.c Thu Jun 29 09:58:36 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: func.c,v 1.157 2023/06/24 20:50:54 rillig Exp $ */
+/* $NetBSD: func.c,v 1.158 2023/06/29 09:58:36 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID)
-__RCSID("$NetBSD: func.c,v 1.157 2023/06/24 20:50:54 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.158 2023/06/29 09:58:36 rillig Exp $");
#endif
#include <stdlib.h>
@@ -64,8 +64,8 @@ bool warn_about_unreachable;
/*
* In conjunction with 'reached', controls printing of "fallthrough on ..."
* warnings.
- * Reset by each statement and set by FALLTHROUGH, switch (switch1())
- * and case (label()).
+ * Reset by each statement and set by FALLTHROUGH, stmt_switch_expr and
+ * case_label.
*
* Control statements if, for, while and switch do not reset seen_fallthrough
* because this must be done by the controlled statement. At least for if this
@@ -629,11 +629,8 @@ check_controlling_expression(tnode_t *tn
return tn;
}
-/*
- * T_IF T_LPAREN expr T_RPAREN
- */
void
-if1(tnode_t *tn)
+stmt_if_expr(tnode_t *tn)
{
if (tn != NULL)
@@ -650,12 +647,8 @@ if1(tnode_t *tn)
}
}
-/*
- * if_without_else
- * if_without_else T_ELSE
- */
void
-if2(void)
+stmt_if_then_stmt(void)
{
cstmt->c_reached_end_of_then = reached;
@@ -663,12 +656,8 @@ if2(void)
set_reached(!cstmt->c_always_then);
}
-/*
- * if_without_else
- * if_without_else T_ELSE statement
- */
void
-if3(bool els)
+stmt_if_else_stmt(bool els)
{
if (cstmt->c_reached_end_of_then)
set_reached(true);
@@ -680,11 +669,8 @@ if3(bool els)
end_control_statement(CS_IF);
}
-/*
- * T_SWITCH T_LPAREN expr T_RPAREN
- */
void
-switch1(tnode_t *tn)
+stmt_switch_expr(tnode_t *tn)
{
tspec_t t;
type_t *tp;
@@ -736,11 +722,8 @@ switch1(tnode_t *tn)
seen_fallthrough = true;
}
-/*
- * switch_expr statement
- */
void
-switch2(void)
+stmt_switch_expr_stmt(void)
{
int nenum = 0, nclab = 0;
sym_t *esym;
@@ -794,11 +777,8 @@ switch2(void)
end_control_statement(CS_SWITCH);
}
-/*
- * T_WHILE T_LPAREN expr T_RPAREN
- */
void
-while1(tnode_t *tn)
+stmt_while_expr(tnode_t *tn)
{
bool body_reached;
@@ -823,12 +803,8 @@ while1(tnode_t *tn)
set_reached(body_reached);
}
-/*
- * while_expr statement
- * while_expr error
- */
void
-while2(void)
+stmt_while_expr_stmt(void)
{
/*
@@ -841,11 +817,8 @@ while2(void)
end_control_statement(CS_WHILE);
}
-/*
- * T_DO
- */
void
-do1(void)
+stmt_do(void)
{
if (!reached) {
@@ -858,12 +831,8 @@ do1(void)
cstmt->c_loop = true;
}
-/*
- * do statement do_while_expr
- * do error
- */
void
-do2(tnode_t *tn)
+stmt_do_while_expr(tnode_t *tn)
{
/*
@@ -893,11 +862,8 @@ do2(tnode_t *tn)
end_control_statement(CS_DO_WHILE);
}
-/*
- * T_FOR T_LPAREN opt_expr T_SEMI opt_expr T_SEMI opt_expr T_RPAREN
- */
void
-for1(tnode_t *tn1, tnode_t *tn2, tnode_t *tn3)
+stmt_for_exprs(tnode_t *tn1, tnode_t *tn2, tnode_t *tn3)
{
/*
@@ -933,17 +899,13 @@ for1(tnode_t *tn1, tnode_t *tn2, tnode_t
cstmt->c_maybe_endless = tn2 == NULL || is_nonzero(tn2);
- /* Checking the reinitialization expression is done in for2() */
+ /* The tn3 expression is checked in stmt_for_exprs_stmt. */
set_reached(!is_zero(tn2));
}
-/*
- * for_exprs statement
- * for_exprs error
- */
void
-for2(void)
+stmt_for_exprs_stmt(void)
{
pos_t cpos, cspos;
tnode_t *tn3;
@@ -983,11 +945,8 @@ for2(void)
end_control_statement(CS_FOR);
}
-/*
- * T_GOTO identifier T_SEMI
- */
void
-do_goto(sym_t *lab)
+stmt_goto(sym_t *lab)
{
mark_as_used(lab, false, false);
@@ -997,11 +956,8 @@ do_goto(sym_t *lab)
set_reached(false);
}
-/*
- * T_BREAK T_SEMI
- */
void
-do_break(void)
+stmt_break(void)
{
control_statement *cs;
@@ -1023,11 +979,8 @@ do_break(void)
set_reached(false);
}
-/*
- * T_CONTINUE T_SEMI
- */
void
-do_continue(void)
+stmt_continue(void)
{
control_statement *cs;
@@ -1088,12 +1041,8 @@ check_return_value(bool sys, tnode_t *tn
expr(retn, true, false, true, false);
}
-/*
- * T_RETURN T_SEMI
- * T_RETURN expr T_SEMI
- */
void
-do_return(bool sys, tnode_t *tn)
+stmt_return(bool sys, tnode_t *tn)
{
control_statement *cs = cstmt;
