Module Name: src Committed By: rillig Date: Mon Nov 1 23:44:08 UTC 2021
Modified Files: src/tests/usr.bin/indent: opt_ci.c src/usr.bin/indent: indent.c indent.h lexi.c Log Message: indent: fix missing blank after 'return' (since 2021-10-31) In indent.c 1.200 from 2021-10-31, the subtypes of identifier tokens were removed since they were redundant. An unintended side effect was that a parenthesized expression after 'return' was no longer separated by a blank. Before that change, 'return' was tokenized as an lsym_ident with subtype kw_other, and want_space_before_lparen handled this case in the last line. After the change, 'return' was treated as an ordinary identifier, and unless the option '-pcs' (blank after function call) was given, the blank was removed. The other keywords that had kw_other are not affected since they do not expect a '(' afterwards. These keywords are 'break', 'continue', 'goto', 'inline' and 'restrict'. Curiously, there was not a single test case that covered 'return(expr)'. While here, remove the trailing ',' from the enum lexer_symbol, which is not allowed in standard C, it is a GNU extension. Lint doesn't complain about this since the default LINTFLAGS include '-g' for GCC mode. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/indent/opt_ci.c cvs rdiff -u -r1.203 -r1.204 src/usr.bin/indent/indent.c cvs rdiff -u -r1.74 -r1.75 src/usr.bin/indent/indent.h cvs rdiff -u -r1.128 -r1.129 src/usr.bin/indent/lexi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.