indent(1): rename -nsac/-sac ("space after cast") to -ncs/-cs
Also update tests and the manpage. GNU indent had the option earlier as -cs, let's not diverge unnecessarily.
This commit is contained in:
parent
0642b65f38
commit
bb92a28b2f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=334944
@ -116,6 +116,7 @@ struct pro {
|
||||
{"ce", PRO_BOOL, true, ON, &opt.cuddle_else},
|
||||
{"ci", PRO_INT, 0, 0, &opt.continuation_indent},
|
||||
{"cli", PRO_SPECIAL, 0, CLI, 0},
|
||||
{"cs", PRO_BOOL, false, ON, &opt.space_after_cast},
|
||||
{"c", PRO_INT, 33, 0, &opt.com_ind},
|
||||
{"di", PRO_INT, 16, 0, &opt.decl_indent},
|
||||
{"dj", PRO_BOOL, false, ON, &opt.ljust_decl},
|
||||
@ -141,6 +142,7 @@ struct pro {
|
||||
{"nbs", PRO_BOOL, false, OFF, &opt.Bill_Shannon},
|
||||
{"ncdb", PRO_BOOL, true, OFF, &opt.comment_delimiter_on_blankline},
|
||||
{"nce", PRO_BOOL, true, OFF, &opt.cuddle_else},
|
||||
{"ncs", PRO_BOOL, false, OFF, &opt.space_after_cast},
|
||||
{"ndj", PRO_BOOL, false, OFF, &opt.ljust_decl},
|
||||
{"neei", PRO_BOOL, false, OFF, &opt.extra_expression_indent},
|
||||
{"nei", PRO_BOOL, true, OFF, &opt.else_if},
|
||||
@ -153,14 +155,12 @@ struct pro {
|
||||
{"npcs", PRO_BOOL, false, OFF, &opt.proc_calls_space},
|
||||
{"npro", PRO_SPECIAL, 0, IGN, 0},
|
||||
{"npsl", PRO_BOOL, true, OFF, &opt.procnames_start_line},
|
||||
{"nsac", PRO_BOOL, false, OFF, &opt.space_after_cast},
|
||||
{"nsc", PRO_BOOL, true, OFF, &opt.star_comment_cont},
|
||||
{"nsob", PRO_BOOL, false, OFF, &opt.swallow_optional_blanklines},
|
||||
{"nut", PRO_BOOL, true, OFF, &opt.use_tabs},
|
||||
{"nv", PRO_BOOL, false, OFF, &opt.verbose},
|
||||
{"pcs", PRO_BOOL, false, ON, &opt.proc_calls_space},
|
||||
{"psl", PRO_BOOL, true, ON, &opt.procnames_start_line},
|
||||
{"sac", PRO_BOOL, false, ON, &opt.space_after_cast},
|
||||
{"sc", PRO_BOOL, true, ON, &opt.star_comment_cont},
|
||||
{"sob", PRO_BOOL, false, ON, &opt.swallow_optional_blanklines},
|
||||
{"st", PRO_SPECIAL, 0, STDIN, 0},
|
||||
|
@ -30,7 +30,7 @@
|
||||
.\" @(#)indent.1 8.1 (Berkeley) 7/1/93
|
||||
.\" $FreeBSD$
|
||||
.\"
|
||||
.Dd June 4, 2018
|
||||
.Dd June 11, 2018
|
||||
.Dt INDENT 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -55,6 +55,7 @@
|
||||
.Op Fl \&ce | Fl nce
|
||||
.Op Fl \&ci Ns Ar n
|
||||
.Op Fl cli Ns Ar n
|
||||
.Op Fl cs | Fl ncs
|
||||
.Op Fl d Ns Ar n
|
||||
.Op Fl \&di Ns Ar n
|
||||
.Op Fl dj | Fl ndj
|
||||
@ -78,7 +79,6 @@
|
||||
.Op Fl P Ns Ar file
|
||||
.Op Fl pcs | Fl npcs
|
||||
.Op Fl psl | Fl npsl
|
||||
.Op Fl sac | Fl nsac
|
||||
.Op Fl \&sc | Fl nsc
|
||||
.Bk -words
|
||||
.Op Fl sob | Fl nsob
|
||||
@ -259,6 +259,11 @@ causes case labels to be indented half a tab stop.
|
||||
The
|
||||
default is
|
||||
.Fl cli0 .
|
||||
.It Fl cs , ncs
|
||||
Control whether parenthesized type names in casts are followed by a space or
|
||||
not.
|
||||
The default is
|
||||
.Fl ncs .
|
||||
.It Fl d Ns Ar n
|
||||
Controls the placement of comments which are not to the
|
||||
right of code.
|
||||
@ -423,11 +428,6 @@ column 1 \- their types, if any, will be left on the previous lines.
|
||||
The
|
||||
default is
|
||||
.Fl psl .
|
||||
.It Fl sac , nsac
|
||||
Control whether parenthesized type names in casts are followed by a space or
|
||||
not.
|
||||
The default is
|
||||
.Fl nsac .
|
||||
.It Fl \&sc , nsc
|
||||
Enables (disables) the placement of asterisks (`*'s) at the left edge of all
|
||||
comments.
|
||||
|
@ -20,9 +20,9 @@ ${PACKAGE}FILES+= label.0.stdout
|
||||
${PACKAGE}FILES+= label.0.pro
|
||||
${PACKAGE}FILES+= list_head.0
|
||||
${PACKAGE}FILES+= list_head.0.stdout
|
||||
${PACKAGE}FILES+= nsac.0
|
||||
${PACKAGE}FILES+= nsac.0.stdout
|
||||
${PACKAGE}FILES+= nsac.0.pro
|
||||
${PACKAGE}FILES+= ncs.0
|
||||
${PACKAGE}FILES+= ncs.0.stdout
|
||||
${PACKAGE}FILES+= ncs.0.pro
|
||||
${PACKAGE}FILES+= offsetof.0
|
||||
${PACKAGE}FILES+= offsetof.0.stdout
|
||||
${PACKAGE}FILES+= parens.0
|
||||
@ -31,9 +31,9 @@ ${PACKAGE}FILES+= parens.0.pro
|
||||
${PACKAGE}FILES+= pcs.0
|
||||
${PACKAGE}FILES+= pcs.0.stdout
|
||||
${PACKAGE}FILES+= pcs.0.pro
|
||||
${PACKAGE}FILES+= sac.0
|
||||
${PACKAGE}FILES+= sac.0.stdout
|
||||
${PACKAGE}FILES+= sac.0.pro
|
||||
${PACKAGE}FILES+= cs.0
|
||||
${PACKAGE}FILES+= cs.0.stdout
|
||||
${PACKAGE}FILES+= cs.0.pro
|
||||
${PACKAGE}FILES+= struct.0
|
||||
${PACKAGE}FILES+= struct.0.stdout
|
||||
${PACKAGE}FILES+= surplusbad.0
|
||||
|
@ -1,2 +1,2 @@
|
||||
/* $FreeBSD$ */
|
||||
-sac
|
||||
-cs
|
@ -1,2 +1,2 @@
|
||||
/* $FreeBSD$ */
|
||||
-nsac
|
||||
-ncs
|
Loading…
Reference in New Issue
Block a user