invoke.texi (-Wimplicit-fallthrough): Document FALLTHRU comment style changes.

	* doc/invoke.texi (-Wimplicit-fallthrough): Document FALLTHRU comment
	style changes.

	* lex.c (fallthrough_comment_p): Extend to handle more common FALLTHRU
	comment styles.

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

From-SVN: r240885

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 353fdba709cd4cc12756e594d82afb05dc91eb8b..f547a7b8da6e4ff933e5341100e23bd7e70fab30 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2016-10-08  Jakub Jelinek  <jakub@redhat.com>
 
+       * doc/invoke.texi (-Wimplicit-fallthrough): Document FALLTHRU comment
+       style changes.
+
        * doc/invoke.texi (-Wimplicit-fallthrough): Document the accepted
        FALLTHRU comment styles.
 

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index e1a3e5f291faebd42e08387d108b942f3d40ac75..65805babb30e69ad416aad7c60daa156ed3537d3 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -4179,11 +4179,13 @@ should match one of the following regular expressions:
 
 @item @code{@@fallthrough@@}
 
-@item @code{[ \t]*FALL(S | |-)?THR(OUGH|U)\.?[ \t]*}
+@item @code{lint -fallthrough ?}
 
-@item @code{[ \t]*Fall((s | |-)[Tt]|t)hr(ough|u)\.?[ \t]*}
+@item @code{[ \t.!]*(ELSE |INTENTIONAL(LY)? )?FALL(S | |-)?THR(OUGH|U)[ \t.!]*(-[^\n\r]*)?}
 
-@item @code{[ \t]*fall(s | |-)?thr(ough|u)\.?[ \t]*}
+@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]*)?}
 
 @end itemize
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1868c4cca8f6291b19daae38111ec19f0abeed6b..12b90093a98a6437fa41e8872e65a5bca892ed55 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2016-10-08  Jakub Jelinek  <jakub@redhat.com>
 
+       * 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.
 

diff --git a/gcc/testsuite/c-c++-common/Wimplicit-fallthrough-23.c b/gcc/testsuite/c-c++-common/Wimplicit-fallthrough-23.c
index 137b517c2dd225a62ee251e9d33e8b1a25afecbe..c2988b716db5b0d99cd0117f48f55ae9a15dd5ec 100644 (file)
--- a/gcc/testsuite/c-c++-common/Wimplicit-fallthrough-23.c
+++ b/gcc/testsuite/c-c++-common/Wimplicit-fallthrough-23.c
@@ -21,15 +21,39 @@ foo (int i)
     case 4:
       bar (4);
       break;
+    case 5:
+      bar (5);                 /* { dg-bogus "this statement may \[laf]* through" } */
+      /* Else Fall-Thru!  */
+    case 6:
+      bar (6);
+      break;
     case 7:
       bar (7);                 /* { dg-bogus "this statement may \[laf]* through" } */
       /* Some comment.  */
-      /* fallthrough.  */
+      /* ... fallthrough ...  */
       /* Some other comment.  */
       /* And yet another.  */
     case 8:
       bar (8);
       break;
+    case 9:
+      bar (9);                 /* { dg-bogus "this statement may \[laf]* through" } */
+      /* Intentional Fallthru */
+    case 10:
+      bar (10);
+      break;
+    case 11:
+      bar (11);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      /* intentionally fall through  */
+    case 12:
+      bar (12);
+      break;
+    case 13:
+      bar (13);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      /* Falls Through - for reasons known only to the author.  */
+    case 14:
+      bar (14);
+      break;
     case 15:
       bar (15);                        /* { dg-bogus "this statement may \[laf]* through" } */
       /*-fallthrough*/
@@ -42,12 +66,42 @@ foo (int i)
     case 18:
       bar (18);
       break;
+    case 19:
+      bar (19);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      /*lint -fallthrough*/
+    case 20:
+      bar (20);
+      break;
+    case 21:
+      bar (21);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      /*lint -fallthrough */
+    case 22:
+      bar (22);
+      break;
     case 23:
       bar (23);                        /* { dg-bogus "this statement may \[laf]* through" } */
       /*fallthru*/
     case 24:
       bar (24);
       break;
+    case 25:
+      bar (25);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      /*Else fallthru*/
+    case 26:
+      bar (26);
+      break;
+    case 27:
+      bar (27);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      /*Intentional fallthru*/
+    case 28:
+      bar (28);
+      break;
+    case 29:
+      bar (29);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      /*Intentionally fallthru*/
+    case 30:
+      bar (30);
+      break;
     case 31:
       bar (31);                        /* { dg-bogus "this statement may \[laf]* through" } */
       /*Falls thru*/
@@ -78,15 +132,39 @@ foo (int i)
     case 4:
       bar (4);
       break;
+    case 5:
+      bar (5);                 /* { dg-bogus "this statement may \[laf]* through" } */
+      // Else Fall-Thru!
+    case 6:
+      bar (6);
+      break;
     case 7:
       bar (7);                 /* { dg-bogus "this statement may \[laf]* through" } */
       // Some comment.
-      // fallthrough
+      // ... fallthrough ...
       // Some other comment.
       // And yet another.
     case 8:
       bar (8);
       break;
+    case 9:
+      bar (9);                 /* { dg-bogus "this statement may \[laf]* through" } */
+      // Intentional Fallthru
+    case 10:
+      bar (10);
+      break;
+    case 11:
+      bar (11);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      // intentionally fall through 
+    case 12:
+      bar (12);
+      break;
+    case 13:
+      bar (13);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      // Falls Through - for reasons known only to the author.
+    case 14:
+      bar (14);
+      break;
     case 15:
       bar (15);                        /* { dg-bogus "this statement may \[laf]* through" } */
       //-fallthrough
