Adwaith-Rajesh/gperf
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gperf.git synced 2025-12-02 13:09:22 +00:00
Code Activity

Avoid "implicit fallthrough" warnings in the generated code.

Browse Source
This commit is contained in:
Bruno Haible
2018-07-26 02:00:39 +02:00
parent 13c9383b10
commit 0d37a8763d
11 changed files with 298 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2018-07-25 Bruno Haible <bruno@clisp.org>
Avoid "implicit fallthrough" warnings in the generated code.
Reported by Phil Willoughby at
<https://lists.gnu.org/archive/html/bug-gperf/2018-07/msg00002.html>.
* src/output.cc (Output::output_hash_function): Emit a more elaborate
fallthrough marker.
* tests/*.exp: Update.
2018-04-24 Bruno Haible <bruno@clisp.org>
Support input files with CR/LF line terminators.

2
NEWS
View File

@@ -3,6 +3,8 @@ New in 3.2:
Unix line terminators (LF).
Note: This is an incompatible change. If you want to use a keyword that
ends in a CR byte, such as xyz<CR>, write it as "xyz\r".
* The generated code avoids "implicit fallthrough" warnings in 'switch'
statements.
New in 3.1:
* The generated C code is now in ANSI-C by default. If you want to support

15
src/output.cc
View File

@@ -1,5 +1,5 @@
/* Output routines.
Copyright (C) 1989-1998, 2000, 2002-2004, 2006-2007, 2009, 2011-2012, 2016 Free Software Foundation, Inc.
Copyright (C) 1989-1998, 2000, 2002-2004, 2006-2007, 2009, 2011-2012, 2016, 2018 Free Software Foundation, Inc.
Written by Douglas C. Schmidt <schmidt@ics.uci.edu>
and Bruno Haible <bruno@clisp.org>.
@@ -932,6 +932,15 @@ Output::output_hash_function () const
else
{
/* We've got to use the correct, but brute force, technique. */
/* Pseudo-statement or comment that avoids a compiler warning or
lint warning. */
const char * const fallthrough_marker =
"#if defined __cplusplus && __cplusplus >= 201703L\n"
" [[fallthrough]];\n"
"#elif defined __GNUC__ && __GNUC__ >= 7\n"
" __attribute__ ((__fallthrough__));\n"
"#endif\n"
" /*FALLTHROUGH*/\n";
/* It doesn't really matter whether hval is an 'int' or
'unsigned int', but 'unsigned int' gives fewer warnings. */
printf (" %sunsigned int hval = %s;\n\n"
@@ -951,7 +960,7 @@ Output::output_hash_function () const
do
{
if (i > key_pos)
printf (" /*FALLTHROUGH*/\n"); /* Pacify lint. */
printf ("%s", fallthrough_marker);
for ( ; i > key_pos; i--)
printf (" case %d:\n", i);
@@ -964,7 +973,7 @@ Output::output_hash_function () const
while (key_pos != PositionIterator::EOS && key_pos != Positions::LASTCHAR);
if (i >= _min_key_len)
printf (" /*FALLTHROUGH*/\n"); /* Pacify lint. */
printf ("%s", fallthrough_marker);
for ( ; i >= _min_key_len; i--)
printf (" case %d:\n", i);
}

5
tests/c-parse.exp
View File

@@ -86,6 +86,11 @@ hash (str, len)
{
default:
hval += asso_values[(unsigned char)str[2]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 2:
case 1:

55
tests/charsets.exp
View File

@@ -93,6 +93,11 @@ hash (register const char *str, register size_t len)
{
default:
hval += asso_values[(unsigned char)str[21]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 21:
case 20:
@@ -106,33 +111,83 @@ hash (register const char *str, register size_t len)
case 12:
case 11:
hval += asso_values[(unsigned char)str[10]+1];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 10:
hval += asso_values[(unsigned char)str[9]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 9:
hval += asso_values[(unsigned char)str[8]+1];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 8:
hval += asso_values[(unsigned char)str[7]+3];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 7:
hval += asso_values[(unsigned char)str[6]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 6:
hval += asso_values[(unsigned char)str[5]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 5:
hval += asso_values[(unsigned char)str[4]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 4:
hval += asso_values[(unsigned char)str[3]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 3:
hval += asso_values[(unsigned char)str[2]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 2:
hval += asso_values[(unsigned char)str[1]+1];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 1:
hval += asso_values[(unsigned char)str[0]];

145
tests/chill.exp
View File

@@ -84,90 +84,235 @@ hash (str, len)
{
default:
hval += asso_values[(unsigned char)str[29]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 29:
hval += asso_values[(unsigned char)str[28]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 28:
hval += asso_values[(unsigned char)str[27]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 27:
hval += asso_values[(unsigned char)str[26]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 26:
hval += asso_values[(unsigned char)str[25]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 25:
hval += asso_values[(unsigned char)str[24]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 24:
hval += asso_values[(unsigned char)str[23]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 23:
hval += asso_values[(unsigned char)str[22]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 22:
hval += asso_values[(unsigned char)str[21]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 21:
hval += asso_values[(unsigned char)str[20]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 20:
hval += asso_values[(unsigned char)str[19]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 19:
hval += asso_values[(unsigned char)str[18]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 18:
hval += asso_values[(unsigned char)str[17]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 17:
hval += asso_values[(unsigned char)str[16]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 16:
hval += asso_values[(unsigned char)str[15]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 15:
hval += asso_values[(unsigned char)str[14]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 14:
hval += asso_values[(unsigned char)str[13]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 13:
hval += asso_values[(unsigned char)str[12]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 12:
hval += asso_values[(unsigned char)str[11]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 11:
hval += asso_values[(unsigned char)str[10]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 10:
hval += asso_values[(unsigned char)str[9]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 9:
hval += asso_values[(unsigned char)str[8]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 8:
hval += asso_values[(unsigned char)str[7]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 7:
hval += asso_values[(unsigned char)str[6]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 6:
hval += asso_values[(unsigned char)str[5]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 5:
hval += asso_values[(unsigned char)str[4]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 4:
hval += asso_values[(unsigned char)str[3]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 3:
hval += asso_values[(unsigned char)str[2]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 2:
hval += asso_values[(unsigned char)str[1]+1];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 1:
hval += asso_values[(unsigned char)str[0]];

10
tests/cplusplus.exp
View File

@@ -86,11 +86,21 @@ hash (str, len)
{
default:
hval += asso_values[(unsigned char)str[6]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 6:
case 5:
case 4:
hval += asso_values[(unsigned char)str[3]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 3:
case 2:

5
tests/java.exp
View File

@@ -110,6 +110,11 @@ hash (str, len)
{
default:
hval += asso_values[(unsigned char)str[2]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 2:
case 1:

15
tests/languages.exp
View File

@@ -97,13 +97,28 @@ hash (register const char *str, register size_t len)
{
default:
hval += asso_values[(unsigned char)str[4]+1];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 4:
case 3:
hval += asso_values[(unsigned char)str[2]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 2:
hval += asso_values[(unsigned char)str[1]+9];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 1:
hval += asso_values[(unsigned char)str[0]];

35
tests/modula2.exp
View File

@@ -81,24 +81,59 @@ hash (register const char *str, register size_t len)
{
default:
hval += asso_values[(unsigned char)str[7]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 7:
hval += asso_values[(unsigned char)str[6]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 6:
hval += asso_values[(unsigned char)str[5]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 5:
hval += asso_values[(unsigned char)str[4]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 4:
hval += asso_values[(unsigned char)str[3]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 3:
hval += asso_values[(unsigned char)str[2]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 2:
hval += asso_values[(unsigned char)str[1]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 1:
hval += asso_values[(unsigned char)str[0]];

5
tests/objc.exp
View File

@@ -84,6 +84,11 @@ hash (register const char *str, register size_t len)
{
default:
hval += asso_values[(unsigned char)str[2]];
#if defined __cplusplus && __cplusplus >= 201703L
[[fallthrough]];
#elif defined __GNUC__ && __GNUC__ >= 7
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
case 2:
case 1: