mirror/gcc
1
0
Fork 0
mirror of https://github.com/gcc-mirror/gcc.git synced 2024-11-21 13:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

c-family: -Wleading-whitespace= argument spelling

Browse Source 
On Thu, Oct 24, 2024 at 03:33:25PM -0400, Eric Gallager wrote:
> On Thu, Oct 24, 2024 at 4:17 AM Jakub Jelinek <jakub@redhat.com> wrote:
> > I've tried to build stage3 with
> > -Wleading-whitespace=blanks -Wtrailing-whitespace=blank -Wno-error=leading-whitespace=blanks -Wno-error=trailing-whitespace=blank
>
> So wait, it's "blanks" (plural) when it's leading, but "blank"
> (singular) when it's trailing? That inconsistency bothers me...

I've mentioned it already in
https://gcc.gnu.org/pipermail/gcc-patches/2024-October/664664.html
Citing that here:
    Not sure about the kinds for the option, given -Wleading-whitespace=
    uses plural and this option singular and -Wleading-whitespace= spaces
    means literally just ' ' characters, while space in
    -Wtrailing-whitespace= was ' ', '\t', '\v' and '\f'; so category;
    perhaps just use any and blanks?
Other preferences?

Here is a patch to do the blank->blanks and space->any changes.

2024-10-27  Jakub Jelinek  <jakub@redhat.com>

gcc/
	* doc/invoke.texi (Wtrailing-whitespace=): Change
	blank argument to blanks and space argument to any.
gcc/c-family/
	* c.opt (warn_trailing_whitespace_kind): Change blank
	to blanks and space to any.
gcc/testsuite/
	* c-c++-common/cpp/Wtrailing-whitespace-2.c: Use
	-Wtrailing-whitespace=blanks rather than -Wtrailing-whitespace=blank.
	* c-c++-common/cpp/Wtrailing-whitespace-3.c: Use
	-Wtrailing-whitespace=any rather than -Wtrailing-whitespace=space.
	* c-c++-common/cpp/Wtrailing-whitespace-7.c: Use
	-Wtrailing-whitespace=blanks rather than -Wtrailing-whitespace=blank.
	* c-c++-common/cpp/Wtrailing-whitespace-8.c: Use
	-Wtrailing-whitespace=any rather than -Wtrailing-whitespace=space.
This commit is contained in:
Jakub Jelinek 2024-10-27 16:42:53 +01:00 committed by Jakub Jelinek
parent e2ce2a4661
commit ad7d5cd65e
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/c-family/c.opt
View File

@ -1492,18 +1492,18 @@ EnumValue
Enum(warn_trailing_whitespace_kind) String(none) Value(0)
EnumValue
Enum(warn_trailing_whitespace_kind) String(blank) Value(1)
Enum(warn_trailing_whitespace_kind) String(blanks) Value(1)
EnumValue
Enum(warn_trailing_whitespace_kind) String(space) Value(2)
Enum(warn_trailing_whitespace_kind) String(any) Value(2)
Wtrailing-whitespace=
C ObjC C++ ObjC++ CPP(cpp_warn_trailing_whitespace) CppReason(CPP_W_TRAILING_WHITESPACE) Enum(warn_trailing_whitespace_kind) Joined RejectNegative Var(warn_trailing_whitespace) Init(0) Warning
Warn about trailing whitespace on lines except when in raw string literals.
Wtrailing-whitespace
C ObjC C++ ObjC++ Alias(Wtrailing-whitespace=,blank,none) Warning
Warn about trailing whitespace on lines except when in raw string literals. Equivalent to Wtrailing-whitespace=blank when enabled or Wtrailing-whitespace=none when disabled.
C ObjC C++ ObjC++ Alias(Wtrailing-whitespace=,blanks,none) Warning
Warn about trailing whitespace on lines except when in raw string literals. Equivalent to Wtrailing-whitespace=blanks when enabled or Wtrailing-whitespace=none when disabled.
Wtrigraphs
C ObjC C++ ObjC++ CPP(warn_trigraphs) CppReason(CPP_W_TRIGRAPHS) Var(cpp_warn_trigraphs) Init(2) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall)

4
gcc/doc/invoke.texi
View File

@ -8784,8 +8784,8 @@ This warning is enabled by @option{-Wall}.
Warn about trailing whitespace at the end of lines, including inside of
comments, but excluding trailing whitespace in raw string literals.
@code{-Wtrailing-whitespace} is equivalent to
@code{-Wtrailing-whitespace=blank} and warns just about trailing space and
horizontal tab characters. @code{-Wtrailing-whitespace=space} warns about
@code{-Wtrailing-whitespace=blanks} and warns just about trailing space and
horizontal tab characters. @code{-Wtrailing-whitespace=any} warns about
those or trailing form feed or vertical tab characters.
@code{-Wno-trailing-whitespace} or @code{-Wtrailing-whitespace=none}
disables the warning, which is the default.

2
gcc/testsuite/c-c++-common/cpp/Wtrailing-whitespace-2.c
View File

@ -1,5 +1,5 @@
/* { dg-do compile { target { c || c++11 } } } */
/* { dg-options "-Wtrailing-whitespace=blank" } */
/* { dg-options "-Wtrailing-whitespace=blanks" } */
int i;
/* { dg-warning "trailing whitespace" "" { target *-*-* } .-1 } */

2
gcc/testsuite/c-c++-common/cpp/Wtrailing-whitespace-3.c
View File

@ -1,5 +1,5 @@
/* { dg-do compile { target { c || c++11 } } } */
/* { dg-options "-Wtrailing-whitespace=space" } */
/* { dg-options "-Wtrailing-whitespace=any" } */
int i;
/* { dg-warning "trailing whitespace" "" { target *-*-* } .-1 } */

2
gcc/testsuite/c-c++-common/cpp/Wtrailing-whitespace-7.c
View File

@ -1,6 +1,6 @@
/* This test uses intentionally DOS line endings (CR+LF). */
/* { dg-do compile { target { c || c++11 } } } */
/* { dg-options "-Wtrailing-whitespace=blank" } */
/* { dg-options "-Wtrailing-whitespace=blanks" } */
int i;
/* { dg-warning "trailing whitespace" "" { target *-*-* } .-1 } */

2
gcc/testsuite/c-c++-common/cpp/Wtrailing-whitespace-8.c
View File

@ -1,6 +1,6 @@
/* This test uses intentionally DOS line endings (CR+LF). */
/* { dg-do compile { target { c || c++11 } } } */
/* { dg-options "-Wtrailing-whitespace=space" } */
/* { dg-options "-Wtrailing-whitespace=any" } */
int i;
/* { dg-warning "trailing whitespace" "" { target *-*-* } .-1 } */