Module Name: src
Committed By: rillig
Date: Sun Mar 21 10:25:40 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y decl.c lint1.h
Log Message:
lint: rename d_nedecl to d_nonempty_decl
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.154 -r1.155 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/xlint/lint1/lint1.h
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.194 src/usr.bin/xlint/lint1/cgram.y:1.195
--- src/usr.bin/xlint/lint1/cgram.y:1.194 Sun Mar 21 09:54:02 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sun Mar 21 10:25:40 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.194 2021/03/21 09:54:02 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.195 2021/03/21 10:25:40 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.194 2021/03/21 09:54:02 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.195 2021/03/21 10:25:40 rillig Exp $");
#endif
#include <limits.h>
@@ -410,7 +410,7 @@ top_level_declaration: /* C99 6.9 calls
if (dcs->d_scl == TYPEDEF) {
/* typedef declares no type name */
warning(72);
- } else if (!dcs->d_nedecl) {
+ } else if (!dcs->d_nonempty_decl) {
/* empty declaration */
warning(2);
}
@@ -488,7 +488,7 @@ arg_declaration:
}
| declmods deftyp notype_init_decls T_SEMI
| declaration_specifiers deftyp T_SEMI {
- if (!dcs->d_nedecl) {
+ if (!dcs->d_nonempty_decl) {
/* empty declaration */
warning(2);
} else {
@@ -497,7 +497,7 @@ arg_declaration:
}
}
| declaration_specifiers deftyp type_init_decls T_SEMI {
- if (dcs->d_nedecl) {
+ if (dcs->d_nonempty_decl) {
/* '%s' declared in argument declaration list */
warning(3, type_name(dcs->d_type));
}
@@ -521,7 +521,7 @@ declaration: /* C99 6.7 */
if (dcs->d_scl == TYPEDEF) {
/* typedef declares no type name */
warning(72);
- } else if (!dcs->d_nedecl) {
+ } else if (!dcs->d_nonempty_decl) {
/* empty declaration */
warning(2);
}
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.154 src/usr.bin/xlint/lint1/decl.c:1.155
--- src/usr.bin/xlint/lint1/decl.c:1.154 Sun Mar 21 10:21:07 2021
+++ src/usr.bin/xlint/lint1/decl.c Sun Mar 21 10:25:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.154 2021/03/21 10:21:07 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.155 2021/03/21 10:25:40 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.154 2021/03/21 10:21:07 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.155 2021/03/21 10:25:40 rillig Exp $");
#endif
#include <sys/param.h>
@@ -717,7 +717,7 @@ clrtyp(void)
dcs->d_inline = false;
dcs->d_mscl = false;
dcs->d_terr = false;
- dcs->d_nedecl = false;
+ dcs->d_nonempty_decl = false;
dcs->d_notyp = false;
}
@@ -1659,7 +1659,7 @@ mktag(sym_t *tag, tspec_t kind, bool dec
tag = newtag(tag, scl, decl, semi);
} else {
/* a new tag, no empty declaration */
- dcs->d_next->d_nedecl = true;
+ dcs->d_next->d_nonempty_decl = true;
if (scl == ENUM_TAG && !decl) {
if (!tflag && (sflag || pflag))
/* forward reference to enum type */
@@ -1682,7 +1682,7 @@ mktag(sym_t *tag, tspec_t kind, bool dec
tag->s_block_level = -1;
tag->s_type = tp = getblk(sizeof (type_t));
tp->t_packed = dcs->d_packed;
- dcs->d_next->d_nedecl = true;
+ dcs->d_next->d_nonempty_decl = true;
}
if (tp->t_tspec == NOTSPEC) {
@@ -1724,14 +1724,14 @@ newtag(sym_t *tag, scl_t scl, bool decl,
warning(45, storage_class_name(tag->s_scl),
tag->s_name);
}
- dcs->d_next->d_nedecl = true;
+ dcs->d_next->d_nonempty_decl = true;
} else if (decl) {
/* "struct a { ... } " */
if (hflag)
/* redefinition hides earlier one: %s */
warning(43, tag->s_name);
tag = pushdown(tag);
- dcs->d_next->d_nedecl = true;
+ dcs->d_next->d_nonempty_decl = true;
} else if (tag->s_scl != scl) {
/* base type is really '%s %s' */
warning(45, storage_class_name(tag->s_scl),
@@ -1743,7 +1743,7 @@ newtag(sym_t *tag, scl_t scl, bool decl,
tag->s_name);
}
tag = pushdown(tag);
- dcs->d_next->d_nedecl = true;
+ dcs->d_next->d_nonempty_decl = true;
}
} else {
if (tag->s_scl != scl) {
@@ -1751,15 +1751,15 @@ newtag(sym_t *tag, scl_t scl, bool decl,
error(46, storage_class_name(tag->s_scl));
print_previous_declaration(-1, tag);
tag = pushdown(tag);
- dcs->d_next->d_nedecl = true;
+ dcs->d_next->d_nonempty_decl = true;
} else if (decl && !is_incomplete(tag->s_type)) {
/* (%s) tag redeclared */
error(46, storage_class_name(tag->s_scl));
print_previous_declaration(-1, tag);
tag = pushdown(tag);
- dcs->d_next->d_nedecl = true;
+ dcs->d_next->d_nonempty_decl = true;
} else if (semi || decl) {
- dcs->d_next->d_nedecl = true;
+ dcs->d_next->d_nonempty_decl = true;
}
}
return tag;
Index: src/usr.bin/xlint/lint1/lint1.h
diff -u src/usr.bin/xlint/lint1/lint1.h:1.78 src/usr.bin/xlint/lint1/lint1.h:1.79
--- src/usr.bin/xlint/lint1/lint1.h:1.78 Sun Mar 21 10:21:07 2021
+++ src/usr.bin/xlint/lint1/lint1.h Sun Mar 21 10:25:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lint1.h,v 1.78 2021/03/21 10:21:07 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.79 2021/03/21 10:25:40 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -341,8 +341,9 @@ typedef struct dinfo {
bool d_inline : 1; /* inline in declaration specifiers */
bool d_mscl : 1; /* multiple storage classes */
bool d_terr : 1; /* invalid type combination */
- bool d_nedecl : 1; /* if at least one tag is declared */
- bool d_vararg : 1; /* ... in the current function decl. */
+ bool d_nonempty_decl : 1; /* if at least one tag is declared
+ * ... in the current function decl. */
+ bool d_vararg : 1;
bool d_proto : 1; /* current function decl. is prototype */
bool d_notyp : 1; /* set if no type specifier was present */
bool d_asm : 1; /* set if d_ctx == AUTO and asm() present */
