Replace assert(0) by throw std::runtime_error("unreachable");.

maxr-dot-org · Mar 11, 2024 · 56f38c0 · 56f38c0
1 parent b3544ca
commit 56f38c0
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 73 deletions.
diff --git a/src/lib/game/data/base/base.cpp b/src/lib/game/data/base/base.cpp
@@ -290,9 +290,8 @@ int cSubBase::getResource (eResourceType storeResType) const
 		case eResourceType::Gold:
 			return stored.gold;
 		default:
-			assert (0);
+			throw std::runtime_error("unreachable");
 	}
-	return 0;
 }
 
 //------------------------------------------------------------------------------
@@ -310,7 +309,7 @@ void cSubBase::setResource (eResourceType storeResType, int value)
 			setGold (value);
 			break;
 		default:
-			assert (0);
+			throw std::runtime_error ("unreachable");
 	}
 }
 

diff --git a/src/lib/game/data/freezemode.cpp b/src/lib/game/data/freezemode.cpp
@@ -61,7 +61,7 @@ void cFreezeModes::enable (eFreezeMode mode)
 			waitForServer = true;
 			return;
 	}
-	assert (false);
+	throw std::runtime_error ("unreachable");
 }
 
 //------------------------------------------------------------------------------
@@ -82,7 +82,7 @@ void cFreezeModes::disable (eFreezeMode mode)
 			waitForServer = false;
 			return;
 	}
-	assert (false);
+	throw std::runtime_error ("unreachable");
 }
 
 //------------------------------------------------------------------------------
@@ -107,6 +107,5 @@ bool cFreezeModes::isEnabled (eFreezeMode mode) const
 		case eFreezeMode::WaitForClient: return waitForClient;
 		case eFreezeMode::WaitForServer: return waitForServer;
 	}
-	assert (0); // Incorrect parameter
-	return false;
+	throw std::runtime_error ("unreachable");
 }
diff --git a/src/lib/game/data/report/savedreport.cpp b/src/lib/game/data/report/savedreport.cpp
@@ -104,10 +104,8 @@ std::unique_ptr<cSavedReport> cSavedReport::createFromImpl (Archive& archive)
 		case eSavedReportType::TurnWait:
 		case eSavedReportType::TurnAutoMove:
 			return std::make_unique<cSavedReportSimple> (type);
-		default:
-			assert (false);
-			return nullptr;
 	}
+	throw std::runtime_error ("unreachable");
 }
 
 //------------------------------------------------------------------------------

diff --git a/src/lib/game/logic/action/actioninitnewgame.cpp b/src/lib/game/logic/action/actioninitnewgame.cpp
@@ -52,8 +52,7 @@ namespace
 			case eGameSettingsResourceDensity::TooMuch:
 				return 3;
 		}
-		assert (false);
-		return 0;
+		throw std::runtime_error ("unreachable");
 	}
 
 	//--------------------------------------------------------------------------
@@ -70,8 +69,7 @@ namespace
 			case eGameSettingsResourceAmount::TooMuch:
 				return 3;
 		}
-		assert (false);
-		return 0;
+		throw std::runtime_error ("unreachable");
 	}
 
 	//--------------------------------------------------------------------------

diff --git a/src/lib/game/logic/upgradecalculator.cpp b/src/lib/game/logic/upgradecalculator.cpp
@@ -1607,7 +1607,7 @@ void cUnitUpgrade::updateUnitData (cDynamicUnitData& data) const
 			case sUnitUpgrade::eUpgradeType::None:
 				break;
 			default:
-				assert (false);
+				throw std::runtime_error ("unreachable");
 		}
 	}
 }

