 @@ -1,14 +1,14 @@
-/* $NetBSD: lint1.h,v 1.21 2008/05/01 21:52:19 christos Exp $ */
+/* $NetBSD: lint1.h,v 1.22 2008/12/10 16:12:39 joerg 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
 @@ -71,27 +71,27 @@ typedef	struct strg {
 	union {
 		u_char	*_st_cp;
 		wchar_t	*_st_wcp;
 	} st_u;
 } strg_t;
 #define st_cp	st_u._st_cp
 #define	st_wcp	st_u._st_wcp
 /*
  * qualifiers (only for lex/yacc interface)
  */
 typedef enum {
-	CONST, VOLATILE
+	CONST, VOLATILE, RESTRICT
 } tqual_t;
 /*
  * Integer and floating point values are stored in this structure
  */
 typedef struct {
 	tspec_t	v_tspec;
 	int	v_ansiu;		/* set if an integer constant is
 					   unsigned in ANSI C */
 	union {
 		int64_t	_v_quad;	/* integers */
 		ldbl_t	_v_ldbl;	/* floats */
 	} v_u;

 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: scan.l,v 1.41 2008/10/13 14:00:37 dholland Exp $ */
+/* $NetBSD: scan.l,v 1.42 2008/12/10 16:12:39 joerg 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.41 2008/10/13 14:00:37 dholland Exp $");
+__RCSID("$NetBSD: scan.l,v 1.42 2008/12/10 16:12:39 joerg 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"
 @@ -215,26 +215,27 @@ static	struct	kwtab {
 	{ "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 },
 	{ "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 },
 	{ "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 },