[cleanup] Add toNumber.h utilities to convert std::string_view to `…

…int`

Replace `atoi`/`stoi` by `toInt`.

src/dedicatedserver/dedicatedserver.cpp

@@ -23,6 +23,7 @@
 #include "defines.h"
 #include "settings.h"
 #include "utility/listhelpers.h"
+#include "utility/string/toNumber.h"
 #include "utility/os.h"
 
 #include <algorithm>
@@ -170,7 +171,14 @@ bool cDedicatedServer::handleInput (const std::string& command)
 	else if (tokens.at (0) == "loadGame")
 	{
 		if (tokens.size() == 2)
-			startServer (atoi (tokens.at (1).c_str()));
+			if (auto n = toInt (tokens.at (1)))
+			{
+				startServer (*n);
+			}
+			else
+			{
+				std::cout << "Not a number: " << std::quoted (tokens.at (1)) << std::endl;
+			}
 		else
 		{
 			std::cout << "No savegame number given. Trying to load auto save (savegame number " << kAutoSaveSlot << ")." << std::endl;
@@ -181,7 +189,16 @@ bool cDedicatedServer::handleInput (const std::string& command)
 	{
 		// TODO: select game, currently apply to first game
 		if (tokens.size() == 2)
-			saveGame (atoi (tokens.at (1).c_str()));
+		{
+			if (auto n = toInt (tokens.at (1)))
+			{
+				saveGame (*n);
+			}
+			else
+			{
+				std::cout << "Not a number: " << std::quoted (tokens.at (1)) << std::endl;
+			}
+		}
 		else
 			printHelpWrongArguments();
 	}
@@ -265,7 +282,7 @@ void cDedicatedServer::setProperty (const std::string& property, const std::stri
 {
 	if (property == "port")
 	{
-		int newPort = atoi (value.c_str());
+		int newPort = toInt (value).value_or (DEFAULTPORT);
 		if (newPort < 0 || newPort >= 65536)
 			newPort = DEFAULTPORT;
 		port = newPort;

src/lib/chatcommand/chatcommandarguments.cpp

@@ -21,6 +21,7 @@
 
 #include "game/logic/client.h"
 #include "game/logic/server.h"
+#include "utility/string/toNumber.h"
 
 #include <algorithm>
 #include <cassert>
@@ -329,26 +330,7 @@ size_t cChatCommandArgumentServerPlayer::parse (const std::string& command, size
 
 	const auto nextWordLength = getNextWordLength (command, position);
 
-	std::optional<int> playerNumber;
-	try
-	{
-		size_t pos{};
-		playerNumber = std::stoi (command.substr (position, nextWordLength), &pos);
-		if (pos != nextWordLength)
-		{
-			playerNumber.reset();
-		}
-	}
-	catch (const std::invalid_argument&)
-	{
-		playerNumber.reset();
-	}
-	catch (const std::out_of_range&)
-	{
-		// TODO: translate
-		throw std::runtime_error ("Invalid player number");
-	}
-	if (playerNumber)
+	if (const std::optional<int> playerNumber = toInt (command.substr (position, nextWordLength)))
 	{
 		try
 		{
@@ -419,27 +401,7 @@ size_t cChatCommandArgumentClientPlayer::parse (const std::string& command, size
 
 	const auto nextWordLength = getNextWordLength (command, position);
 
-	std::optional<int> playerNumber;
-	try
-	{
-		size_t pos{};
-		playerNumber = std::stoi (command.substr (position, nextWordLength), &pos);
-		if (pos != nextWordLength)
-		{
-			playerNumber.reset();
-		}
-	}
-	catch (const std::invalid_argument&)
-	{
-		playerNumber.reset();
-	}
-	catch (const std::out_of_range&)
-	{
-		// TODO: translate
-		throw std::runtime_error ("Invalid player number");
-	}
-
-	if (playerNumber)
+	if (const std::optional<int> playerNumber = toInt (command.substr (position, nextWordLength)))
 	{
 		value = activeClientPointer->getModel().getPlayer (*playerNumber);
 		if (value == nullptr)

src/lib/chatcommand/chatcommandarguments.h

@@ -29,6 +29,8 @@
 #include <string>
 #include <vector>
 
+#include "utility/string/toNumber.h"
+
 size_t getNextWordLength (const std::string& s, size_t position);
 
 class cPlayer;
@@ -208,21 +210,7 @@ size_t cChatCommandArgumentInt<T>::parse (const std::string& command, size_t pos
 {
 	const auto nextWordLength = getNextWordLength (command, position);
 
-	std::optional<long long> longValue;
-	try
-	{
-		size_t pos{};
-		longValue = std::stoll (command.substr (position, nextWordLength), &pos);
-		if (pos != nextWordLength)
-		{
-			longValue.reset();
-		}
-	}
-	catch (const std::exception&)
-	{
-		longValue.reset();
-	}
-
+	std::optional<long long> longValue = toLongLong (command.substr (position, nextWordLength));
 	if (longValue && (*longValue < static_cast<long long> (std::numeric_limits<ValueType>::min()) || *longValue > static_cast<long long> (std::numeric_limits<ValueType>::max())))
 	{
 		longValue.reset();

src/lib/game/data/model.cpp

@@ -35,6 +35,7 @@
 #include "utility/crc.h"
 #include "utility/listhelpers.h"
 #include "utility/ranges.h"
+#include "utility/string/toNumber.h"
 
 #include <cassert>
 #include <set>
@@ -151,10 +152,9 @@ const cPlayer* cModel::getPlayer (int playerNr) const
 const cPlayer* cModel::getPlayer (std::string playerName) const
 {
 	// first try to find player by number
-	const int playerNr = atoi (playerName.c_str());
-	if (playerNr != 0 || playerName == "0")
+	if (const auto playerNr = toInt (playerName))
 	{
-		return getPlayer (playerNr);
+		return getPlayer (*playerNr);
 	}
 
 	// try to find player by name

src/lib/game/data/savegame.cpp

@@ -33,6 +33,7 @@
 #include "utility/ranges.h"
 #include "utility/serialization/jsonarchive.h"
 #include "utility/serialization/serialization.h"
+#include "utility/string/toNumber.h"
 
 #include <filesystem>
 #include <optional>
@@ -292,7 +293,7 @@ void fillSaveGames (std::size_t minIndex, std::size_t maxIndex, std::vector<cSav
 		std::string filename = filepath.string();
 		std::smatch match;
 		if (!std::regex_match (filename, match, savename_regex)) continue;
-		const std::size_t number = atoi (match[1].str().c_str());
+		const std::size_t number = toInt (match[1].str()).value_or (0);
 
 		if (number <= minIndex || number > maxIndex) continue;
 

src/lib/resources/loaddata.cpp

@@ -45,6 +45,7 @@
 #include "utility/listhelpers.h"
 #include "utility/log.h"
 #include "utility/serialization/jsonarchive.h"
+#include "utility/string/toNumber.h"
 
 #include <SDL_mixer.h>
 #include <filesystem>
@@ -118,7 +119,7 @@ void debugTranslationSize (const cLanguage& language, const cUnicodeFont& font)
 
 		if (std::regex_match (key, res, reg))
 		{
-			std::size_t maxSize = std::stoi (res[1]);
+			std::size_t maxSize = toInt (std::string (res[1])).value();
 			const char referenceLetter = 'a';
 
 			if (font.getTextWide (std::string (maxSize, referenceLetter)) < font.getTextWide (translatedText))

src/lib/utility/string/toNumber.h

@@ -0,0 +1,65 @@
+/***************************************************************************
+*      Mechanized Assault and Exploration Reloaded Projectfile            *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU General Public License     *
+*   along with this program; if not, write to the                         *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
+
+#ifndef utility_string_toNumberH
+#define utility_string_toNumberH
+
+#include <charconv>
+#include <optional>
+#include <string_view>
+
+template <typename T>
+std::pair<std::optional<T>, std::size_t> parseIntegerT (std::string_view s)
+{
+	static_assert (std::is_integral_v <T>);
+	T n;
+	const auto [ptr, ec] = std::from_chars (s.data(), s.data() + s.size(), n);
+	if (ec != std::errc{})
+	{
+		return {std::nullopt, ptr - s.data()};
+	}
+	return {n, ptr - s.data()};
+}
+
+//------------------------------------------------------------------------------
+template <typename T>
+std::optional<T> toIntegerT (std::string_view s)
+{
+	const auto [res, offset] = parseIntegerT<T> (s);
+	if (offset != s.size())
+	{
+		return std::nullopt;
+	}
+	return res;
+}
+
+//------------------------------------------------------------------------------
+inline std::optional<int> toInt (std::string_view s)
+{
+	return toIntegerT<int> (s);
+}
+
+//------------------------------------------------------------------------------
+inline std::optional<long long> toLongLong (std::string_view s)
+{
+	return toIntegerT<long long> (s);
+}
+
+
+#endif // utility_string_toNumberH

src/lib/utility/version.cpp

@@ -19,6 +19,8 @@
 
 #include "utility/version.h"
 
+#include "utility/string/toNumber.h"
+
 #ifdef major
 # undef major
 #endif
@@ -82,7 +84,7 @@ void cVersion::parseFromString (const std::string& string)
 	// NOTE: do we need this to be more robust?
 
 	auto firstDotPos = string.find_first_of (".");
-	major = atoi (string.substr (0, firstDotPos).c_str());
+	major = toInt (string.substr (0, firstDotPos)).value_or (0);
 
 	if (firstDotPos == std::string::npos)
 	{
@@ -92,15 +94,15 @@ void cVersion::parseFromString (const std::string& string)
 	else
 	{
 		auto secondDotPos = string.find_first_of (".", firstDotPos + 1);
-		minor = atoi (string.substr (firstDotPos + 1, secondDotPos).c_str());
+		minor = toInt (string.substr (firstDotPos + 1, secondDotPos)).value_or (0);
 
 		if (secondDotPos == std::string::npos)
 		{
 			revision = 0;
 		}
 		else
 		{
-			revision = atoi (string.substr (secondDotPos + 1).c_str());
+			revision = toInt (string.substr (secondDotPos + 1)).value_or (0);
 		}
 	}
 }

src/ui/graphical/menu/dialogs/dialogcolorpicker.cpp

@@ -31,6 +31,7 @@
 #include "ui/widgets/validators/validatorint.h"
 #include "utility/language.h"
 #include "utility/narrow_cast.h"
+#include "utility/string/toNumber.h"
 
 //------------------------------------------------------------------------------
 cDialogColorPicker::cDialogColorPicker (const cRgbColor& color, eWindowBackgrounds backgroundType) :
@@ -81,23 +82,23 @@ cDialogColorPicker::cDialogColorPicker (const cRgbColor& color, eWindowBackgroun
 	});
 	signalConnectionManager.connect (redValueLineEdit->editingFinished, [this] (eValidatorState) {
 		const auto color = colorPicker->getSelectedColor();
-		const auto newRed = narrow_cast<unsigned char> (atoi (redValueLineEdit->getText().c_str()));
+		const auto newRed = narrow_cast<unsigned char> (toInt (redValueLineEdit->getText()).value_or (color.r));
 		if (newRed != color.r)
 		{
 			colorPicker->setSelectedColor (color.exchangeRed (newRed));
 		}
 	});
 	signalConnectionManager.connect (greenValueLineEdit->editingFinished, [this] (eValidatorState) {
 		const auto color = colorPicker->getSelectedColor();
-		const auto newGreen = narrow_cast<unsigned char> (atoi (greenValueLineEdit->getText().c_str()));
+		const auto newGreen = narrow_cast<unsigned char> (toInt (greenValueLineEdit->getText()).value_or (color.g));
 		if (newGreen != color.g)
 		{
 			colorPicker->setSelectedColor (color.exchangeGreen (newGreen));
 		}
 	});
 	signalConnectionManager.connect (blueValueLineEdit->editingFinished, [this] (eValidatorState) {
 		const auto color = colorPicker->getSelectedColor();
-		const auto newBlue = narrow_cast<unsigned char> (atoi (blueValueLineEdit->getText().c_str()));
+		const auto newBlue = narrow_cast<unsigned char> (toInt (blueValueLineEdit->getText()).value_or (color.b));
 		if (newBlue != color.b)
 		{
 			colorPicker->setSelectedColor (color.exchangeBlue (newBlue));

src/ui/graphical/menu/dialogs/dialogpreferences.cpp

@@ -37,6 +37,7 @@
 #include "ui/widgets/validators/validatorint.h"
 #include "utility/language.h"
 #include "utility/string/iequals.h"
+#include "utility/string/toNumber.h"
 
 #include <SDL_mixer.h>
 #include <functional>
@@ -253,8 +254,8 @@ void cDialogPreferences::saveValues()
 
 	const auto& resolutionText = resolutionsComboBox->getSelectedText();
 
-	const auto newResolutionX = atoi (resolutionText.substr (0, resolutionText.find ("x")).c_str());
-	const auto newResolutionY = atoi (resolutionText.substr (resolutionText.find ("x") + 1).c_str());
+	const auto newResolutionX = toInt (resolutionText.substr (0, resolutionText.find ("x"))).value_or (0);
+	const auto newResolutionY = toInt (resolutionText.substr (resolutionText.find ("x") + 1)).value_or (0);
 
 	if (newResolutionX > 0 && newResolutionY > 0)
 	{

src/ui/graphical/menu/windows/windowgamesettings/windowgamesettings.cpp

@@ -33,6 +33,7 @@
 #include "ui/widgets/validators/validatorint.h"
 #include "utility/language.h"
 #include "utility/narrow_cast.h"
+#include "utility/string/toNumber.h"
 
 namespace
 {
@@ -331,12 +332,12 @@ cGameSettings cWindowGameSettings::getGameSettings() const
 	{
 		case eGameSettingsVictoryCondition::Points:
 		{
-			gameSettings.victoryPoints = (victoryCount == custom ? stoi (customVictoryPointsCheckBox->getText()) : victoryCount);
+			gameSettings.victoryPoints = (victoryCount == custom ? toInt (customVictoryPointsCheckBox->getText()).value_or (0) : victoryCount);
 			break;
 		}
 		case eGameSettingsVictoryCondition::Turns:
 		{
-			gameSettings.victoryTurns = (victoryCount == custom ? stoi (customVictoryTurnsCheckBox->getText()) : victoryCount);
+			gameSettings.victoryTurns = (victoryCount == custom ? toInt (customVictoryTurnsCheckBox->getText()).value_or (0) : victoryCount);
 			break;
 		}
 		case eGameSettingsVictoryCondition::Death: break;
@@ -345,15 +346,15 @@ cGameSettings cWindowGameSettings::getGameSettings() const
 	gameSettings.turnLimitActive = true;
 	switch (*turnLimitGroup->getSelectedValue())
 	{
-		case custom: gameSettings.turnLimit = std::chrono::seconds (atoi (customTurnLimitCheckBox->getText().c_str())); break;
+		case custom: gameSettings.turnLimit = std::chrono::seconds (toInt (customTurnLimitCheckBox->getText()).value_or (0)); break;
 		case unlimited: gameSettings.turnLimitActive = false; break;
 		default: gameSettings.turnLimit = std::chrono::seconds (*turnLimitGroup->getSelectedValue()); break;
 	}
 
 	gameSettings.turnEndDeadlineActive = true;
 	switch (*endTurnDeadlineGroup->getSelectedValue())
 	{
-		case custom: gameSettings.turnEndDeadline = std::chrono::seconds (atoi (customEndTurnDeadlineCheckBox->getText().c_str())); break;
+		case custom: gameSettings.turnEndDeadline = std::chrono::seconds (toInt (customEndTurnDeadlineCheckBox->getText()).value_or (0)); break;
 		case unlimited: gameSettings.turnEndDeadlineActive = false; break;
 		default: gameSettings.turnEndDeadline = std::chrono::seconds (*endTurnDeadlineGroup->getSelectedValue()); break;
 	}