Commit 529ad5fa authored by József Gyürüsi's avatar József Gyürüsi
Browse files

[internal #1688415] unreachable statements: removed



Change-Id: Ib23549d262d213456bdc219bd2986f11523ded8c
Signed-off-by: József Gyürüsi's avatarJózsef Gyürüsi <jozsef.gyurusi@ericsson.com>
parent 0cb0a556
......@@ -915,7 +915,6 @@ runs on EPTF_Base_CT_private return boolean {
f_EPTF_Common_user(%definitionId& ": Assert message with id "&int2str(pl_assertNum)&" matches with the expected pattern: "& pl_expectedAssert);
return true;
}
return true;
}
///////////////////////////////////////////////////////////
......@@ -944,7 +943,6 @@ runs on EPTF_Base_CT_private return boolean {
f_EPTF_Common_user(%definitionId& ": Error message with id "&int2str(pl_errNum)&" matches with the expected pattern: "& pl_expectedError);
return true;
}
return true;
}
///////////////////////////////////////////////////////////
......
......@@ -135,7 +135,6 @@ public function f_EPTF_Common_checkExpectedError(in charstring pl_expectedError,
f_EPTF_Common_user(%definitionId& ": Error message with id "&int2str(pl_errorNum)&" matches with the expected pattern: "& pl_expectedError);
return true;
}
return true;
}
///////////////////////////////////////////////////////////
......
......@@ -3761,7 +3761,6 @@ private function f_EPTF_DataSource_handleBuiltInConditions(
return 11; // unknown internal method
}
}
return 12; // unknown method
}
private function f_EPTF_DataSource_handleBuiltInConditions_nonblocking(
......@@ -5133,29 +5132,29 @@ private altstep as_EPTF_DataSource_Msg_GetData_Buffer_Handler() runs on EPTF_Dat
//------------------------------------------------------------------
// alternate code without clustering:
// [sizeof(v_EPTF_DataSource_Msg_GetData_Buffer) != 0 and f_EPTF_DataSource_calculateNofMsgsToSend()>0] t_EPTF_DataSource_Msg_GetData_Buffer_timer.timeout {
// TODO: send buffer with clustering
var integer vl_buffSize := sizeof(v_EPTF_DataSource_Msg_GetData_Buffer);
var integer vl_lastIdx := v_EPTF_DataSource_Msg_GetData_BufferStartIdx + f_EPTF_DataSource_calculateNofMsgsToSend();
for(var integer i:=v_EPTF_DataSource_Msg_GetData_BufferStartIdx; i<vl_lastIdx; i:=i+1) {
EPTF_DataSourceIf.send({getData := v_EPTF_DataSource_Msg_GetData_Buffer[i].getDataMsg}) to v_EPTF_DataSource_Msg_GetData_Buffer[i].destinationCompRef;
}
//increase number of pending getData counter with the number of messages sent:
v_EPTF_DataSource_nofPendingGetData := v_EPTF_DataSource_nofPendingGetData + vl_lastIdx - v_EPTF_DataSource_Msg_GetData_BufferStartIdx;
v_EPTF_DataSource_Msg_GetData_BufferStartIdx := vl_lastIdx;
if (v_EPTF_DataSource_Msg_GetData_BufferStartIdx==vl_buffSize) {
v_EPTF_DataSource_Msg_GetData_BufferStartIdx := 0;
v_EPTF_DataSource_Msg_GetData_Buffer := {};
} else {
// there are still messages left in the buffer
t_EPTF_DataSource_Msg_GetData_Buffer_timer.start(0.001);
//action("**** msgs remain: ", vl_buffSize-v_EPTF_DataSource_Msg_GetData_BufferStartIdx);
}
repeat;
// // TODO: send buffer with clustering
//
//
// var integer vl_buffSize := sizeof(v_EPTF_DataSource_Msg_GetData_Buffer);
// var integer vl_lastIdx := v_EPTF_DataSource_Msg_GetData_BufferStartIdx + f_EPTF_DataSource_calculateNofMsgsToSend();
//
// for(var integer i:=v_EPTF_DataSource_Msg_GetData_BufferStartIdx; i<vl_lastIdx; i:=i+1) {
// EPTF_DataSourceIf.send({getData := v_EPTF_DataSource_Msg_GetData_Buffer[i].getDataMsg}) to v_EPTF_DataSource_Msg_GetData_Buffer[i].destinationCompRef;
// }
//
// //increase number of pending getData counter with the number of messages sent:
// v_EPTF_DataSource_nofPendingGetData := v_EPTF_DataSource_nofPendingGetData + vl_lastIdx - v_EPTF_DataSource_Msg_GetData_BufferStartIdx;
//
// v_EPTF_DataSource_Msg_GetData_BufferStartIdx := vl_lastIdx;
// if (v_EPTF_DataSource_Msg_GetData_BufferStartIdx==vl_buffSize) {
// v_EPTF_DataSource_Msg_GetData_BufferStartIdx := 0;
// v_EPTF_DataSource_Msg_GetData_Buffer := {};
// } else {
// // there are still messages left in the buffer
// t_EPTF_DataSource_Msg_GetData_Buffer_timer.start(0.001);
// //action("**** msgs remain: ", vl_buffSize-v_EPTF_DataSource_Msg_GetData_BufferStartIdx);
// }
// repeat;
}
}
......
......@@ -2179,20 +2179,20 @@ const charstring c_EPTF_ExecCtrl_UIHandler_led_initStr := "[led:black]NA";
continue;
}
f_EPTF_UIHandlerClient_subscribeMe (
"StatusLED." & vl_currentName,
"GUI.StatusLED." & vl_currentName,
vl_widgetId,
realtime);
f_EPTF_ExecCtrl_UIHandler_debug(
"Last subscribed to GUI variable (SCEN / LGen status) name: "
&vl_currentName);
// f_EPTF_UIHandlerClient_subscribeMe (
// "StatusLED." & vl_currentName,
// "GUI.StatusLED." & vl_currentName,
// vl_widgetId,
// realtime);
//
// f_EPTF_ExecCtrl_UIHandler_debug(
// "Last subscribed to GUI variable (SCEN / LGen status) name: "
// &vl_currentName);
}
// Increase offset for each group
vl_offset := vl_offset + 1;
// vl_offset := vl_offset + 1;
} // sc
} // eg
}
......
......@@ -4597,7 +4597,6 @@ group GetSet{
return -1
}
}
return -1; // never executed, just to remove compilation warning
}
///////////////////////////////////////////////////////////
......@@ -6019,7 +6018,6 @@ group Conversion{
}
}
}
return ""; // never executed, just to remove compilation warning
}
///////////////////////////////////////////////////////////
// Function: f_EPTF_LGenBase_iIdx2Str
......@@ -6061,7 +6059,6 @@ group Conversion{
}
}
}
return ""; // never executed, just to remove compilation warning
}
} // Conversion
......
......@@ -279,8 +279,6 @@ group BurstCalculation{
f_EPTF_LGenBase_scenarioRelIdx(vl_idx, vl_eGrpIdx, vl_scInGrpIdx);
return f_EPTF_LGenBase_getBurstCalcFunctionId( v_LGenBase_entityGroups[vl_eGrpIdx].scenarios[vl_scInGrpIdx].schedulerData.burstFuncRef.burstCalcMode );
}
//Cannot reach this code
return -1;
}
///////////////////////////////////////////////////////////
......
......@@ -466,7 +466,6 @@ runs on EPTF_StatManager_CT return integer
return -1;
}
}
return -1; //this should never be executed
}
///////////////////////////////////////////////////////////
......
......@@ -863,8 +863,6 @@ group PrivateFunctions{
return "";
}
}
// control never reaches this point but gcc complains on the generated code.
return "";
}
}
......
///////////////////////////////////////////////////////////////////////////////
// //
// Copyright (c) 2000-2019 Ericsson Telecom AB //
// //
// All rights reserved. This program and the accompanying materials //
// are made available under the terms of the Eclipse Public License v2.0 //
// which accompanies this distribution, and is available at //
// Copyright (c) 2000-2019 Ericsson Telecom AB //
// //
// All rights reserved. This program and the accompanying materials //
// are made available under the terms of the Eclipse Public License v2.0 //
// which accompanies this distribution, and is available at //
// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html //
///////////////////////////////////////////////////////////////////////////////
......@@ -3130,7 +3130,6 @@ group PrivateFunctions {
return false;
}
}
return true;
}
///////////////////////////////////////////////////////////
......@@ -3576,10 +3575,6 @@ group PrivateFunctions {
pl_widgets := {spacer := {0.0,omit}}; // a dummy widget - omit can not be used
return;
}
// control will never go here, but we need these because of gcc
pl_succ := false;
pl_widgets := {spacer := {0.0,omit}};
return;
}
///////////////////////////////////////////////////////////
// Function: f_EPTF_UIHandler_widgetList
......@@ -9532,7 +9527,6 @@ group PrivateFunctions {
} else {
return vl_getDataResult;
}
return vl_getDataResult;
}
......@@ -9580,7 +9574,6 @@ group PrivateFunctions {
} else {
return vl_getDataResult;
}
return vl_getDataResult;
}
private function f_EPTF_UIhandler_simulation_getDefaultValue(in EPTF_UIHandler_GuiItemRec pl_widgetRec, out EPTF_Var_DirectContent vl_defaultValue) {
......@@ -11060,7 +11053,6 @@ group UIHandler_Config{
f_EPTF_UIHandler_warning("Unhandled widget type in "&%definitionId&": "&log2str(pl_xul));
return false;
}
return true;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment