 @@ -1,22 +1,22 @@
-/* $NetBSD: lsym_lbrace.c,v 1.2 2021/11/20 16:54:17 rillig Exp $ */
+/* $NetBSD: lsym_lbrace.c,v 1.3 2022/02/13 11:07:48 rillig Exp $ */
 /* $FreeBSD$ */
 /*
  * Tests for the token lsym_lbrace, which represents a '{' in these contexts:
+ *
  * In an initializer, '{' starts an inner group of initializers, usually to
  * initialize a nested struct, union or array.
+ *
  * In a function body, '{' starts a block.
+ *
- * In an expression, '(type){' starts a compound expression that is typically
+ * In an expression, '(type){' starts a compound literal that is typically
  * used in an assignment to a struct or array.
+ *
  * TODO: try to split this token into lsym_lbrace_block and lsym_lbrace_init.
  */
 #indent input
 // TODO: add input
 #indent end
 #indent run-equals-input

 @@ -1,14 +1,14 @@
-/* $NetBSD: lsym_lparen_or_lbracket.c,v 1.1 2021/11/18 21:19:19 rillig Exp $ */
+/* $NetBSD: lsym_lparen_or_lbracket.c,v 1.2 2022/02/13 11:07:48 rillig Exp $ */
 /* $FreeBSD$ */
 /*
  * Tests for the token lsym_lparen_or_lbracket, which represents a '(' or '['
  * in these contexts:
+ *
  * In a type name, '(' constructs a function type.
+ *
  * In an expression, '(' starts an inner expression to override the usual
  * operator precedence.
+ *
  * In an expression, an identifier followed by '(' starts a function call
  * expression.
 @@ -16,13 +16,15 @@
  * In a 'sizeof' expression, '(' is required if the argument is a type name.
+ *
  * After one of the keywords 'for', 'if', 'switch' or 'while', the controlling
  * expression must be enclosed in '(' and ')'.
+ *
  * In an expression, '(' followed by a type name starts a cast expression.
  */
 #indent input
 // TODO: add input
 #indent end
 #indent run-equals-input
 /* See t_errors.sh, test case 'compound_literal'. */

 @@ -1,15 +1,15 @@
 #! /bin/sh
-# $NetBSD: t_errors.sh,v 1.22 2021/11/25 21:48:23 rillig Exp $
+# $NetBSD: t_errors.sh,v 1.23 2022/02/13 11:07:48 rillig Exp $
+#
 # Copyright (c) 2021 The NetBSD Foundation, Inc.
 # 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.
+#
 @@ -485,26 +485,73 @@ f(void)
+{
 	if (0)
 		/*
 		 * 0123456789012345678901
 		  */ ;
+}
 EOF
 	atf_check -o 'file:expected.out' \
 	    "$indent" -l34 code.c -st
+}
 atf_test_case 'compound_literal'
 compound_literal_body()
+{
 	# Test handling of compound literals (C99 6.5.2.5), as well as casts.
 	cat <<EOF > code.c
 void
 function(void)
+{
 	origin =
 	((int)
 	((-1)*
 	(struct point){0,0}
+	)
 	);
+}
 EOF
 	sed '/^#/d' <<EOF > expected.out
 void
 function(void)
+{
 	origin =
 		    ((int)
 		     ((-1) *
 		      (struct point){
 # FIXME: the '{' is part of the expression, not a separate block.
 , 0
 # FIXME: the '}' is part of the expression, not a separate block.
+	}
 # FIXME: the ')' must be aligned with the corresponding '('.
+	)
 		    );
+}
 EOF
 	sed '/^#/d' <<EOF > expected.err
 # FIXME: The parentheses _are_ balanced, the '}' does not end the block.
 error: code.c:9: Unbalanced parentheses
 warning: code.c:10: Extra ')'
 # FIXME: There is no line 12 in the input file.
 warning: code.c:12: Extra ')'
 EOF
 	atf_check -s 'exit:1' -o 'file:expected.out' -e 'file:expected.err' \
 	    "$indent" -nfc1 -ci12 code.c -st
+}
 atf_init_test_cases()
+{
 	atf_add_test_case 'option_unknown'
 	atf_add_test_case 'option_bool_trailing_garbage'
 	atf_add_test_case 'option_int_missing_argument'
 	atf_add_test_case 'option_profile_not_found'
 	atf_add_test_case 'option_buffer_overflow'
 	atf_add_test_case 'option_typedefs_not_found'
 	atf_add_test_case 'option_special_missing_param'
 	atf_add_test_case 'option_tabsize_negative'
 	atf_add_test_case 'option_tabsize_zero'
 	atf_add_test_case 'option_tabsize_large'
 	atf_add_test_case 'option_tabsize_very_large'
 @@ -522,14 +569,15 @@ atf_init_test_cases()
 	atf_add_test_case 'argument_output_equals_input_file'
 	atf_add_test_case 'argument_output_enoent'
 	atf_add_test_case 'argument_too_many'
 	atf_add_test_case 'unexpected_end_of_file'
 	atf_add_test_case 'unexpected_closing_brace_top_level'
 	atf_add_test_case 'unexpected_closing_brace_decl'
 	atf_add_test_case 'preprocessing_overflow'
 	atf_add_test_case 'preprocessing_unrecognized'
 	atf_add_test_case 'unbalanced_parentheses_1'
 	atf_add_test_case 'unbalanced_parentheses_2'
 	atf_add_test_case 'unbalanced_parentheses_3'
 	atf_add_test_case 'search_stmt_comment_segv'
 	atf_add_test_case 'search_stmt_fits_in_one_line'
 	atf_add_test_case 'compound_literal'
+}