diff --git a/src/lib/input/mouse/cursor/mousecursorsimple.cpp b/src/lib/input/mouse/cursor/mousecursorsimple.cpp
@@ -34,50 +34,28 @@ SDL_Surface* cMouseCursorSimple::getSurface() const
 {
 	switch (type)
 	{
-		case eMouseCursorSimpleType::Hand:
-			return GraphicsData.gfx_Chand.get();
-		case eMouseCursorSimpleType::No:
-			return GraphicsData.gfx_Cno.get();
-		case eMouseCursorSimpleType::Select:
-			return GraphicsData.gfx_Cselect.get();
-		case eMouseCursorSimpleType::Move:
-			return GraphicsData.gfx_Cmove.get();
-		case eMouseCursorSimpleType::ArrowLeftDown:
-			return GraphicsData.gfx_Cpfeil1.get();
-		case eMouseCursorSimpleType::ArrowDown:
-			return GraphicsData.gfx_Cpfeil2.get();
-		case eMouseCursorSimpleType::ArrowRightDown:
-			return GraphicsData.gfx_Cpfeil3.get();
-		case eMouseCursorSimpleType::ArrowLeft:
-			return GraphicsData.gfx_Cpfeil4.get();
-		case eMouseCursorSimpleType::ArrowRight:
-			return GraphicsData.gfx_Cpfeil6.get();
-		case eMouseCursorSimpleType::ArrowLeftUp:
-			return GraphicsData.gfx_Cpfeil7.get();
-		case eMouseCursorSimpleType::ArrowUp:
-			return GraphicsData.gfx_Cpfeil8.get();
-		case eMouseCursorSimpleType::ArrowRightUp:
-			return GraphicsData.gfx_Cpfeil9.get();
-		case eMouseCursorSimpleType::Help:
-			return GraphicsData.gfx_Chelp.get();
-		case eMouseCursorSimpleType::Band:
-			return GraphicsData.gfx_Cband.get();
-		case eMouseCursorSimpleType::Transfer:
-			return GraphicsData.gfx_Ctransf.get();
-		case eMouseCursorSimpleType::Load:
-			return GraphicsData.gfx_Cload.get();
-		case eMouseCursorSimpleType::Muni:
-			return GraphicsData.gfx_Cmuni.get();
-		case eMouseCursorSimpleType::Repair:
-			return GraphicsData.gfx_Crepair.get();
-		case eMouseCursorSimpleType::Activate:
-			return GraphicsData.gfx_Cactivate.get();
-		case eMouseCursorSimpleType::MoveDraft:
-			return GraphicsData.gfx_Cmove_draft.get();
-		default:
-			assert (false);
+		case eMouseCursorSimpleType::Hand: return GraphicsData.gfx_Chand.get();
+		case eMouseCursorSimpleType::No: return GraphicsData.gfx_Cno.get();
+		case eMouseCursorSimpleType::Select: return GraphicsData.gfx_Cselect.get();
+		case eMouseCursorSimpleType::Move: return GraphicsData.gfx_Cmove.get();
+		case eMouseCursorSimpleType::ArrowLeftDown: return GraphicsData.gfx_Cpfeil1.get();
+		case eMouseCursorSimpleType::ArrowDown: return GraphicsData.gfx_Cpfeil2.get();
+		case eMouseCursorSimpleType::ArrowRightDown: return GraphicsData.gfx_Cpfeil3.get();
+		case eMouseCursorSimpleType::ArrowLeft: return GraphicsData.gfx_Cpfeil4.get();
+		case eMouseCursorSimpleType::ArrowRight: return GraphicsData.gfx_Cpfeil6.get();
+		case eMouseCursorSimpleType::ArrowLeftUp: return GraphicsData.gfx_Cpfeil7.get();
+		case eMouseCursorSimpleType::ArrowUp: return GraphicsData.gfx_Cpfeil8.get();
+		case eMouseCursorSimpleType::ArrowRightUp: return GraphicsData.gfx_Cpfeil9.get();
+		case eMouseCursorSimpleType::Help: return GraphicsData.gfx_Chelp.get();
+		case eMouseCursorSimpleType::Band: return GraphicsData.gfx_Cband.get();
+		case eMouseCursorSimpleType::Transfer: return GraphicsData.gfx_Ctransf.get();
+		case eMouseCursorSimpleType::Load: return GraphicsData.gfx_Cload.get();
+		case eMouseCursorSimpleType::Muni: return GraphicsData.gfx_Cmuni.get();
+		case eMouseCursorSimpleType::Repair: return GraphicsData.gfx_Crepair.get();
+		case eMouseCursorSimpleType::Activate: return GraphicsData.gfx_Cactivate.get();
+		case eMouseCursorSimpleType::MoveDraft: return GraphicsData.gfx_Cmove_draft.get();
 	}
-	return GraphicsData.gfx_Chand.get();
+	throw std::runtime_error ("unreachable");
 }
 
 //------------------------------------------------------------------------------

