cleanup: silence fallthrough warnings

diff --git a/fold.cpp b/fold.cpp
index 7a0df0ed9af6d9b3e0950bd0ed6bb9200285ab58..7b13db60ed0c80f306d09e080f305363f7212d2e 100644 (file)
--- a/fold.cpp
+++ b/fold.cpp
@@ -1392,8 +1392,8 @@ ast_expression *fold::op(const oper_info *info, ast_expression **opexprs) {
         return nullptr;
 
     switch(info->operands) {
         return nullptr;
 
     switch(info->operands) {

-        case 3: if(!c) return nullptr;
-        case 2: if(!b) return nullptr;
+        case 3: if(!c) return nullptr; [[fallthrough]];
+        case 2: if(!b) return nullptr; [[fallthrough]];

         case 1:
         if(!a) {
             compile_error(ctx(), "internal error: fold_op no operands to fold\n");
         case 1:
         if(!a) {
             compile_error(ctx(), "internal error: fold_op no operands to fold\n");


@@ -1560,6 +1560,7 @@ ast_expression *fold::superfluous(ast_expression *left, ast_expression *right, i
         case INSTR_DIV_F:
             if (swapped)
                 return nullptr;
         case INSTR_DIV_F:
             if (swapped)
                 return nullptr;

+            [[fallthrough]];

         case INSTR_MUL_F:
             if (immvalue_float(load) == 1.0f) {
                 ++opts_optimizationcount[OPTIM_PEEPHOLE];
         case INSTR_MUL_F:
             if (immvalue_float(load) == 1.0f) {
                 ++opts_optimizationcount[OPTIM_PEEPHOLE];


@@ -1572,6 +1573,7 @@ ast_expression *fold::superfluous(ast_expression *left, ast_expression *right, i
         case INSTR_SUB_F:
             if (swapped)
                 return nullptr;
         case INSTR_SUB_F:
             if (swapped)
                 return nullptr;

+            [[fallthrough]];

         case INSTR_ADD_F:
             if (immvalue_float(load) == 0.0f) {
                 ++opts_optimizationcount[OPTIM_PEEPHOLE];
         case INSTR_ADD_F:
             if (immvalue_float(load) == 0.0f) {
                 ++opts_optimizationcount[OPTIM_PEEPHOLE];


@@ -1591,6 +1593,7 @@ ast_expression *fold::superfluous(ast_expression *left, ast_expression *right, i
         case INSTR_SUB_V:
             if (swapped)
                 return nullptr;
         case INSTR_SUB_V:
             if (swapped)
                 return nullptr;

+            [[fallthrough]];

         case INSTR_ADD_V:
             if (vec3_cmp(immvalue_vector(load), vec3_create(0, 0, 0))) {
                 ++opts_optimizationcount[OPTIM_PEEPHOLE];
         case INSTR_ADD_V:
             if (vec3_cmp(immvalue_vector(load), vec3_create(0, 0, 0))) {
                 ++opts_optimizationcount[OPTIM_PEEPHOLE];

diff --git a/parser.cpp b/parser.cpp
index e365316f33068520e62e684be39d97aa9fb0f47b..92434f00370aa16e1a346672de1d457699967a80 100644 (file)
--- a/parser.cpp
+++ b/parser.cpp
@@ -728,6 +728,7 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy)
 
         case opid2('|','|'):
             generated_op += 1; /* INSTR_OR */
 
         case opid2('|','|'):
             generated_op += 1; /* INSTR_OR */

+            [[fallthrough]];

         case opid2('&','&'):
             generated_op += INSTR_AND;
             if (!(out = parser->m_fold.op(op, exprs))) {
         case opid2('&','&'):
             generated_op += INSTR_AND;
             if (!(out = parser->m_fold.op(op, exprs))) {


@@ -857,10 +858,13 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy)
 
         case opid1('>'):
             generated_op += 1; /* INSTR_GT */
 
         case opid1('>'):
             generated_op += 1; /* INSTR_GT */

+            [[fallthrough]];

         case opid1('<'):
             generated_op += 1; /* INSTR_LT */
         case opid1('<'):
             generated_op += 1; /* INSTR_LT */

+            [[fallthrough]];

         case opid2('>', '='):
             generated_op += 1; /* INSTR_GE */
         case opid2('>', '='):
             generated_op += 1; /* INSTR_GE */

+            [[fallthrough]];

         case opid2('<', '='):
             generated_op += INSTR_LE;
             if (NotSameType(TYPE_FLOAT)) {
         case opid2('<', '='):
             generated_op += INSTR_LE;
             if (NotSameType(TYPE_FLOAT)) {