Module Name: src Committed By: rillig Date: Thu Apr 28 21:38:38 UTC 2022
Modified Files: src/distrib/sets/lists/tests: mi src/tests/usr.bin/xlint/lint1: Makefile gcc_attribute_label.c gcc_attribute_stmt.c gcc_attribute_stmt.exp src/usr.bin/xlint/lint1: cgram.y Added Files: src/tests/usr.bin/xlint/lint1: gcc_attribute_label.exp Log Message: lint: revert resolving grammar conflicts for labeled statements Restore the grammar rule for labeled_statement as it was before cgram.y 1.400 from 2022-04-24. This allows labels with attributes again. Fix the wrong interpretation in the tests; the attributes belong to the label, not to the statement. Today in the morning, when I thought that the change in cgram.y 1.400 were innocent, I accidentally ran lint only with the options '-Sw' but forgot the option '-g' for GNU mode. Without that option, the token '__attribute__' is unknown, which unsurprisingly leads to lots of syntax errors, and these didn't change with that commit. The actual change was only visible in GNU mode. To generate a diff of this commit: cvs rdiff -u -r1.1199 -r1.1200 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.120 -r1.121 src/tests/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/gcc_attribute_label.c \ src/tests/usr.bin/xlint/lint1/gcc_attribute_stmt.c \ src/tests/usr.bin/xlint/lint1/gcc_attribute_stmt.exp cvs rdiff -u -r0 -r1.3 src/tests/usr.bin/xlint/lint1/gcc_attribute_label.exp cvs rdiff -u -r1.402 -r1.403 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.