diff --git a/src/ui/graphical/game/widgets/gamemapwidget.cpp b/src/ui/graphical/game/widgets/gamemapwidget.cpp
@@ -764,7 +764,7 @@ void cGameMapWidget::toggleMouseInputMode (eMouseModeType mouseModeType)
 			case eMouseModeType::SelectBuildPosition:
 			case eMouseModeType::Activate:
 				assert (false);
-			// fall through
+				[[fallthrough]];
 			default:
 			case eMouseModeType::Default:
 				setMouseInputMode (std::make_unique<cMouseModeDefault> (mapView.get(), unitSelection, player.get()));

diff --git a/src/ui/graphical/menu/widgets/special/buildspeedhandlerwidget.cpp b/src/ui/graphical/menu/widgets/special/buildspeedhandlerwidget.cpp
@@ -85,12 +85,11 @@ void cBuildSpeedHandlerWidget::setBuildSpeedIndex (size_t speedIndex)
 }
 
 //------------------------------------------------------------------------------
-size_t cBuildSpeedHandlerWidget::getBuildSpeedIndex()
+size_t cBuildSpeedHandlerWidget::getBuildSpeedIndex() const
 {
 	for (size_t i = 0; i < elementsCount; ++i)
 	{
 		if (buttons[i]->isChecked()) return i;
 	}
-	assert (false);
-	return 0;
+	throw std::runtime_error ("unreachable");
 }
diff --git a/src/ui/graphical/menu/widgets/special/buildspeedhandlerwidget.h b/src/ui/graphical/menu/widgets/special/buildspeedhandlerwidget.h
@@ -39,7 +39,7 @@ class cBuildSpeedHandlerWidget : public cWidget
 	void setValues (const std::array<int, elementsCount>& turns, const std::array<int, elementsCount>& costs);
 
 	void setBuildSpeedIndex (size_t speedIndex);
-	size_t getBuildSpeedIndex();
+	size_t getBuildSpeedIndex() const;
 
 private:
 	std::array<cLabel*, elementsCount> turnLabels;

diff --git a/src/ui/translations.cpp b/src/ui/translations.cpp
@@ -143,8 +143,7 @@ std::string toTranslatedString (eGameSettingsResourceAmount amount)
 		case eGameSettingsResourceAmount::TooMuch:
 			return lngPack.i18n ("Option~TooMuch");
 	}
-	assert (false);
-	return "";
+	throw std::runtime_error ("unreachable");
 }
 
 //------------------------------------------------------------------------------
@@ -161,8 +160,7 @@ std::string toTranslatedString (eGameSettingsResourceDensity density)
 		case eGameSettingsResourceDensity::TooMuch:
 			return lngPack.i18n ("Option~TooMuch");
 	}
-	assert (false);
-	return "";
+	throw std::runtime_error ("unreachable");
 }
 
 //------------------------------------------------------------------------------
@@ -175,8 +173,7 @@ std::string toTranslatedString (eGameSettingsBridgeheadType type)
 		case eGameSettingsBridgeheadType::Mobile:
 			return lngPack.i18n ("Option~Mobile");
 	}
-	assert (false);
-	return "";
+	throw std::runtime_error ("unreachable");
 }
 
 //------------------------------------------------------------------------------
@@ -191,8 +188,7 @@ std::string toTranslatedString (eGameSettingsGameType type)
 		case eGameSettingsGameType::HotSeat:
 			return lngPack.i18n ("Option~Type_HotSeat");
 	}
-	assert (false);
-	return "";
+	throw std::runtime_error ("unreachable");
 }
 
 //------------------------------------------------------------------------------
@@ -207,8 +203,7 @@ std::string toTranslatedString (eGameSettingsVictoryCondition condition, int tur
 		case eGameSettingsVictoryCondition::Death:
 			return lngPack.i18n ("Comp~NoLimit");
 	}
-	assert (false);
-	return "";
+	throw std::runtime_error ("unreachable");
 }
 
 //------------------------------------------------------------------------------