@@ -99,12 +177,42 @@ foo (int i)
     case 18:
       bar (18);
       break;
+    case 19:
+      bar (19);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      //lint -fallthrough
+    case 20:
+      bar (20);
+      break;
+    case 21:
+      bar (21);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      //lint -fallthrough 
+    case 22:
+      bar (22);
+      break;
     case 23:
       bar (23);                        /* { dg-bogus "this statement may \[laf]* through" } */
       //fallthru
     case 24:
       bar (24);
       break;
+    case 25:
+      bar (25);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      //Else fallthru
+    case 26:
+      bar (26);
+      break;
+    case 27:
+      bar (27);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      //Intentional fallthru
+    case 28:
+      bar (28);
+      break;
+    case 29:
+      bar (29);                        /* { dg-bogus "this statement may \[laf]* through" } */
+      //Intentionally fallthru
+    case 30:
+      bar (30);
+      break;
     case 31:
       bar (31);                        /* { dg-bogus "this statement may \[laf]* through" } */
       //Falls thru

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index faecb162caf173ce7fdb4b91f1ff5e568059a03e..6e48566878e6c3e8e66de640cc141544a4f21ce3 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,5 +1,8 @@
 2016-10-08  Jakub Jelinek  <jakub@redhat.com>
 
+       * lex.c (fallthrough_comment_p): Extend to handle more common FALLTHRU
+       comment styles.
+
        * lex.c (fallthrough_comment_p): Fix off-by-one size comparison
        errors, cleanup.
        (_cpp_lex_direct): Allow arbitrary comments in between

diff --git a/libcpp/lex.c b/libcpp/lex.c
index d960aa869e4c7277ae1f78b280cb49e6af4e0e18..2e0512d6428e8391cd3bb57b57a2dee56acdb066 100644 (file)
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -2060,22 +2060,86 @@ fallthrough_comment_p (cpp_reader *pfile, const unsigned char *comment_start)
       from += 1 + len;
     }
   /* Whole comment contents (regex):
-     [ \t]*FALL(S | |-)?THR(OUGH|U)\.?[ \t]*
-     [ \t]*Fall((s | |-)[Tt]|t)hr(ough|u)\.?[ \t]*
-     [ \t]*fall(s | |-)?thr(ough|u)\.?[ \t]*
+     lint -fallthrough ?
+   */
+  else if (*from == 'l')
+    {
+      size_t len = sizeof "int -fallthrough" - 1;
+      if ((size_t) (pfile->buffer->cur - from - 1) < len)
+       return false;
+      if (memcmp (from + 1, "int -fallthrough", len))
+        return false;
+      from += 1 + len;
+      if (*from == ' ')
+        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]*)?
    */
   else
     {
-      while (*from == ' ' || *from == '\t')
+      while (*from == ' ' || *from == '\t' || *from == '.' || *from == '!')
        from++;
       unsigned char f = *from;
+      bool all_upper = false;
+      if (f == 'E' || f == 'e')
+        {
+          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)
+           all_upper = true;
+         else if (memcmp (from + 1, "lse ", sizeof "lse " - 1))
+           return false;
+         from += sizeof "else " - 1;
+         if (f == 'e' && *from == 'F')
+           return false;
+         f = *from;
+        }
+      else if (f == 'I' || f == 'i')
+        {
+          if ((size_t) (pfile->buffer->cur - from)
+             < sizeof "intentional fallthru" - 1)
+           return false;
+         if (f == 'I' && memcmp (from + 1, "NTENTIONAL",
+                                 sizeof "NTENTIONAL" - 1) == 0)
+           all_upper = true;
+         else if (memcmp (from + 1, "ntentional",
+                          sizeof "ntentional" - 1))
+           return false;
+         from += sizeof "intentional" - 1;
+         if (*from == ' ')
+           {
+             from++;
+             if (all_upper && *from == 'f')
+               return false;
+           }
+         else if (all_upper)
+           {
+             if (memcmp (from, "LY F", sizeof "LY F" - 1))
+               return false;
+             from += sizeof "LY " - 1;
+           }
+         else
+           {
+             if (memcmp (from, "ly ", sizeof "ly " - 1))
+               return false;
+             from += sizeof "ly " - 1;
+           }
+         if (f == 'i' && *from == 'F')
+           return false;
+         f = *from;
+        }
       if (f != 'F' && f != 'f')
        return false;
       if ((size_t) (pfile->buffer->cur - from) < sizeof "fallthru" - 1)
        return false;
-      bool all_upper = false;
       if (f == 'F' && memcmp (from + 1, "ALL", sizeof "ALL" - 1) == 0)
        all_upper = true;
+      else if (all_upper)
+       return false;
       else if (memcmp (from + 1, "all", sizeof "all" - 1))
        return false;
       from += sizeof "fall" - 1;
@@ -2100,10 +2164,28 @@ fallthrough_comment_p (cpp_reader *pfile, const unsigned char *comment_start)
        }
       else
        from += sizeof "thru" - 1;
-      if (*from == '.')
-       from++;
-      while (*from == ' ' || *from == '\t')
+      while (*from == ' ' || *from == '\t' || *from == '.' || *from == '!')
        from++;
+      if (*from == '-')
+       {
+         from++;
+         if (*comment_start == '*')
+           {
+             do
+               {
+                 while (*from && *from != '*'
+                        && *from != '\n' && *from != '\r')
+                   from++;
+                 if (*from != '*' || from[1] == '/')
+                   break;
+                 from++;
+               }
+             while (1);
+           }
+         else
+           while (*from && *from != '\n' && *from != '\r')
+             from++;
+       }
     }
   /* C block comment.  */
   if (*comment_start == '*')