 @@ -1,14 +1,14 @@
-/* $NetBSD: emit1.c,v 1.45 2021/07/05 19:39:12 rillig Exp $ */
+/* $NetBSD: emit1.c,v 1.46 2021/07/15 17:03:50 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
 @@ -28,27 +28,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: emit1.c,v 1.45 2021/07/05 19:39:12 rillig Exp $");
+__RCSID("$NetBSD: emit1.c,v 1.46 2021/07/15 17:03:50 rillig Exp $");
 #endif
 #include "lint1.h"
 static	void	outtt(sym_t *, sym_t *);
 static	void	outfstrg(strg_t *);
 /*
  * Write type into the output buffer.
  * The type is written as a sequence of substrings, each of which describes a
  * node of type type_t
  * a node is encoded as follows:
  *	_Bool			B
 @@ -148,55 +148,26 @@ outtype(const type_t *tp)
 			if (tp->t_vararg)
 				na++;
 			outint(na);
 			for (arg = tp->t_args; arg != NULL; arg = arg->s_next)
 				outtype(arg->s_type);
 			if (tp->t_vararg)
 				outchar('E');
+		}
 		tp = tp->t_subt;
+	}
+}
 /*
  * type to string
  * used for debugging output
  * it uses its own output buffer for conversion
  */
 const char *
 ttos(const type_t *tp)
 	static	ob_t	tob;
 	ob_t	tmp;
 	if (tob.o_buf == NULL) {
 		tob.o_len = 64;
 		tob.o_buf = tob.o_next = xmalloc(tob.o_len);
 		tob.o_end = tob.o_buf + tob.o_len;
 	tmp = ob;
 	ob = tob;
 	ob.o_next = ob.o_buf;
 	outtype(tp);
 	outchar('\0');
 	tob = ob;
 	ob = tmp;
 	return tob.o_buf;
 /*
  * write the name of a tag or typename
+ *
  * if the tag is named, the name of the tag is written,
  * otherwise, if a typename exists which refers to this tag,
  * this typename is written
  */
 static void
 outtt(sym_t *tag, sym_t *tdef)
+{
 	/* 0 is no longer used. */
 	if (tag->s_name != unnamed) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: externs1.h,v 1.117 2021/07/14 17:07:24 rillig Exp $	*/
+/*	$NetBSD: externs1.h,v 1.118 2021/07/15 17:03:50 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.
 @@ -304,27 +304,26 @@ extern	void	begin_initialization(sym_t *
 extern	void	end_initialization(void);
 extern	sym_t	**current_initsym(void);
 extern	void	init_rbrace(void);
 extern	void	init_lbrace(void);
 extern	void	init_expr(tnode_t *);
 extern	void	add_designator_member(sbuf_t *);
 extern	void	add_designator_subscript(range_t);
 /*
  * emit.c
  */
 extern	void	outtype(const type_t *);
 extern	const	char *ttos(const type_t *);
 extern	void	outsym(const sym_t *, scl_t, def_t);
 extern	void	outfdef(const sym_t *, const pos_t *, bool, bool,
 		    const sym_t *);
 extern	void	outcall(const tnode_t *, bool, bool);
 extern	void	outusg(const sym_t *);
 /*
  * lex.c
  */
 extern	int	lex_name(const char *, size_t);
 extern	int	lex_integer_constant(const char *, size_t, int);
 extern	int	lex_floating_constant(const char *, size_t);
 extern	int	lex_operator(int, op_t);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.314 2021/07/14 17:07:24 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.315 2021/07/15 17:03:50 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.314 2021/07/14 17:07:24 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.315 2021/07/15 17:03:50 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	*expr_new_integer_constant(tspec_t, int64_t);
 @@ -3805,27 +3805,27 @@ display_expression(const tnode_t *tn, in
 			char	*s;
 			size_t	n;
 			n = MB_CUR_MAX * (tn->tn_string->st_len + 1);
 			s = xmalloc(n);
 			(void)wcstombs(s, tn->tn_string->st_wcp, n);
 			(void)printf("L\"%s\"", s);
 			free(s);
+		}
 		(void)printf(" ");
 	} else if (tn->tn_op == FSEL) {
 		(void)printf("o=%d, l=%d ", tn->tn_type->t_foffs,
 			     tn->tn_type->t_flen);
+	}
-	(void)printf("%s\n", ttos(tn->tn_type));
+	(void)printf("%s\n", type_name(tn->tn_type));
 	if (tn->tn_op == NAME || tn->tn_op == CON || tn->tn_op == STRING)
 		return;
 	display_expression(tn->tn_left, offs + 2);
 	if (modtab[tn->tn_op].m_binary ||
 	    (tn->tn_op == PUSH && tn->tn_right != NULL)) {
 		display_expression(tn->tn_right, offs + 2);
+	}
+}
 /*
  * Called by expr() to recursively perform some tests.
  */
 /* ARGSUSED */