Module Name: src
Committed By: rillig
Date: Fri Apr 2 09:52:36 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y externs1.h mem1.c tree.c
Log Message:
lint: rename getnode to expr_zalloc_tnode
The new name highlights that the returned memory is only valid in the
scope of the current expression. This was misleading before since the
other related functions all have a 't' (probably for 'temporary') in
their names.
Also encode in the function name that the returned memory is zeroed out
as that could not be inferred from the old name.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.96 -r1.97 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/xlint/lint1/mem1.c
cvs rdiff -u -r1.255 -r1.256 src/usr.bin/xlint/lint1/tree.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.207 src/usr.bin/xlint/lint1/cgram.y:1.208
--- src/usr.bin/xlint/lint1/cgram.y:1.207 Tue Mar 30 14:25:28 2021
+++ src/usr.bin/xlint/lint1/cgram.y Fri Apr 2 09:52:36 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.207 2021/03/30 14:25:28 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.208 2021/04/02 09:52:36 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.207 2021/03/30 14:25:28 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.208 2021/04/02 09:52:36 rillig Exp $");
#endif
#include <limits.h>
@@ -1596,7 +1596,7 @@ expr_statement_val:
seen_fallthrough = false;
}
| non_expr_statement {
- $$ = getnode();
+ $$ = expr_zalloc_tnode();
$$->tn_type = gettyp(VOID);
}
;
Index: src/usr.bin/xlint/lint1/externs1.h
diff -u src/usr.bin/xlint/lint1/externs1.h:1.96 src/usr.bin/xlint/lint1/externs1.h:1.97
--- src/usr.bin/xlint/lint1/externs1.h:1.96 Fri Apr 2 09:39:25 2021
+++ src/usr.bin/xlint/lint1/externs1.h Fri Apr 2 09:52:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: externs1.h,v 1.96 2021/04/02 09:39:25 rillig Exp $ */
+/* $NetBSD: externs1.h,v 1.97 2021/04/02 09:52:36 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -106,7 +106,7 @@ extern void freeblk(void);
extern void freelblk(int);
extern void *tgetblk(size_t);
-extern tnode_t *getnode(void);
+extern tnode_t *expr_zalloc_tnode(void);
extern void tfreeblk(void);
extern struct memory_block *tsave(void);
extern void trestor(struct memory_block *);
Index: src/usr.bin/xlint/lint1/mem1.c
diff -u src/usr.bin/xlint/lint1/mem1.c:1.39 src/usr.bin/xlint/lint1/mem1.c:1.40
--- src/usr.bin/xlint/lint1/mem1.c:1.39 Fri Apr 2 09:45:55 2021
+++ src/usr.bin/xlint/lint1/mem1.c Fri Apr 2 09:52:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mem1.c,v 1.39 2021/04/02 09:45:55 rillig Exp $ */
+/* $NetBSD: mem1.c,v 1.40 2021/04/02 09:52:36 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mem1.c,v 1.39 2021/04/02 09:45:55 rillig Exp $");
+__RCSID("$NetBSD: mem1.c,v 1.40 2021/04/02 09:52:36 rillig Exp $");
#endif
#include <sys/types.h>
@@ -344,7 +344,7 @@ tgetblk(size_t s)
/* Return a freshly allocated tree node. */
tnode_t *
-getnode(void)
+expr_zalloc_tnode(void)
{
tnode_t *tn = tgetblk(sizeof *tn);
tn->tn_from_system_header = in_system_header;
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.255 src/usr.bin/xlint/lint1/tree.c:1.256
--- src/usr.bin/xlint/lint1/tree.c:1.255 Thu Apr 1 15:06:49 2021
+++ src/usr.bin/xlint/lint1/tree.c Fri Apr 2 09:52:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.255 2021/04/01 15:06:49 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.256 2021/04/02 09:52:36 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.255 2021/04/01 15:06:49 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.256 2021/04/02 09:52:36 rillig Exp $");
#endif
#include <float.h>
@@ -181,7 +181,7 @@ new_constant_node(type_t *tp, val_t *v)
{
tnode_t *n;
- n = getnode();
+ n = expr_zalloc_tnode();
n->tn_op = CON;
n->tn_type = tp;
n->tn_val = tgetblk(sizeof *n->tn_val);
@@ -197,7 +197,7 @@ new_integer_constant_node(tspec_t t, int
{
tnode_t *n;
- n = getnode();
+ n = expr_zalloc_tnode();
n->tn_op = CON;
n->tn_type = gettyp(t);
n->tn_val = tgetblk(sizeof *n->tn_val);
@@ -279,7 +279,7 @@ new_name_node(sym_t *sym, int follow_tok
lint_assert(sym->s_kind == FVFT || sym->s_kind == FMEMBER);
- n = getnode();
+ n = expr_zalloc_tnode();
n->tn_type = sym->s_type;
if (sym->s_scl != CTCONST) {
n->tn_op = NAME;
@@ -303,7 +303,7 @@ new_string_node(strg_t *strg)
len = strg->st_len;
- n = getnode();
+ n = expr_zalloc_tnode();
n->tn_op = STRING;
n->tn_type = tincref(gettyp(strg->st_tspec), ARRAY);
@@ -1809,7 +1809,7 @@ new_tnode(op_t op, type_t *type, tnode_t
uint64_t rnum;
#endif
- ntn = getnode();
+ ntn = expr_zalloc_tnode();
ntn->tn_op = op;
ntn->tn_type = type;
@@ -2056,7 +2056,7 @@ convert(op_t op, int arg, type_t *tp, tn
check_pointer_conversion(op, tn, tp);
}
- ntn = getnode();
+ ntn = expr_zalloc_tnode();
ntn->tn_op = CVT;
ntn->tn_type = tp;
ntn->tn_cast = op == CVT;
@@ -3501,7 +3501,7 @@ cast(tnode_t *tn, type_t *tp)
}
for (m = str->sou_first_member; m != NULL; m = m->s_next) {
if (sametype(m->s_type, tn->tn_type)) {
- tn = getnode();
+ tn = expr_zalloc_tnode();
tn->tn_op = CVT;
tn->tn_type = tp;
tn->tn_cast = true;
