 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.60 2014/04/17 17:29:24 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.61 2014/04/18 00:23:46 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.60 2014/04/17 17:29:24 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.61 2014/04/18 00:23:46 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.
  */
 @@ -179,31 +179,37 @@ static inline void RESTORE(const char *f
 %token			T_WHILE
 %token			T_FOR
 %token			T_GOTO
 %token			T_CONTINUE
 %token			T_BREAK
 %token			T_RETURN
 %token			T_ASM
 %token			T_SYMBOLRENAME
 %token			T_PACKED
 /* Type Attributes */
 %token <y_type>		T_ATTRIBUTE
 %token <y_type>		T_AT_ALIGNED
 %token <y_type>		T_AT_DEPRECATED
 %token <y_type>		T_AT_NORETURN
 %token <y_type>		T_AT_MAY_ALIAS
 %token <y_type>		T_AT_PACKED
 %token <y_type>		T_AT_PURE
 %token <y_type>		T_AT_TUINION
 %token <y_type>		T_AT_TUNION
 %token <y_type>		T_AT_UNUSED
 %token <y_type>		T_AT_FORMAT
 %token <y_type>		T_AT_FORMAT_PRINTF
 %token <y_type>		T_AT_FORMAT_SCANF
 %token <y_type>		T_AT_FORMAT_STRFTIME
 %left	T_COMMA
 %right	T_ASSIGN T_OPASS
 %right	T_QUEST T_COLON
 %left	T_LOGOR
 %left	T_LOGAND
 %left	T_OR
 %left	T_XOR
 %left	T_AND
 %left	T_EQOP
 %left	T_RELOP
 @@ -460,39 +466,53 @@ declaration:
 	| declspecs deftyp T_SEMI {
 		if (dcs->d_scl == TYPEDEF) {
 			/* typedef declares no type name */
 			warning(72);
 		} else if (!dcs->d_nedecl) {
 			/* empty declaration */
 			warning(2);
+		}
+	  }
 	| declspecs deftyp type_init_decls T_SEMI
 	| error T_SEMI
+	;
 type_attribute_format_type:
 	  T_AT_FORMAT_PRINTF
 	| T_AT_FORMAT_SCANF
 	| T_AT_FORMAT_STRFTIME
+	;
 type_attribute_spec:
 	  T_AT_DEPRECATED
 	| T_AT_ALIGNED T_LPARN constant T_RPARN
 	| T_AT_MAY_ALIAS
 	| T_AT_NORETURN
 	| T_AT_PACKED {
 		addpacked();
+	}
 	| T_AT_PURE
 	| T_AT_TUNION
 	| T_AT_FORMAT T_LPARN type_attribute_format_type T_COMMA
 	    constant T_COMMA constant T_RPARN
 	| T_AT_UNUSED
+	;
 type_attribute:
-	  T_ATTRIBUTE T_LPARN T_LPARN type_attribute_spec T_RPARN T_RPARN
+	  T_ATTRIBUTE T_LPARN T_LPARN {
 	    attron = 1;
 	} type_attribute_spec {
 	    attron = 0;
 	} T_RPARN T_RPARN
 	| T_PACKED {
 		addpacked();
+	}
+	;
 clrtyp:
+	  {
 		clrtyp();
+	  }
+	;
 deftyp:
 	  /* empty */ {

 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: scan.l,v 1.54 2014/02/18 22:01:36 christos Exp $ */
+/* $NetBSD: scan.l,v 1.55 2014/04/18 00:23:46 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,51 +25,54 @@
  * 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.54 2014/02/18 22:01:36 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.55 2014/04/18 00:23:46 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"
 #define CHAR_MASK	(~(~0 << CHAR_BIT))
 /* Current position (its also updated when an included file is parsed) */
 pos_t	curr_pos = { 1, "", 0 };
 /*
  * Current position in C source (not updated when an included file is
  * parsed).
  */
 pos_t	csrc_pos = { 1, "", 0 };
 /* Are we parsing a gcc attribute? */
 int attron;
 static	void	incline(void);
 static	void	badchar(int);
 static	sbuf_t	*allocsb(void);
 static	void	freesb(sbuf_t *);
 static	int	inpc(void);
 static	int	hash(const char *);
 static	sym_t	*search(sbuf_t *);
 static	int	name(void);
 static	int	keyw(sym_t *);
 static	int	icon(int);
 static	int	fcon(void);
 static	int	operator(int, op_t);
 static	int	ccon(void);
 @@ -183,101 +186,115 @@ badchar(int c)
 	error(250, c);
+}
 /*
  * Keywords.
  * During initialisation they are written to the symbol table.
  */
 static	struct	kwtab {
 	const	char *kw_name;	/* keyword */
 	int	kw_token;	/* token returned by yylex() */
 	scl_t	kw_scl;		/* storage class if kw_token T_SCLASS */
 	tspec_t	kw_tspec;	/* type spec. if kw_token T_TYPE or T_SOU */
 	tqual_t	kw_tqual;	/* type qual. fi kw_token T_QUAL */
-	u_int	kw_c89;		/* c89 keyword */
+	u_int	kw_c89 : 1;	/* c89 keyword */
-	u_int	kw_c99;		/* c99 keyword */
+	u_int	kw_c99 : 1;	/* c99 keyword */
-	u_int	kw_gcc;		/* GCC keyword */
+	u_int	kw_gcc : 1;	/* GCC keyword */
 	u_int	kw_attr : 1;	/* GCC attribute, keyword */
 } kwtab[] = {
-	{ "__alignof__", T_ALIGNOF,	0,	0,	0,	  0, 0, 0 },
+	{ "__alignof__", T_ALIGNOF,	0,	0,	0,	  0, 0, 0, 0 },
-	{ "__attribute__",T_ATTRIBUTE,	0,	0,	0,	  0, 0, 1 },
+	{ "__attribute__",T_ATTRIBUTE,	0,	0,	0,	  0, 0, 1, 0 },
-	{ "attribute",	T_ATTRIBUTE,	0,	0,	0,	  0, 0, 1 },
+	{ "attribute",	T_ATTRIBUTE,	0,	0,	0,	  0, 0, 1, 0 },
-	{ "__packed__",	T_AT_PACKED,	0,	0,	0,	  0, 0, 1 },
+	{ "__packed__",	T_AT_PACKED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "packed",	T_AT_PACKED,	0,	0,	0,	  0, 0, 1 },
+	{ "packed",	T_AT_PACKED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__aligned__",T_AT_ALIGNED,	0,	0,	0,	  0, 0, 1 },
+	{ "__aligned__",T_AT_ALIGNED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "aligned",	T_AT_ALIGNED,	0,	0,	0,	  0, 0, 1 },
+	{ "aligned",	T_AT_ALIGNED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__transparent_union__",T_AT_TUNION,0,0,	0,	  0, 0, 1 },
+	{ "__transparent_union__",T_AT_TUNION,0,0,	0,	  0, 0, 1, 1 },
-	{ "transparent_union",T_AT_TUNION,0,	0,	0,	  0, 0, 1 },
+	{ "transparent_union",T_AT_TUNION,0,	0,	0,	  0, 0, 1, 1 },
-	{ "__unused__",	T_AT_UNUSED,	0,	0,	0,	  0, 0, 1 },
+	{ "__unused__",	T_AT_UNUSED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "unused",	T_AT_UNUSED,	0,	0,	0,	  0, 0, 1 },
+	{ "unused",	T_AT_UNUSED,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__deprecated__",T_AT_DEPRECATED,0,	0,	0,	  0, 0, 1 },
+	{ "__deprecated__",T_AT_DEPRECATED,0,	0,	0,	  0, 0, 1, 1 },
-	{ "deprecated",	T_AT_DEPRECATED,0,	0,	0,	  0, 0, 1 },
+	{ "deprecated",	T_AT_DEPRECATED,0,	0,	0,	  0, 0, 1, 1 },
-	{ "__may_alias__",T_AT_MAY_ALIAS,0,	0,	0,	  0, 0, 1 },
+	{ "__may_alias__",T_AT_MAY_ALIAS,0,	0,	0,	  0, 0, 1, 1 },
-	{ "may_alias",	T_AT_MAY_ALIAS,	0,	0,	0,	  0, 0, 1 },
+	{ "may_alias",	T_AT_MAY_ALIAS,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "asm",	T_ASM,		0,	0,	0,	  0, 0, 1 },
+	{ "format",	T_AT_FORMAT,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__asm",	T_ASM,		0,	0,	0,	  0, 0, 0 },
+	{ "__format__",	T_AT_FORMAT,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__asm__",	T_ASM,		0,	0,	0,	  0, 0, 0 },
+	{ "printf",	T_AT_FORMAT_PRINTF,0,	0,	0,	  0, 0, 1, 1 },
-	{ "auto",	T_SCLASS,	AUTO,	0,	0,	  0, 0, 0 },
+	{ "__printf__",	T_AT_FORMAT_PRINTF,0,	0,	0,	  0, 0, 1, 1 },
-	{ "break",	T_BREAK,	0,	0,	0,	  0, 0, 0 },
+	{ "scanf",	T_AT_FORMAT_SCANF,0,	0,	0,	  0, 0, 1, 1 },
-	{ "_Bool",	T_TYPE,		0,	BOOL,	0,	  0, 1, 0 },
+	{ "__scanf__",	T_AT_FORMAT_SCANF,0,	0,	0,	  0, 0, 1, 1 },
-	{ "case",	T_CASE,		0,	0,	0,	  0, 0, 0 },
+	{ "strftime",	T_AT_FORMAT_SCANF,0,	0,	0,	  0, 0, 1, 1 },
-	{ "char",	T_TYPE,		0,	CHAR,	0,	  0, 0, 0 },
+	{ "__strftime__",T_AT_FORMAT_STRFTIME,0,0,	0,	  0, 0, 1, 1 },
-	{ "const",	T_QUAL,		0,	0,	CONST,	  1, 0, 0 },
+	{ "pure",	T_AT_PURE,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "_Complex",	T_TYPE,		0,	COMPLEX,0,	  0, 1, 0 },
+	{ "__pure__",	T_AT_PURE,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__const__",	T_QUAL,		0,	0,	CONST,	  0, 0, 0 },
+	{ "noreturn",	T_AT_NORETURN,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "__const",	T_QUAL,		0,	0,	CONST,	  0, 0, 0 },
+	{ "__noreturn__",T_AT_NORETURN,	0,	0,	0,	  0, 0, 1, 1 },
-	{ "continue",	T_CONTINUE,	0,	0,	0,	  0, 0, 0 },
+	{ "asm",	T_ASM,		0,	0,	0,	  0, 0, 1, 1 },
-	{ "default",	T_DEFAULT,	0,	0,	0,	  0, 0, 0 },
+	{ "__asm",	T_ASM,		0,	0,	0,	  0, 0, 0, 0 },
-	{ "do",		T_DO,		0,	0,	0,	  0, 0, 0 },
+	{ "__asm__",	T_ASM,		0,	0,	0,	  0, 0, 0, 0 },
-	{ "double",	T_TYPE,		0,	DOUBLE,	0,	  0, 0, 0 },
+	{ "auto",	T_SCLASS,	AUTO,	0,	0,	  0, 0, 0, 0 },
-	{ "else",	T_ELSE,		0,	0,	0,	  0, 0, 0 },
+	{ "break",	T_BREAK,	0,	0,	0,	  0, 0, 0, 0 },
-	{ "enum",	T_ENUM,		0,	0,	0,	  0, 0, 0 },
+	{ "_Bool",	T_TYPE,		0,	BOOL,	0,	  0, 1, 0, 0 },
-	{ "__extension__", T_EXTENSION,	0,	0,	0,	  0, 0, 1 },
+	{ "case",	T_CASE,		0,	0,	0,	  0, 0, 0, 0 },
-	{ "extern",	T_SCLASS,	EXTERN,	0,	0,	  0, 0, 0 },
+	{ "char",	T_TYPE,		0,	CHAR,	0,	  0, 0, 0, 0 },
-	{ "float",	T_TYPE,		0,	FLOAT,	0,	  0, 0, 0 },
+	{ "const",	T_QUAL,		0,	0,	CONST,	  1, 0, 0, 0 },
-	{ "for",	T_FOR,		0,	0,	0,	  0, 0, 0 },
+	{ "_Complex",	T_TYPE,		0,	COMPLEX,0,	  0, 1, 0, 0 },
-	{ "goto",	T_GOTO,		0,	0,	0,	  0, 0, 0 },
+	{ "__const__",	T_QUAL,		0,	0,	CONST,	  0, 0, 0, 0 },
-	{ "if",		T_IF,		0,	0,	0,	  0, 0, 0 },
+	{ "__const",	T_QUAL,		0,	0,	CONST,	  0, 0, 0, 0 },
-	{ "__imag__",	T_IMAG,		0,	0,	0,	  0, 1, 0 },
+	{ "continue",	T_CONTINUE,	0,	0,	0,	  0, 0, 0, 0 },
-	{ "inline",	T_SCLASS,	INLINE,	0,	0,	  0, 1, 0 },
+	{ "default",	T_DEFAULT,	0,	0,	0,	  0, 0, 0, 0 },
-	{ "__inline__",	T_SCLASS,	INLINE,	0,	0,	  0, 0, 0 },
+	{ "do",		T_DO,		0,	0,	0,	  0, 0, 0, 0 },
-	{ "__inline",	T_SCLASS,	INLINE,	0,	0,	  0, 0, 0 },
+	{ "double",	T_TYPE,		0,	DOUBLE,	0,	  0, 0, 0, 0 },
-	{ "int",	T_TYPE,		0,	INT,	0,	  0, 0, 0 },
+	{ "else",	T_ELSE,		0,	0,	0,	  0, 0, 0, 0 },
-	{ "__symbolrename", T_SYMBOLRENAME, 0,	0,	0,	  0, 0, 0 },
+	{ "enum",	T_ENUM,		0,	0,	0,	  0, 0, 0, 0 },
-	{ "long",	T_TYPE,		0,	LONG,	0,	  0, 0, 0 },
+	{ "__extension__", T_EXTENSION,	0,	0,	0,	  0, 0, 1, 0 },
-	{ "__real__",	T_REAL,		0,	0,	0,	  0, 1, 0 },
+	{ "extern",	T_SCLASS,	EXTERN,	0,	0,	  0, 0, 0, 0 },
-	{ "register",	T_SCLASS,	REG,	0,	0,	  0, 0, 0 },
+	{ "float",	T_TYPE,		0,	FLOAT,	0,	  0, 0, 0, 0 },
-	{ "restrict",	T_QUAL,		0,	0,	RESTRICT, 0, 1, 0 },
+	{ "for",	T_FOR,		0,	0,	0,	  0, 0, 0, 0 },
-	{ "return",	T_RETURN,	0,	0,	0,	  0, 0, 0 },
+	{ "goto",	T_GOTO,		0,	0,	0,	  0, 0, 0, 0 },
-	{ "__packed",	T_PACKED,	0,	0,	0,	  0, 0, 0 },
+	{ "if",		T_IF,		0,	0,	0,	  0, 0, 0, 0 },
-	{ "short",	T_TYPE,		0,	SHORT,	0,	  0, 0, 0 },
+	{ "__imag__",	T_IMAG,		0,	0,	0,	  0, 1, 0, 0 },
-	{ "signed",	T_TYPE,		0,	SIGNED,	0,	  1, 0, 0 },
+	{ "inline",	T_SCLASS,	INLINE,	0,	0,	  0, 1, 0, 0 },
-	{ "__signed__",	T_TYPE,		0,	SIGNED,	0,	  0, 0, 0 },
+	{ "__inline__",	T_SCLASS,	INLINE,	0,	0,	  0, 0, 0, 0 },
-	{ "__signed",	T_TYPE,		0,	SIGNED,	0,	  0, 0, 0 },
+	{ "__inline",	T_SCLASS,	INLINE,	0,	0,	  0, 0, 0, 0 },
-	{ "sizeof",	T_SIZEOF,	0,	0,	0,	  0, 0, 0 },
+	{ "int",	T_TYPE,		0,	INT,	0,	  0, 0, 0, 0 },
-	{ "static",	T_SCLASS,	STATIC,	0,	0,	  0, 0, 0 },
+	{ "__symbolrename", T_SYMBOLRENAME, 0,	0,	0,	  0, 0, 0, 0 },
-	{ "struct",	T_SOU,		0,	STRUCT,	0,	  0, 0, 0 },
+	{ "long",	T_TYPE,		0,	LONG,	0,	  0, 0, 0, 0 },
-	{ "switch",	T_SWITCH,	0,	0,	0,	  0, 0, 0 },
+	{ "__real__",	T_REAL,		0,	0,	0,	  0, 1, 0, 0 },
-	{ "typedef",	T_SCLASS,	TYPEDEF, 0,	0,	  0, 0, 0 },
+	{ "register",	T_SCLASS,	REG,	0,	0,	  0, 0, 0, 0 },
-	{ "typeof",	T_TYPEOF,	0,	0,	0,	  0, 0, 1 },
+	{ "__restrict__",T_QUAL,	0,	0,	RESTRICT, 0, 1, 0, 0 },
-	{ "__typeof",	T_TYPEOF,	0,	0,	0,	  0, 0, 1 },
+	{ "restrict",	T_QUAL,		0,	0,	RESTRICT, 0, 1, 0, 0 },
-	{ "__typeof__",	T_TYPEOF,	0,	0,	0,	  0, 0, 1 },
+	{ "return",	T_RETURN,	0,	0,	0,	  0, 0, 0, 0 },
-	{ "union",	T_SOU,		0,	UNION,	0,	  0, 0, 0 },
+	{ "__packed",	T_PACKED,	0,	0,	0,	  0, 0, 0, 0 },
-	{ "unsigned",	T_TYPE,		0,	UNSIGN,	0,	  0, 0, 0 },
+	{ "short",	T_TYPE,		0,	SHORT,	0,	  0, 0, 0, 0 },
-	{ "void",	T_TYPE,		0,	VOID,	0,	  0, 0, 0 },
+	{ "signed",	T_TYPE,		0,	SIGNED,	0,	  1, 0, 0, 0 },
-	{ "volatile",	T_QUAL,		0,	0,	VOLATILE, 1, 0, 0 },
+	{ "__signed__",	T_TYPE,		0,	SIGNED,	0,	  0, 0, 0, 0 },
-	{ "__volatile__", T_QUAL,	0,	0,	VOLATILE, 0, 0, 0 },
+	{ "__signed",	T_TYPE,		0,	SIGNED,	0,	  0, 0, 0, 0 },
-	{ "__volatile",	T_QUAL,		0,	0,	VOLATILE, 0, 0, 0 },
+	{ "sizeof",	T_SIZEOF,	0,	0,	0,	  0, 0, 0, 0 },
-	{ "while",	T_WHILE,	0,	0,	0,	  0, 0, 0 },
+	{ "static",	T_SCLASS,	STATIC,	0,	0,	  0, 0, 0, 0 },
-	{ NULL,		0,		0,	0,	0,	  0, 0, 0 }
+	{ "struct",	T_SOU,		0,	STRUCT,	0,	  0, 0, 0, 0 },
 	{ "switch",	T_SWITCH,	0,	0,	0,	  0, 0, 0, 0 },
 	{ "typedef",	T_SCLASS,	TYPEDEF, 0,	0,	  0, 0, 0, 0 },
 	{ "typeof",	T_TYPEOF,	0,	0,	0,	  0, 0, 1, 0 },
 	{ "__typeof",	T_TYPEOF,	0,	0,	0,	  0, 0, 1, 0 },
 	{ "__typeof__",	T_TYPEOF,	0,	0,	0,	  0, 0, 1, 0 },
 	{ "union",	T_SOU,		0,	UNION,	0,	  0, 0, 0, 0 },
 	{ "unsigned",	T_TYPE,		0,	UNSIGN,	0,	  0, 0, 0, 0 },
 	{ "void",	T_TYPE,		0,	VOID,	0,	  0, 0, 0, 0 },
 	{ "volatile",	T_QUAL,		0,	0,	VOLATILE, 1, 0, 0, 0 },
 	{ "__volatile__", T_QUAL,	0,	0,	VOLATILE, 0, 0, 0, 0 },
 	{ "__volatile",	T_QUAL,		0,	0,	VOLATILE, 0, 0, 0, 0 },
 	{ "while",	T_WHILE,	0,	0,	0,	  0, 0, 0, 0 },
 	{ NULL,		0,		0,	0,	0,	  0, 0, 0, 0 }
 };
 /* Symbol table */
 static	sym_t	*symtab[HSHSIZ1];
 /* bit i of the entry with index i is set */
 uint64_t qbmasks[sizeof(uint64_t) * CHAR_BIT];
 /* least significant i bits are set in the entry with index i */
 uint64_t qlmasks[sizeof(uint64_t) * CHAR_BIT + 1];
 /* least significant i bits are not set in the entry with index i */
 uint64_t qumasks[sizeof(uint64_t) * CHAR_BIT + 1];
 @@ -300,27 +317,27 @@ initscan(void)
 	sym_t	*sym;
 	size_t	h, i;
 	uint64_t uq;
 	for (kw = kwtab; kw->kw_name != NULL; kw++) {
 		if ((kw->kw_c89 || kw->kw_c99) && tflag)
 			continue;
 		if (kw->kw_c99 && !(Sflag || gflag))
 			continue;
 		if (kw->kw_gcc && !gflag)
 			continue;
 		sym = getblk(sizeof (sym_t));
 		sym->s_name = kw->kw_name;
-		sym->s_keyw = 1;
+		sym->s_keyw = kw;
 		sym->s_value.v_quad = kw->kw_token;
 		if (kw->kw_token == T_TYPE || kw->kw_token == T_SOU) {
 			sym->s_tspec = kw->kw_tspec;
 		} else if (kw->kw_token == T_SCLASS) {
 			sym->s_scl = kw->kw_scl;
 		} else if (kw->kw_token == T_QUAL) {
 			sym->s_tqual = kw->kw_tqual;
+		}
 		h = hash(sym->s_name);
 		if ((sym->s_link = symtab[h]) != NULL)
 			symtab[h]->s_rlink = &sym->s_link;
 		sym->s_rlink = &symtab[h];
 		symtab[h] = sym;
 @@ -337,40 +354,46 @@ initscan(void)
 	qlmasks[i] = ~(uint64_t)0;
+}
 /*
  * Get a free sbuf structure, if possible from the free list
  */
 static sbuf_t *
 allocsb(void)
+{
 	sbuf_t	*sb;
 	if ((sb = sbfrlst) != NULL) {
 		sbfrlst = sb->sb_nxt;
 #ifdef BLKDEBUG
 		(void)memset(sb, 0, sizeof (*sb));
 #else
 		sb->sb_nxt = NULL;
 #endif
 	} else {
 		sb = xmalloc(sizeof (sbuf_t));
 		(void)memset(sb, 0, sizeof (*sb));
+	}
 	(void)memset(sb, 0, sizeof (*sb));
 	return (sb);
+}
 /*
  * Put a sbuf structure to the free list
  */
 static void
 freesb(sbuf_t *sb)
+{
 	(void)memset(sb, ZERO, sizeof (*sb));
 	sb->sb_nxt = sbfrlst;
 	sbfrlst = sb;
+}
 /*
  * Read a character and ensure that it is positive (except EOF).
  * Increment line count(s) if necessary.
  */
 static int
 inpc(void)
+{
 	int	c;
 @@ -411,28 +434,31 @@ hash(const char *s)
 static int
 name(void)
+{
 	char	*s;
 	sbuf_t	*sb;
 	sym_t	*sym;
 	int	tok;
 	sb = allocsb();
 	sb->sb_name = yytext;
 	sb->sb_len = yyleng;
 	sb->sb_hash = hash(yytext);
 	if ((sym = search(sb)) != NULL && sym->s_keyw) {
-		freesb(sb);
+		struct kwtab *kw = sym->s_keyw;
-		return (keyw(sym));
+		if (!kw->kw_attr || attron) {
 			freesb(sb);
 			return (keyw(sym));
+		}
+	}
 	sb->sb_sym = sym;
 	if (sym != NULL) {
 		if (blklev < sym->s_blklev)
 			LERROR("name()");
 		sb->sb_name = sym->s_name;
 		sb->sb_len = strlen(sym->s_name);
 		tok = sym->s_scl == TYPEDEF ? T_TYPENAME : T_NAME;
 	} else {
 		s = getblk(yyleng + 1);
 		(void)memcpy(s, yytext, yyleng + 1);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: externs1.h,v 1.31 2013/04/19 17:43:05 christos Exp $	*/
+/*	$NetBSD: externs1.h,v 1.32 2014/04/18 00:23:46 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.
 @@ -58,26 +58,27 @@ extern	void	norecover(void);
 /*
  * cgram.y
  */
 extern	int	blklev;
 extern	int	mblklev;
 extern	int	yydebug;
 extern	int	yyerror(const char *);
 extern	int	yyparse(void);
 /*
  * scan.l
  */
 extern  int	attron;
 extern	pos_t	curr_pos;
 extern	pos_t	csrc_pos;
 extern	symt_t	symtyp;
 extern	FILE	*yyin;
 extern	uint64_t qbmasks[], qlmasks[], qumasks[];
 extern	void	initscan(void);
 extern	int	sign(int64_t, tspec_t, int);
 extern	int	msb(int64_t, tspec_t, int);
 extern	int64_t	xsign(int64_t, tspec_t, int);
 extern	void	clrwflgs(void);
 extern	sym_t	*getsym(sbuf_t *);
 extern	void	cleanup(void);