 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.57 2014/02/04 08:08:59 njoly Exp $ */
+/* $NetBSD: cgram.y,v 1.58 2014/02/18 22:01:36 christos 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.57 2014/02/04 08:08:59 njoly Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.58 2014/02/18 22:01:36 christos Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include "lint1.h"
 extern char *yytext;
 /*
  * Contains the level of current declaration. 0 is extern.
  * Used for symbol table entries.
  */
 @@ -120,26 +120,28 @@ static inline void RESTORE(const char *f
 	tqual_t	y_tqual;
 	type_t	*y_type;
 	tnode_t	*y_tnode;
 	range_t	y_range;
 	strg_t	*y_strg;
 	pqinf_t	*y_pqinf;
 };
 %token			T_LBRACE T_RBRACE T_LBRACK T_RBRACK T_LPARN T_RPARN
 %token	<y_op>		T_STROP
 %token	<y_op>		T_UNOP
 %token	<y_op>		T_INCDEC
 %token			T_SIZEOF
 %token			T_TYPEOF
 %token			T_EXTENSION
 %token			T_ALIGNOF
 %token	<y_op>		T_MULT
 %token	<y_op>		T_DIVOP
 %token	<y_op>		T_ADDOP
 %token	<y_op>		T_SHFTOP
 %token	<y_op>		T_RELOP
 %token	<y_op>		T_EQOP
 %token	<y_op>		T_AND
 %token	<y_op>		T_XOR
 %token	<y_op>		T_OR
 %token	<y_op>		T_LOGAND
 %token	<y_op>		T_LOGOR
 %token			T_QUEST
 @@ -543,26 +545,29 @@ clrtyp_typespec:
 typespec:
 	  notype_typespec {
 		$$ = $1;
+	  }
 	| T_TYPENAME {
 		$$ = getsym($1)->s_type;
+	  }
+	;
 notype_typespec:
 	  T_TYPE {
 		$$ = gettyp($1);
+	  }
 	| T_TYPEOF T_LPARN term T_RPARN {
 		$$ = $3->tn_type;
+	  }
 	| struct_spec {
 		popdecl();
 		$$ = $1;
+	  }
 	| enum_spec {
 		popdecl();
 		$$ = $1;
+	  }
+	;
 struct_spec:
 	  struct struct_tag {
 		/*
 @@ -1722,26 +1727,29 @@ term:
+	  }
 	| T_REAL term {
 		$$ = build(REAL, $2, NULL);
+	  }
 	| T_IMAG term {
 		$$ = build(IMAG, $2, NULL);
+	  }
 	| T_REAL T_LPARN term T_RPARN {
 		$$ = build(REAL, $3, NULL);
+	  }
 	| T_IMAG T_LPARN term T_RPARN {
 		$$ = build(IMAG, $3, NULL);
+	  }
 	| T_EXTENSION T_LPARN term T_RPARN {
 		$$ = $3;
+	  }
 	| T_SIZEOF term					%prec T_SIZEOF {
 		if (($$ = $2 == NULL ? NULL : bldszof($2->tn_type)) != NULL)
 			chkmisc($2, 0, 0, 0, 0, 0, 1);
+	  }
 	| T_SIZEOF T_LPARN type_name T_RPARN		%prec T_SIZEOF {
 		$$ = bldszof($3);
+	  }
 	| T_ALIGNOF T_LPARN type_name T_RPARN		%prec T_ALIGNOF {
 		$$ = bldalof($3);
+	  }
 	| T_LPARN type_name T_RPARN term		%prec T_UNOP {
 		$$ = cast($4, $2);
+	  }

 @@ -1,14 +1,14 @@
-/*	$NetBSD: err.c,v 1.46 2013/04/19 17:43:05 christos Exp $	*/
+/*	$NetBSD: err.c,v 1.47 2014/02/18 22:01:36 christos 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: err.c,v 1.46 2013/04/19 17:43:05 christos Exp $");
+__RCSID("$NetBSD: err.c,v 1.47 2014/02/18 22:01:36 christos Exp $");
 #endif
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include "lint1.h"
 /* number of errors found */
 int	nerr;
 /* number of syntax errors */
 int	sytxerr;
 @@ -198,27 +198,27 @@ const	char *msgs[] = {
 	"cannot do pointer arithmetic on operand of unknown size",    /* 136 */
 	"use of incomplete enum type, op %s",			      /* 137 */
 	"unknown operand size, op %s",				      /* 138 */
 	"division by 0",					      /* 139 */
 	"modulus by 0",						      /* 140 */
 	"integer overflow detected, op %s",			      /* 141 */
 	"floating point overflow detected, op %s",		      /* 142 */
 	"cannot take size/alignment of incomplete type",	      /* 143 */
 	"cannot take size/alignment of function",		      /* 144 */
 	"cannot take size/alignment of bit-field",		      /* 145 */
 	"cannot take size/alignment of void",			      /* 146 */
 	"invalid cast expression",				      /* 147 */
 	"improper cast of void expression",			      /* 148 */
-	"illegal function",					      /* 149 */
+	"illegal function (type %s)",				      /* 149 */
 	"argument mismatch: %d arg%s passed, %d expected",	      /* 150 */
 	"void expressions may not be arguments, arg #%d",	      /* 151 */
 	"argument cannot have unknown size, arg #%d",		      /* 152 */
 	"argument has incompatible pointer type, arg #%d (%s != %s)", /* 153 */
 	"illegal combination of pointer and integer, arg #%d",	      /* 154 */
 	"argument is incompatible with prototype, arg #%d",	      /* 155 */
 	"enum type mismatch, arg #%d",			       	      /* 156 */
 	"ANSI C treats constant as unsigned",			      /* 157 */
 	"%s may be used before set",			      	      /* 158 */
 	"assignment in conditional context",			      /* 159 */
 	"operator '==' found where '=' was expected",		      /* 160 */
 	"constant in conditional context",			      /* 161 */
 	"comparison of %s with %s, op %s",			      /* 162 */

 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: scan.l,v 1.53 2013/10/18 20:46:09 christos Exp $ */
+/* $NetBSD: scan.l,v 1.54 2014/02/18 22:01:36 christos 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: scan.l,v 1.53 2013/10/18 20:46:09 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.54 2014/02/18 22:01:36 christos Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include <float.h>
 #include <ctype.h>
 #include <errno.h>
 #include <math.h>
 #include "lint1.h"
 #include "cgram.h"
 @@ -220,52 +220,56 @@ static	struct	kwtab {
 	{ "_Bool",	T_TYPE,		0,	BOOL,	0,	  0, 1, 0 },
 	{ "case",	T_CASE,		0,	0,	0,	  0, 0, 0 },
 	{ "char",	T_TYPE,		0,	CHAR,	0,	  0, 0, 0 },
 	{ "const",	T_QUAL,		0,	0,	CONST,	  1, 0, 0 },
 	{ "_Complex",	T_TYPE,		0,	COMPLEX,0,	  0, 1, 0 },
 	{ "__const__",	T_QUAL,		0,	0,	CONST,	  0, 0, 0 },
 	{ "__const",	T_QUAL,		0,	0,	CONST,	  0, 0, 0 },
 	{ "continue",	T_CONTINUE,	0,	0,	0,	  0, 0, 0 },
 	{ "default",	T_DEFAULT,	0,	0,	0,	  0, 0, 0 },
 	{ "do",		T_DO,		0,	0,	0,	  0, 0, 0 },
 	{ "double",	T_TYPE,		0,	DOUBLE,	0,	  0, 0, 0 },
 	{ "else",	T_ELSE,		0,	0,	0,	  0, 0, 0 },
 	{ "enum",	T_ENUM,		0,	0,	0,	  0, 0, 0 },
 	{ "__extension__", T_EXTENSION,	0,	0,	0,	  0, 0, 1 },
 	{ "extern",	T_SCLASS,	EXTERN,	0,	0,	  0, 0, 0 },
 	{ "float",	T_TYPE,		0,	FLOAT,	0,	  0, 0, 0 },
 	{ "for",	T_FOR,		0,	0,	0,	  0, 0, 0 },
 	{ "goto",	T_GOTO,		0,	0,	0,	  0, 0, 0 },
 	{ "if",		T_IF,		0,	0,	0,	  0, 0, 0 },
 	{ "__imag__",	T_IMAG,		0,	0,	0,	  0, 1, 0 },
 	{ "inline",	T_SCLASS,	INLINE,	0,	0,	  0, 1, 0 },
 	{ "__inline__",	T_SCLASS,	INLINE,	0,	0,	  0, 0, 0 },
 	{ "__inline",	T_SCLASS,	INLINE,	0,	0,	  0, 0, 0 },
 	{ "int",	T_TYPE,		0,	INT,	0,	  0, 0, 0 },
 	{ "__symbolrename", T_SYMBOLRENAME, 0,	0,	0,	  0, 0, 0 },
 	{ "long",	T_TYPE,		0,	LONG,	0,	  0, 0, 0 },
 	{ "__real__",	T_REAL,		0,	0,	0,	  0, 1, 0 },
 	{ "register",	T_SCLASS,	REG,	0,	0,	  0, 0, 0 },
 	{ "restrict",	T_QUAL,		0,	0,	RESTRICT, 0, 1, 0 },
 	{ "return",	T_RETURN,	0,	0,	0,	  0, 0, 0 },
 	{ "__packed",	T_PACKED,	0,	0,	0,	  0, 0, 0 },
 	{ "short",	T_TYPE,		0,	SHORT,	0,	  0, 0, 0 },
 	{ "signed",	T_TYPE,		0,	SIGNED,	0,	  1, 0, 0 },
 	{ "__signed__",	T_TYPE,		0,	SIGNED,	0,	  0, 0, 0 },
 	{ "__signed",	T_TYPE,		0,	SIGNED,	0,	  0, 0, 0 },
 	{ "sizeof",	T_SIZEOF,	0,	0,	0,	  0, 0, 0 },
 	{ "static",	T_SCLASS,	STATIC,	0,	0,	  0, 0, 0 },
 	{ "struct",	T_SOU,		0,	STRUCT,	0,	  0, 0, 0 },
 	{ "switch",	T_SWITCH,	0,	0,	0,	  0, 0, 0 },
 	{ "typedef",	T_SCLASS,	TYPEDEF, 0,	0,	  0, 0, 0 },
 	{ "typeof",	T_TYPEOF,	0,	0,	0,	  0, 0, 1 },
 	{ "__typeof",	T_TYPEOF,	0,	0,	0,	  0, 0, 1 },
 	{ "__typeof__",	T_TYPEOF,	0,	0,	0,	  0, 0, 1 },
 	{ "union",	T_SOU,		0,	UNION,	0,	  0, 0, 0 },
 	{ "unsigned",	T_TYPE,		0,	UNSIGN,	0,	  0, 0, 0 },
 	{ "void",	T_TYPE,		0,	VOID,	0,	  0, 0, 0 },
 	{ "volatile",	T_QUAL,		0,	0,	VOLATILE, 1, 0, 0 },
 	{ "__volatile__", T_QUAL,	0,	0,	VOLATILE, 0, 0, 0 },
 	{ "__volatile",	T_QUAL,		0,	0,	VOLATILE, 0, 0, 0 },
 	{ "while",	T_WHILE,	0,	0,	0,	  0, 0, 0 },
 	{ NULL,		0,		0,	0,	0,	  0, 0, 0 }
 };
 /* Symbol table */
 static	sym_t	*symtab[HSHSIZ1];

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.74 2014/02/18 20:43:36 christos Exp $	*/
+/*	$NetBSD: tree.c,v 1.75 2014/02/18 22:01:36 christos 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.74 2014/02/18 20:43:36 christos Exp $");
+__RCSID("$NetBSD: tree.c,v 1.75 2014/02/18 22:01:36 christos Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <signal.h>
 #include "lint1.h"
 #include "cgram.h"
 #include "externs1.h"
 @@ -3161,28 +3161,29 @@ funccall(tnode_t *func, tnode_t *args)
 		fcop = CALL;
 	} else {
 		fcop = ICALL;
+	}
 	/*
 	 * after cconv() func will always be a pointer to a function
 	 * if it is a valid function designator.
 	 */
 	func = cconv(func);
 	if (func->tn_type->t_tspec != PTR ||
 	    func->tn_type->t_subt->t_tspec != FUNC) {
 		char buf[256];
 		/* illegal function */
-		error(149);
+		error(149, tyname(buf, sizeof(buf), func->tn_type));
 		return (NULL);
+	}
 	args = chkfarg(func->tn_type->t_subt, args);
 	ntn = mktnode(fcop, func->tn_type->t_subt->t_subt, func, args);
 	return (ntn);
+}
 /*
  * Check types of all function arguments and insert conversions,
  * if necessary.