 @@ -1,15 +1,15 @@
 %{
-/* $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.
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -25,27 +25,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 extern char *yytext;
 /*
  * Contains the level of current declaration, used for symbol table entries.
  * 0 is the top-level, > 0 is inside a function body.
 @@ -1586,27 +1586,27 @@ expr_statement:
  * ({ [[decl-list] stmt-list] }).
  * XXX: This is not well tested.
  */
 expr_statement_val:
 	  expr T_SEMI {
 		/* XXX: We should really do that only on the last name */
 		if ($1->tn_op == NAME)
 			$1->tn_sym->s_used = true;
 		$$ = $1;
 		expr($1, false, false, false, false);
 		seen_fallthrough = false;
+	  }
 	| non_expr_statement {
-		$$ = getnode();
+		$$ = expr_zalloc_tnode();
 		$$->tn_type = gettyp(VOID);
+	  }
+	;
 expr_statement_list:
 	  expr_statement_val
 	| expr_statement_list expr_statement_val {
 		$$ = $2;
+	  }
+	;
 selection_statement:		/* C99 6.8.4 */
 	  if_without_else {

 @@ -1,14 +1,14 @@
-/*	$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
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -96,27 +96,27 @@ extern	int	yylex(void);
 extern	const	char *record_filename(const char *, size_t);
 extern	int	get_filename_id(const char *);
 extern	void	add_directory_replacement(char *);
 extern	const char *transform_filename(const char *, size_t);
 extern	void	initmem(void);
 extern	void	*getblk(size_t);
 extern	void	*getlblk(size_t, size_t);
 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 *);
 /*
  * err.c
  */
 extern	int	nerr;
 extern	int	sytxerr;
 extern	const	char *msgs[];
 extern	void	msglist(void);
 extern	void	error(int, ...);

 @@ -1,14 +1,14 @@
-/*	$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
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #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>
 #include <sys/param.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "lint1.h"
 /*
  * Filenames allocated by record_filename are shared.
  */
 @@ -334,27 +334,27 @@ static	memory_block	*tmblk;
 /*
  * Return zero-initialized memory that is freed at the end of the current
  * expression.
  */
 void *
 tgetblk(size_t s)
+{
 	return xgetblk(&tmblk, 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;
 	return tn;
+}
 /* Free all memory which is allocated by the current expression. */
 void
 tfreeblk(void)
+{
 	xfreeblk(&tmblk);
+}

 @@ -1,14 +1,14 @@
-/*	$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
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #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>
 #include <limits.h>
 #include <math.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 static	tnode_t	*new_integer_constant_node(tspec_t, int64_t);
 @@ -171,43 +171,43 @@ tincref(type_t *tp, tspec_t t)
 	tp2->t_tspec = t;
 	tp2->t_subt = tp;
 	return tp2;
+}
 /*
  * Create a node for a constant.
  */
 tnode_t *
 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);
 	n->tn_val->v_tspec = tp->t_tspec;
 	n->tn_val->v_ansiu = v->v_ansiu;
 	n->tn_val->v_u = v->v_u;
 	free(v);
 	return n;
+}
 static tnode_t *
 new_integer_constant_node(tspec_t t, int64_t q)
+{
 	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);
 	n->tn_val->v_tspec = t;
 	n->tn_val->v_quad = q;
 	return n;
+}
 static void
 fallback_symbol(sym_t *sym)
+{
 	if (Tflag && strcmp(sym->s_name, "__lint_false") == 0) {
 @@ -269,51 +269,51 @@ new_name_node(sym_t *sym, int follow_tok
+			}
 			/*
 			 * XXX if tflag is set the symbol should be
 			 * exported to level 0
 			 */
 			sym->s_type = incref(sym->s_type, FUNC);
 		} else {
 			fallback_symbol(sym);
+		}
+	}
 	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;
 		n->tn_sym = sym;
 		if (sym->s_kind == FVFT && sym->s_type->t_tspec != FUNC)
 			n->tn_lvalue = true;
 	} else {
 		n->tn_op = CON;
 		n->tn_val = tgetblk(sizeof *n->tn_val);
 		*n->tn_val = sym->s_value;
+	}
 	return n;
