Skip to content

Commit 6709800

Browse files
committed
Fix -Wswitch warnings in StmtNodes
+ Fix fallthrough warnings
1 parent bf81c8e commit 6709800

File tree

1 file changed

+23
-14
lines changed

1 file changed

+23
-14
lines changed

src/dsql/StmtNodes.cpp

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,7 @@ const StmtNode* BlockNode::execute(thread_db* tdbb, Request* request, ExeState*
697697
transaction->releaseSavepoint(tdbb);
698698
}
699699
}
700+
return parentStmt;
700701

701702
default:
702703
return parentStmt;
@@ -908,7 +909,7 @@ const StmtNode* CompoundStmtNode::execute(thread_db* tdbb, Request* request, Exe
908909
{
909910
case Request::req_evaluate:
910911
impure->sta_state = 0;
911-
// fall into
912+
[[fallthrough]];
912913

913914
case Request::req_return:
914915
case Request::req_sync:
@@ -918,7 +919,7 @@ const StmtNode* CompoundStmtNode::execute(thread_db* tdbb, Request* request, Exe
918919
return statements[impure->sta_state++];
919920
}
920921
request->req_operation = Request::req_return;
921-
// fall into
922+
return parentStmt;
922923

923924
default:
924925
return parentStmt;
@@ -1003,7 +1004,7 @@ DmlNode* CursorStmtNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScratc
10031004
case blr_cursor_fetch_scroll:
10041005
node->scrollOp = csb->csb_blr_reader.getByte();
10051006
node->scrollExpr = PAR_parse_value(tdbb, csb);
1006-
// fall into
1007+
[[fallthrough]];
10071008

10081009
case blr_cursor_fetch:
10091010
csb->csb_g_flags |= csb_reuse_context;
@@ -1226,6 +1227,7 @@ const StmtNode* CursorStmtNode::execute(thread_db* tdbb, Request* request, ExeSt
12261227
}
12271228

12281229
request->req_operation = Request::req_return;
1230+
return parentStmt;
12291231

12301232
default:
12311233
return parentStmt;
@@ -5854,13 +5856,13 @@ const StmtNode* ForNode::execute(thread_db* tdbb, Request* request, ExeState* /*
58545856
if (cursor->isUpdateCounters())
58555857
request->req_records_affected.clear();
58565858

5857-
// fall into
5859+
[[fallthrough]];
58585860

58595861
case Request::req_return:
58605862
if (stall)
58615863
return stall;
58625864

5863-
// fall into
5865+
[[fallthrough]];
58645866

58655867
case Request::req_sync:
58665868
{
@@ -5907,7 +5909,7 @@ const StmtNode* ForNode::execute(thread_db* tdbb, Request* request, ExeState* /*
59075909
}
59085910
}
59095911

5910-
// fall into
5912+
[[fallthrough]];
59115913

59125914
default:
59135915
{
@@ -6224,9 +6226,8 @@ const StmtNode* ForRangeNode::execute(thread_db* tdbb, Request* request, ExeStat
62246226
request->req_operation = Request::req_return;
62256227
return parentStmt;
62266228
}
6227-
6228-
[[fallthrough]];
62296229
}
6230+
[[fallthrough]];
62306231

62316232
case Request::req_return:
62326233
case Request::req_sync:
@@ -6344,6 +6345,7 @@ const StmtNode* HandlerNode::execute(thread_db* /*tdbb*/, Request* request, ExeS
63446345
case Request::req_unwind:
63456346
if (!request->req_label)
63466347
request->req_operation = Request::req_return;
6348+
return parentStmt;
63476349

63486350
default:
63496351
return parentStmt;
@@ -6411,7 +6413,7 @@ const StmtNode* LabelNode::execute(thread_db* /*tdbb*/, Request* request, ExeSta
64116413
request->req_flags &= ~req_leave;
64126414
request->req_operation = Request::req_return;
64136415
}
6414-
// fall into
6416+
return parentStmt;
64156417

64166418
default:
64176419
return parentStmt;
@@ -6700,7 +6702,7 @@ const StmtNode* LoopNode::execute(thread_db* /*tdbb*/, Request* request, ExeStat
67006702
request->req_operation = Request::req_evaluate;
67016703
return statement;
67026704
}
6703-
// fall into
6705+
return parentStmt;
67046706
}
67056707

67066708
default:
@@ -8218,9 +8220,9 @@ const StmtNode* ModifyNode::modify(thread_db* tdbb, Request* request, WhichTrigg
82188220

82198221
if (impure->sta_state == 0 && forNode && forNode->isWriteLockMode(request))
82208222
request->req_operation = Request::req_return;
8221-
// fall thru
82228223
else
82238224
break;
8225+
[[fallthrough]];
82248226

82258227
case Request::req_return:
82268228
if (impure->sta_state == 1)
@@ -8334,6 +8336,7 @@ const StmtNode* ModifyNode::modify(thread_db* tdbb, Request* request, WhichTrigg
83348336
orgRpb->rpb_record = newRpb->rpb_record;
83358337
newRpb->rpb_record = orgRecord;
83368338
}
8339+
return parentStmt;
83378340

83388341
default:
83398342
return parentStmt;
@@ -8668,7 +8671,7 @@ const StmtNode* ReceiveNode::execute(thread_db* /*tdbb*/, Request* request, ExeS
86688671
case Request::req_return:
86698672
if (!(request->req_batch_mode && batchFlag))
86708673
break;
8671-
// fall into
8674+
[[fallthrough]];
86728675

86738676
case Request::req_evaluate:
86748677
request->req_operation = Request::req_receive;
@@ -9376,7 +9379,7 @@ const StmtNode* StoreNode::store(thread_db* tdbb, Request* request, WhichTrigger
93769379
return statement2;
93779380
}
93789381
}
9379-
// fall into
9382+
return parentStmt;
93809383

93819384
default:
93829385
return parentStmt;
@@ -10281,7 +10284,7 @@ void SetDecFloatTrapsNode::execute(thread_db* tdbb, DsqlRequest* /*request*/, jr
1028110284

1028210285
SessionManagementNode* SetBindNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
1028310286
{
10284-
static const USHORT NON_FIELD_MASK = FLD_legacy | FLD_native;
10287+
static constexpr USHORT NON_FIELD_MASK = FLD_legacy | FLD_native;
1028510288

1028610289
from->resolve(dsqlScratch);
1028710290
if (!(to->flags & NON_FIELD_MASK))
@@ -11363,6 +11366,9 @@ static VariableNode* dsqlPassHiddenVariable(DsqlCompilerScratch* dsqlScratch, Va
1136311366
case ExprNode::TYPE_RECORD_KEY:
1136411367
case ExprNode::TYPE_VARIABLE:
1136511368
return NULL;
11369+
default:
11370+
// create temporary value below
11371+
break;
1136611372
}
1136711373

1136811374
VariableNode* varNode = FB_NEW_POOL(*tdbb->getDefaultPool()) VariableNode(*tdbb->getDefaultPool());
@@ -11687,6 +11693,9 @@ static void dsqlSetParameterName(DsqlCompilerScratch* dsqlScratch, ExprNode* exp
1168711693
parameter->par_rel_name = relation->rel_name;
1168811694
break;
1168911695
}
11696+
11697+
default:
11698+
break;
1169011699
}
1169111700
}
1169211701

0 commit comments

Comments
 (0)