procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

invoke.texi: Document accepting Else, fallthrough.

Browse source 
* doc/invoke.texi: Document accepting Else, fallthrough.

	* lex.c (fallthrough_comment_p): Accept Else, fallthrough.

	* c-c++-common/Wimplicit-fallthrough-23.c (foo): Add further tests.

From-SVN: r240886
This commit is contained in:
Jakub Jelinek 2016-10-08 12:54:27 +02:00 • committed by Jakub Jelinek
parent 81b02905b0
commit ee19ef45ba
6 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gcc/ChangeLog
View file

@ -1,5 +1,7 @@
2016-10-08 Jakub Jelinek <jakub@redhat.com>
* doc/invoke.texi: Document accepting Else, fallthrough.
* doc/invoke.texi (-Wimplicit-fallthrough): Document FALLTHRU comment
style changes.

6
gcc/doc/invoke.texi
View file

@ -4181,11 +4181,11 @@ should match one of the following regular expressions:
@item @code{lint -fallthrough ?}
@item @code{[ \t.!]*(ELSE |INTENTIONAL(LY)? )?FALL(S | |-)?THR(OUGH|U)[ \t.!]*(-[^\n\r]*)?}
@item @code{[ \t.!]*(ELSE,? |INTENTIONAL(LY)? )?FALL(S | |-)?THR(OUGH|U)[ \t.!]*(-[^\n\r]*)?}
@item @code{[ \t.!]*(Else |Intentional(ly)? )?Fall((s | |-)[Tt]|t)hr(ough|u)[ \t.!]*(-[^\n\r]*)?}
@item @code{[ \t.!]*(Else,? |Intentional(ly)? )?Fall((s | |-)[Tt]|t)hr(ough|u)[ \t.!]*(-[^\n\r]*)?}
@item @code{[ \t.!]*([Ee]lse |[Ii]ntentional(ly)? )?fall(s | |-)?thr(ough|u)[ \t.!]*(-[^\n\r]*)?}
@item @code{[ \t.!]*([Ee]lse,? |[Ii]ntentional(ly)? )?fall(s | |-)?thr(ough|u)[ \t.!]*(-[^\n\r]*)?}
@end itemize

2
gcc/testsuite/ChangeLog
View file

@ -2,6 +2,8 @@
* c-c++-common/Wimplicit-fallthrough-23.c (foo): Add further tests.
* c-c++-common/Wimplicit-fallthrough-23.c (foo): Add further tests.
* c-c++-common/Wimplicit-fallthrough-23.c: New test.
* c-c++-common/Wimplicit-fallthrough-24.c: New test.

12
gcc/testsuite/c-c++-common/Wimplicit-fallthrough-23.c
View file

@ -114,6 +114,12 @@ foo (int i)
case 34:
bar (34);
break;
case 35:
bar (35); /* { dg-bogus "this statement may \[laf]* through" } */
/* Else, fall-through. */
case 36:
bar (36);
break;
default:
break;
}
@ -225,6 +231,12 @@ foo (int i)
case 34:
bar (34);
break;
case 35:
bar (35); /* { dg-bogus "this statement may \[laf]* through" } */
// Else, fall-through
case 36:
bar (36);
break;
default:
break;
}

2
libcpp/ChangeLog
View file

@ -1,5 +1,7 @@
2016-10-08 Jakub Jelinek <jakub@redhat.com>
* lex.c (fallthrough_comment_p): Accept Else, fallthrough.
* lex.c (fallthrough_comment_p): Extend to handle more common FALLTHRU
comment styles.

19
libcpp/lex.c
View file

@ -2074,9 +2074,9 @@ fallthrough_comment_p (cpp_reader *pfile, const unsigned char *comment_start)
from++;
}
/* Whole comment contents (regex):
[ \t.!]*(ELSE |INTENTIONAL(LY)? )?FALL(S | |-)?THR(OUGH|U)[ \t.!]*(-[^\n\r]*)?
[ \t.!]*(Else |Intentional(ly)? )?Fall((s | |-)[Tt]|t)hr(ough|u)[ \t.!]*(-[^\n\r]*)?
[ \t.!]*([Ee]lse |[Ii]ntentional(ly)? )?fall(s | |-)?thr(ough|u)[ \t.!]*(-[^\n\r]*)?
[ \t.!]*(ELSE,? |INTENTIONAL(LY)? )?FALL(S | |-)?THR(OUGH|U)[ \t.!]*(-[^\n\r]*)?
[ \t.!]*(Else,? |Intentional(ly)? )?Fall((s | |-)[Tt]|t)hr(ough|u)[ \t.!]*(-[^\n\r]*)?
[ \t.!]*([Ee]lse,? |[Ii]ntentional(ly)? )?fall(s | |-)?thr(ough|u)[ \t.!]*(-[^\n\r]*)?
*/
else
{
@ -2089,11 +2089,18 @@ fallthrough_comment_p (cpp_reader *pfile, const unsigned char *comment_start)
if ((size_t) (pfile->buffer->cur - from)
< sizeof "else fallthru" - 1)
return false;
if (f == 'E' && memcmp (from + 1, "LSE F", sizeof "LSE F" - 1) == 0)
if (f == 'E' && memcmp (from + 1, "LSE", sizeof "LSE" - 1) == 0)
all_upper = true;
else if (memcmp (from + 1, "lse ", sizeof "lse " - 1))
else if (memcmp (from + 1, "lse", sizeof "lse" - 1))
return false;
from += sizeof "else" - 1;
if (*from == ',')
from++;
if (*from != ' ')
return false;
from++;
if (all_upper && *from == 'f')
return false;
from += sizeof "else " - 1;
if (f == 'e' && *from == 'F')
return false;
f = *from;