mirror of https://github.com/OpenTTD/OpenTTD
Codefix: Codestyle consistency fixes. (#14008)
parent
03ed59a004
commit
fa0814e257
|
@ -53,7 +53,7 @@ public:
|
|||
/**
|
||||
* Append integer 'value' in given number 'base'.
|
||||
*/
|
||||
template<class T>
|
||||
template <class T>
|
||||
void PutIntegerBase(T value, int base)
|
||||
{
|
||||
std::array<char, 32> buf;
|
||||
|
@ -67,8 +67,7 @@ public:
|
|||
/**
|
||||
* Compose data into a growing std::string.
|
||||
*/
|
||||
class StringBuilder final : public BaseStringBuilder
|
||||
{
|
||||
class StringBuilder final : public BaseStringBuilder {
|
||||
std::string *dest;
|
||||
public:
|
||||
/**
|
||||
|
|
|
@ -800,7 +800,7 @@ public:
|
|||
void SkipUntilUtf8(char32_t c, SeparatorUsage sep);
|
||||
|
||||
private:
|
||||
template<class T>
|
||||
template <class T>
|
||||
[[nodiscard]] static std::pair<size_type, T> ParseIntegerBase(std::string_view src, int base, bool log_errors)
|
||||
{
|
||||
if (base == 0) {
|
||||
|
@ -850,7 +850,7 @@ public:
|
|||
* @return Length of string match, and parsed value.
|
||||
* @note The parser rejects leading whitespace and unary plus.
|
||||
*/
|
||||
template<class T>
|
||||
template <class T>
|
||||
[[nodiscard]] std::pair<size_type, T> PeekIntegerBase(int base) const
|
||||
{
|
||||
return ParseIntegerBase<T>(this->src.substr(this->position), base, false);
|
||||
|
@ -861,7 +861,7 @@ public:
|
|||
* @return Parsed value, if valid.
|
||||
* @note The parser rejects leading whitespace and unary plus.
|
||||
*/
|
||||
template<class T>
|
||||
template <class T>
|
||||
[[nodiscard]] std::optional<T> TryReadIntegerBase(int base)
|
||||
{
|
||||
auto [len, value] = this->PeekIntegerBase<T>(base);
|
||||
|
@ -876,7 +876,7 @@ public:
|
|||
* @note The reader is advanced, even if no valid data was present.
|
||||
* @note The parser rejects leading whitespace and unary plus.
|
||||
*/
|
||||
template<class T>
|
||||
template <class T>
|
||||
[[nodiscard]] T ReadIntegerBase(int base, T def = 0)
|
||||
{
|
||||
auto [len, value] = ParseIntegerBase<T>(this->src.substr(this->position), base, true);
|
||||
|
|
|
@ -18,8 +18,7 @@
|
|||
/**
|
||||
* Builder implementation for InPlaceReplacement.
|
||||
*/
|
||||
class InPlaceBuilder final : public BaseStringBuilder
|
||||
{
|
||||
class InPlaceBuilder final : public BaseStringBuilder {
|
||||
std::span<char> dest;
|
||||
size_type position = 0;
|
||||
const StringConsumer &consumer;
|
||||
|
@ -90,8 +89,7 @@ public:
|
|||
* - The Builder writes data to the buffer, replacing already consumed data.
|
||||
* - The Builder asserts, if it overtakes the consumer.
|
||||
*/
|
||||
class InPlaceReplacement
|
||||
{
|
||||
class InPlaceReplacement {
|
||||
public:
|
||||
StringConsumer consumer; ///< Consumer from shared buffer
|
||||
InPlaceBuilder builder; ///< Builder into shared buffer
|
||||
|
|
|
@ -117,7 +117,7 @@ static bool IsSccEncodedCode(char32_t c)
|
|||
* @param consumer The string to validate.
|
||||
* @param settings The settings for the string validation.
|
||||
*/
|
||||
template<class Builder>
|
||||
template <class Builder>
|
||||
static void StrMakeValid(Builder &builder, StringConsumer &consumer, StringValidationSettings settings)
|
||||
{
|
||||
/* Assume the ABSOLUTE WORST to be in str as it comes from the outside. */
|
||||
|
|
Loading…
Reference in New Issue