+}
 tnode_t *
 new_string_node(strg_t *strg)
+{
 	size_t	len;
 	tnode_t	*n;
 	len = strg->st_len;
-	n = getnode();
+	n = expr_zalloc_tnode();
 	n->tn_op = STRING;
 	n->tn_type = tincref(gettyp(strg->st_tspec), ARRAY);
 	n->tn_type->t_dim = len + 1;
 	n->tn_lvalue = true;
 	n->tn_string = tgetblk(sizeof *n->tn_string);
 	n->tn_string->st_tspec = strg->st_tspec;
 	n->tn_string->st_len = len;
 	if (strg->st_tspec == CHAR) {
 		n->tn_string->st_cp = tgetblk(len + 1);
 		(void)memcpy(n->tn_string->st_cp, strg->st_cp, len + 1);
 @@ -1799,27 +1799,27 @@ check_enum_int_mismatch(op_t op, int arg
 /*
  * Build and initialize a new node.
  */
 static tnode_t *
 new_tnode(op_t op, type_t *type, tnode_t *ln, tnode_t *rn)
+{
 	tnode_t	*ntn;
 	tspec_t	t;
 #ifdef notyet
 	size_t l;
 	uint64_t rnum;
 #endif
-	ntn = getnode();
+	ntn = expr_zalloc_tnode();
 	ntn->tn_op = op;
 	ntn->tn_type = type;
 	if (ln->tn_from_system_header)
 		ntn->tn_from_system_header = true;
 	if (rn != NULL && rn->tn_from_system_header)
 		ntn->tn_from_system_header = true;
 	ntn->tn_left = ln;
 	ntn->tn_right = rn;
 	switch (op) {
 #ifdef notyet
 	case SHR:
 @@ -2046,27 +2046,27 @@ convert(op_t op, int arg, type_t *tp, tn
 	if (!tflag && !sflag && op == FARG)
 		check_prototype_conversion(arg, nt, ot, tp, tn);
 	if (is_integer(nt) && is_integer(ot)) {
 		check_integer_conversion(op, arg, nt, ot, tp, tn);
 	} else if (nt == PTR && is_null_pointer(tn)) {
 		/* a null pointer may be assigned to any pointer. */
 	} else if (is_integer(nt) && nt != BOOL && ot == PTR) {
 		check_pointer_integer_conversion(op, nt, tp, tn);
 	} else if (nt == PTR && ot == PTR) {
 		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;
 	ntn->tn_from_system_header |= tn->tn_from_system_header;
 	ntn->tn_right = NULL;
 	if (tn->tn_op != CON || nt == VOID) {
 		ntn->tn_left = tn;
 	} else {
 		ntn->tn_op = CON;
 		ntn->tn_val = tgetblk(sizeof *ntn->tn_val);
 		convert_constant(op, arg, ntn->tn_type, ntn->tn_val,
 		    tn->tn_val);
+	}
 @@ -3491,27 +3491,27 @@ cast(tnode_t *tn, type_t *tp)
 		 * XXX ANSI C requires scalar types or void (Plauger & Brodie).
 		 * But this seems really questionable.
 		 */
 	} else if (nt == UNION) {
 		sym_t *m;
 		struct_or_union *str = tp->t_str;
 		if (!Sflag) {
 			/* union cast is a C9X feature */
 			error(328);
 			return NULL;
+		}
 		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;
 				tn->tn_right = NULL;
 				return tn;
+			}
+		}
 		/* type '%s' is not a member of '%s' */
 		error(329, type_name(tn->tn_type), type_name(tp));
 		return NULL;
 	} else if (nt == STRUCT || nt == ARRAY || nt == FUNC) {
 		if (!Sflag || nt == ARRAY || nt == FUNC) {
 			/* invalid cast expression */