Mercurial > vim
comparison src/regexp.c @ 12674:e769c912fcd9 v8.0.1215
patch 8.0.1215: newer gcc warns for implicit fallthrough
commit https://github.com/vim/vim/commit/2f40d129bf45cd35976e4120336ae6d504f5a5dd
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Oct 24 21:49:36 2017 +0200
patch 8.0.1215: newer gcc warns for implicit fallthrough
Problem: Newer gcc warns for implicit fallthrough.
Solution: Consistently use a FALLTHROUGH comment. (Christian Brabandt)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 24 Oct 2017 22:00:06 +0200 |
parents | 998d2cf59caa |
children | 09c856605191 |
comparison
equal
deleted
inserted
replaced
12673:2b845e7b9727 | 12674:e769c912fcd9 |
---|---|
1995 /* "\_[" is character range plus newline */ | 1995 /* "\_[" is character range plus newline */ |
1996 if (c == '[') | 1996 if (c == '[') |
1997 goto collection; | 1997 goto collection; |
1998 | 1998 |
1999 /* "\_x" is character class plus newline */ | 1999 /* "\_x" is character class plus newline */ |
2000 /*FALLTHROUGH*/ | 2000 /* FALLTHROUGH */ |
2001 | 2001 |
2002 /* | 2002 /* |
2003 * Character classes. | 2003 * Character classes. |
2004 */ | 2004 */ |
2005 case Magic('.'): | 2005 case Magic('.'): |
5845 break; | 5845 break; |
5846 | 5846 |
5847 case IDENT: | 5847 case IDENT: |
5848 case IDENT + ADD_NL: | 5848 case IDENT + ADD_NL: |
5849 testval = TRUE; | 5849 testval = TRUE; |
5850 /*FALLTHROUGH*/ | 5850 /* FALLTHROUGH */ |
5851 case SIDENT: | 5851 case SIDENT: |
5852 case SIDENT + ADD_NL: | 5852 case SIDENT + ADD_NL: |
5853 while (count < maxcount) | 5853 while (count < maxcount) |
5854 { | 5854 { |
5855 if (vim_isIDc(PTR2CHAR(scan)) && (testval || !VIM_ISDIGIT(*scan))) | 5855 if (vim_isIDc(PTR2CHAR(scan)) && (testval || !VIM_ISDIGIT(*scan))) |
5875 break; | 5875 break; |
5876 | 5876 |
5877 case KWORD: | 5877 case KWORD: |
5878 case KWORD + ADD_NL: | 5878 case KWORD + ADD_NL: |
5879 testval = TRUE; | 5879 testval = TRUE; |
5880 /*FALLTHROUGH*/ | 5880 /* FALLTHROUGH */ |
5881 case SKWORD: | 5881 case SKWORD: |
5882 case SKWORD + ADD_NL: | 5882 case SKWORD + ADD_NL: |
5883 while (count < maxcount) | 5883 while (count < maxcount) |
5884 { | 5884 { |
5885 if (vim_iswordp_buf(scan, rex.reg_buf) | 5885 if (vim_iswordp_buf(scan, rex.reg_buf) |
5906 break; | 5906 break; |
5907 | 5907 |
5908 case FNAME: | 5908 case FNAME: |
5909 case FNAME + ADD_NL: | 5909 case FNAME + ADD_NL: |
5910 testval = TRUE; | 5910 testval = TRUE; |
5911 /*FALLTHROUGH*/ | 5911 /* FALLTHROUGH */ |
5912 case SFNAME: | 5912 case SFNAME: |
5913 case SFNAME + ADD_NL: | 5913 case SFNAME + ADD_NL: |
5914 while (count < maxcount) | 5914 while (count < maxcount) |
5915 { | 5915 { |
5916 if (vim_isfilec(PTR2CHAR(scan)) && (testval || !VIM_ISDIGIT(*scan))) | 5916 if (vim_isfilec(PTR2CHAR(scan)) && (testval || !VIM_ISDIGIT(*scan))) |
5936 break; | 5936 break; |
5937 | 5937 |
5938 case PRINT: | 5938 case PRINT: |
5939 case PRINT + ADD_NL: | 5939 case PRINT + ADD_NL: |
5940 testval = TRUE; | 5940 testval = TRUE; |
5941 /*FALLTHROUGH*/ | 5941 /* FALLTHROUGH */ |
5942 case SPRINT: | 5942 case SPRINT: |
5943 case SPRINT + ADD_NL: | 5943 case SPRINT + ADD_NL: |
5944 while (count < maxcount) | 5944 while (count < maxcount) |
5945 { | 5945 { |
5946 if (*scan == NUL) | 5946 if (*scan == NUL) |
6129 #endif | 6129 #endif |
6130 | 6130 |
6131 case ANYOF: | 6131 case ANYOF: |
6132 case ANYOF + ADD_NL: | 6132 case ANYOF + ADD_NL: |
6133 testval = TRUE; | 6133 testval = TRUE; |
6134 /*FALLTHROUGH*/ | 6134 /* FALLTHROUGH */ |
6135 | 6135 |
6136 case ANYBUT: | 6136 case ANYBUT: |
6137 case ANYBUT + ADD_NL: | 6137 case ANYBUT + ADD_NL: |
6138 while (count < maxcount) | 6138 while (count < maxcount) |
6139 { | 6139 { |