Author: pstef
Date: Mon Jun 11 05:35:57 2018
New Revision: 334944
URL: https://svnweb.freebsd.org/changeset/base/334944
Log:
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.
Added:
head/usr.bin/indent/tests/cs.0
- copied unchanged from r334943, head/usr.bin/indent/tests/sac.0
head/usr.bin/indent/tests/cs.0.pro
- copied, changed from r334943, head/usr.bin/indent/tests/sac.0.pro
head/usr.bin/indent/tests/cs.0.stdout
- copied unchanged from r334943, head/usr.bin/indent/tests/sac.0.stdout
head/usr.bin/indent/tests/ncs.0
- copied unchanged from r334943, head/usr.bin/indent/tests/nsac.0
head/usr.bin/indent/tests/ncs.0.pro
- copied, changed from r334943, head/usr.bin/indent/tests/nsac.0.pro
head/usr.bin/indent/tests/ncs.0.stdout
- copied unchanged from r334943, head/usr.bin/indent/tests/nsac.0.stdout
Deleted:
head/usr.bin/indent/tests/nsac.0
head/usr.bin/indent/tests/nsac.0.pro
head/usr.bin/indent/tests/nsac.0.stdout
head/usr.bin/indent/tests/sac.0
head/usr.bin/indent/tests/sac.0.pro
head/usr.bin/indent/tests/sac.0.stdout
Modified:
head/usr.bin/indent/args.c
head/usr.bin/indent/indent.1
head/usr.bin/indent/tests/Makefile
Modified: head/usr.bin/indent/args.c
==
--- head/usr.bin/indent/args.c Mon Jun 11 05:28:00 2018(r334943)
+++ head/usr.bin/indent/args.c Mon Jun 11 05:35:57 2018(r334944)
@@ -116,6 +116,7 @@ struct pro {
{"ce", PRO_BOOL, true, ON, _else},
{"ci", PRO_INT, 0, 0, _indent},
{"cli", PRO_SPECIAL, 0, CLI, 0},
+{"cs", PRO_BOOL, false, ON, _after_cast},
{"c", PRO_INT, 33, 0, _ind},
{"di", PRO_INT, 16, 0, _indent},
{"dj", PRO_BOOL, false, ON, _decl},
@@ -141,6 +142,7 @@ struct pro {
{"nbs", PRO_BOOL, false, OFF, _Shannon},
{"ncdb", PRO_BOOL, true, OFF, _delimiter_on_blankline},
{"nce", PRO_BOOL, true, OFF, _else},
+{"ncs", PRO_BOOL, false, OFF, _after_cast},
{"ndj", PRO_BOOL, false, OFF, _decl},
{"neei", PRO_BOOL, false, OFF, _expression_indent},
{"nei", PRO_BOOL, true, OFF, _if},
@@ -153,14 +155,12 @@ struct pro {
{"npcs", PRO_BOOL, false, OFF, _calls_space},
{"npro", PRO_SPECIAL, 0, IGN, 0},
{"npsl", PRO_BOOL, true, OFF, _start_line},
-{"nsac", PRO_BOOL, false, OFF, _after_cast},
{"nsc", PRO_BOOL, true, OFF, _comment_cont},
{"nsob", PRO_BOOL, false, OFF, _optional_blanklines},
{"nut", PRO_BOOL, true, OFF, _tabs},
{"nv", PRO_BOOL, false, OFF, },
{"pcs", PRO_BOOL, false, ON, _calls_space},
{"psl", PRO_BOOL, true, ON, _start_line},
-{"sac", PRO_BOOL, false, ON, _after_cast},
{"sc", PRO_BOOL, true, ON, _comment_cont},
{"sob", PRO_BOOL, false, ON, _optional_blanklines},
{"st", PRO_SPECIAL, 0, STDIN, 0},
Modified: head/usr.bin/indent/indent.1
==
--- head/usr.bin/indent/indent.1Mon Jun 11 05:28:00 2018
(r334943)
+++ head/usr.bin/indent/indent.1Mon Jun 11 05:35:57 2018
(r334944)
@@ -30,7 +30,7 @@
.\"@(#)indent.18.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 \ | Fl nce
.Op Fl \ Ns Ar n
.Op Fl cli Ns Ar n
+.Op Fl cs | Fl ncs
.Op Fl d Ns Ar n
.Op Fl \ 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 \ | 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 p
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 \ , nsc
Enables (disables) the placement of asterisks (`*'s) at the left edge of all
comments.
Modified: head/usr.bin/indent/tests/Makefile
==
--- head/usr.bin/indent/tests/Makefile Mon Jun 11 05:28:00 2018
(r334943)
+++ head/usr.bin/indent/tests/Makefile Mon Jun 11 05:35:57 2018
(r334944)
@@ -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+=
