 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.309 2021/07/11 17:52:20 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.310 2021/07/11 18:03:47 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.309 2021/07/11 17:52:20 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.310 2021/07/11 18:03:47 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.
 @@ -135,27 +135,27 @@ anonymize(sym_t *s)
 	tspec_t	y_tspec;
 	tqual_t	y_tqual;
 	type_t	*y_type;
 	tnode_t	*y_tnode;
 	range_t	y_range;
 	strg_t	*y_string;
 	qual_ptr *y_qual_ptr;
 	bool	y_seen_statement;
 	struct generic_association *y_generic;
 };
 %token			T_LBRACE T_RBRACE T_LBRACK T_RBRACK T_LPAREN T_RPAREN
 %token			T_POINT T_ARROW
-%token	<y_op>		T_UNARY
+%token			T_COMPLEMENT T_LOGNOT
 %token	<y_op>		T_INCDEC
 %token			T_SIZEOF
 %token			T_BUILTIN_OFFSETOF
 %token			T_TYPEOF
 %token			T_EXTENSION
 %token			T_ALIGNAS
 %token			T_ALIGNOF
 %token			T_ASTERISK
 %token	<y_op>		T_MULTIPLICATIVE
 %token	<y_op>		T_ADDITIVE
 %token	<y_op>		T_SHIFT
 %token	<y_op>		T_RELATIONAL
 %token	<y_op>		T_EQUALITY
 @@ -1813,28 +1813,31 @@ unary_expression:		/* C99 6.5.3 */
 	| T_AMPER term {
 		$$ = build(ADDR, $2, NULL);
+	  }
 	| T_ASTERISK term {
 		$$ = build(INDIR, $2, NULL);
+	  }
 	| T_ADDITIVE term {
 		if (tflag && $1 == PLUS) {
 			/* unary + is illegal in traditional C */
 			warning(100);
+		}
 		$$ = build($1 == PLUS ? UPLUS : UMINUS, $2, NULL);
+	  }
-	| T_UNARY term {
+	| T_COMPLEMENT term {
-		$$ = build($1, $2, NULL);
+		$$ = build(COMPL, $2, NULL);
+	  }
 	| T_LOGNOT term {
 		$$ = build(NOT, $2, NULL);
+	  }
 	| T_SIZEOF unary_expression {
 		$$ = $2 == NULL ? NULL : build_sizeof($2->tn_type);
 		if ($$ != NULL)
 			check_expr_misc($2, false, false, false, false, false, true);
+	  }
 	| T_SIZEOF T_LPAREN type_name T_RPAREN {
 		$$ = build_sizeof($3);
+	  }
+	;
 term:				/* see C99 6.5.1 */
 	  unary_expression

 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: scan.l,v 1.134 2021/06/20 18:15:12 rillig Exp $ */
+/* $NetBSD: scan.l,v 1.135 2021/07/11 18:03:47 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: scan.l,v 1.134 2021/06/20 18:15:12 rillig Exp $");
+__RCSID("$NetBSD: scan.l,v 1.135 2021/07/11 18:03:47 rillig Exp $");
 #endif
 #include "lint1.h"
 #include "cgram.h"
 %}
 L	[_A-Za-z]
 D	[0-9]
 NZD	[1-9]
 BD	[0-1]
 OD	[0-7]
 @@ -91,28 +91,28 @@ TL	([fFlL]?[i]?)
 "<="				return lex_operator(T_RELATIONAL, LE);
 ">="				return lex_operator(T_RELATIONAL, GE);
 "<<"				return lex_operator(T_SHIFT, SHL);
 ">>"				return lex_operator(T_SHIFT, SHR);
 "++"				return lex_operator(T_INCDEC, INC);
 "--"				return lex_operator(T_INCDEC, DEC);
 "->"				return T_ARROW;
 "."				return T_POINT;
 "+"				return lex_operator(T_ADDITIVE, PLUS);
 "-"				return lex_operator(T_ADDITIVE, MINUS);
 "*"				return T_ASTERISK;
 "/"				return lex_operator(T_MULTIPLICATIVE, DIV);
 "%"				return lex_operator(T_MULTIPLICATIVE, MOD);
-"!"				return lex_operator(T_UNARY, NOT);
+"!"				return T_LOGNOT;
-"~"				return lex_operator(T_UNARY, COMPL);
+"~"				return T_COMPLEMENT;
 "\""				return lex_string();
 "L\""				return lex_wide_string();
 ";"				return T_SEMI;
 "{"				return T_LBRACE;
 "}"				return T_RBRACE;
 ","				return T_COMMA;
 ":"				return T_COLON;
 "?"				return T_QUEST;
 "["				return T_LBRACK;
 "]"				return T_RBRACK;
 "("				return T_LPAREN;
 ")"				return T_RPAREN;
 "..."				return T_ELLIPSIS;