 @@ -1,26 +1,31 @@
-/*	$NetBSD: lang_level_c99.c,v 1.2 2023/08/06 19:44:50 rillig Exp $	*/
+/*	$NetBSD: lang_level_c99.c,v 1.3 2024/03/28 21:04:48 rillig Exp $	*/
 # 3 "lang_level_c99.c"
 /*
- * Tests that are specific to the C99 language level, in particular, features
+ * Tests that are specific to the C99 language level, in particular:
  * that were added in C99.
+ *
- * In the below comments, [-] means unsupported and [x] means supported.
+ *	* syntax elements that were added in C99
  *	* lint diagnostics that differ between the C90 and C99 language levels
  *	* lint diagnostics that differ between the C99 and C11 language levels
  */
 /* lint1-flags: -S -w -X 351 */
-/* C99 Foreword */
+/*
  * Features that were added in the C99 standard, as listed in the C99 foreword.
+ *
  * In the below comments, [-] means unsupported and [x] means supported.
  */
 // [-] restricted character set support via digraphs and <iso646.h>
 //
 // Lint neither parses digraphs nor trigraphs.
 // [x] wide character library support in <wchar.h> and <wctype.h>
 //
 // On all supported platforms, 'wchar_t' == 'int'.
 const int wide_string[] = L"wide";
 // [x] more precise aliasing rules via effective type
 //

 @@ -1,25 +1,25 @@
-[//]: # ($NetBSD: README.md,v 1.16 2024/03/09 13:54:47 rillig Exp $)
+[//]: # ($NetBSD: README.md,v 1.17 2024/03/28 21:04:48 rillig Exp $)
 # Introduction
 Lint1 analyzes a single translation unit of C code.
 * It reads the output of the C preprocessor, retaining the comments.
 * The lexer in `scan.l` and `lex.c` splits the input into tokens.
 * The parser in `cgram.y` creates types and expressions from the tokens.
-* It checks declarations in `decl.c`.
+* The checks for declarations are in `decl.c`.
-* It checks initializations in `init.c`.
+* The checks for initializations are in `init.c`.
-* It checks types and expressions in `tree.c`.
+* The checks for types and expressions are in `tree.c`.
 To see how a specific lint message is triggered, read the corresponding unit
 test in `tests/usr.bin/xlint/lint1/msg_???.c`.
 # Features
 ## Type checking
 Lint has stricter type checking than most C compilers.
 In _strict bool mode_, lint treats `bool` as a type that is incompatible with
 other scalar types, like in C#, Go, Java.
 See the test `d_c99_bool_strict.c` for details.
 @@ -38,30 +38,31 @@ See the test `msg_193.c` for examples.
 Lint tries to continue parsing and checking even after seeing errors.
 This part of lint is not robust though, so expect some crashes here,
 as variables may not be properly initialized or be null pointers.
 The cleanup after handling a parse error is often incomplete.
 ## Configurable diagnostic messages
 Whether lint prints a message and whether each message is an error, a warning
 or just informational depends on several things:
 * The language level, with its possible values:
     * traditional C (`-t`)
-    * migration from traditional C and C90 (default)
+    * migration from traditional C to C90 (default)
     * C90 (`-s`)
     * C99 (`-S`)
     * C11 (`-Ac11`)
     * C23 (`-Ac23`)
 * In GCC mode (`-g`), lint allows several GNU extensions,
   reducing the amount of printed messages.
 * In strict bool mode (`-T`), lint issues errors when `bool` is mixed with
   other scalar types, reusing the existing messages 107 and 211, while also
   defining new messages that are specific to strict bool mode.
 * The option `-a` performs the check for lossy conversions from large integer
   types, the option `-aa` extends this check to small integer types as well,
   reusing the same message ID.
 * The option `-X` suppresses arbitrary messages by their message ID.
 * The option `-q` enables additional queries that are not suitable as regular
   warnings but may be interesting to look at on a case-by-case basis.
 # Limitations

 @@ -1,14 +1,14 @@
-/*	$NetBSD: err.c,v 1.234 2024/03/27 19:28:20 rillig Exp $	*/
+/*	$NetBSD: err.c,v 1.235 2024/03/28 21:04:48 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)
-__RCSID("$NetBSD: err.c,v 1.234 2024/03/27 19:28:20 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.235 2024/03/28 21:04:48 rillig Exp $");
 #endif
 #include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 bool seen_error;
 bool seen_warning;
 /* number of syntax errors */
 @@ -729,27 +729,27 @@ static const char *queries[] = {
 	"pointer addition has integer on the left-hand side",		// Q5
 	"no-op cast from '%s' to '%s'",					// Q6
 	"redundant cast from '%s' to '%s' before assignment",		// Q7
 	"octal number '%.*s'",						// Q8
 	"parenthesized return value",					// Q9
 	"chained assignment with '%s' and '%s'",			// Q10
 	"static variable '%s' in function",				// Q11
 	"comma operator with types '%s' and '%s'",			// Q12
 	"redundant 'extern' in function declaration of '%s'",		// Q13
 	"comparison '%s' of 'char' with plain integer %d",		// Q14
 	"implicit conversion from integer 0 to pointer '%s'",		// Q15
 	"'%s' was declared 'static', now non-'static'",			// Q16
 	"invisible character U+%04X in %s",				// Q17
-	"const automatic variable '%s'",						// Q18
+	"const automatic variable '%s'",				// Q18
 };
 bool any_query_enabled;		/* for optimizing non-query scenarios */
 bool is_query_enabled[sizeof(queries) / sizeof(queries[0])];
 void
 (query_message)(int query_id, ...)
+{
 	if (!is_query_enabled[query_id])
 		return;
 	va_list ap;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: externs1.h,v 1.219 2024/03/09 10:41:11 rillig Exp $	*/
+/*	$NetBSD: externs1.h,v 1.220 2024/03/28 21:04:48 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.
 @@ -26,65 +26,65 @@
  * 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 <signal.h>
 /*
  * main1.c
  */
 extern bool Fflag;
 extern bool Pflag;
 extern bool Tflag;
 extern int aflag;
 extern bool bflag;
 extern bool cflag;
 extern bool eflag;
 extern bool Fflag;
 extern bool hflag;
 extern bool pflag;
 extern bool rflag;
 extern bool uflag;
 extern bool vflag;
 extern bool yflag;
 extern bool wflag;
 extern bool yflag;
 extern bool zflag;
 extern bool Tflag;
 extern bool Pflag;
 extern bool allow_trad;
 extern bool allow_c90;
 extern bool allow_c99;
 extern bool allow_c11;
 extern bool allow_c23;
 extern bool allow_gcc;
 extern sig_atomic_t fpe;
 void norecover(void);
 /*
  * cgram.y
  */
 extern int block_level;
 extern size_t mem_block_level;
 extern int yydebug;
 int yyerror(const char *);
 int yyparse(void);
 /*
- * scan.l
+ * lex.c
  */
 extern bool in_gcc_attribute;
 extern pos_t curr_pos;
 extern pos_t csrc_pos;
 extern bool in_system_header;
 extern symbol_kind sym_kind;
 extern FILE *yyin;
 void init_lex(void);
 int64_t convert_integer(int64_t, tspec_t, unsigned int);
 void clear_warn_flags(void);
 sym_t *getsym(sbuf_t *);
 void clean_up_after_error(void);