diff --git a/Userland/Libraries/LibC/scanf.cpp b/Userland/Libraries/LibC/scanf.cpp index 964f219d72..9676388e43 100644 --- a/Userland/Libraries/LibC/scanf.cpp +++ b/Userland/Libraries/LibC/scanf.cpp @@ -71,7 +71,7 @@ enum class ReadKind { }; template -struct read_element_concrete { +struct ReadElementConcrete { bool operator()(GenericLexer&, va_list) { return false; @@ -79,7 +79,7 @@ struct read_element_concrete { }; template -struct read_element_concrete { +struct ReadElementConcrete { bool operator()(GenericLexer& lexer, va_list* ap) { lexer.ignore_while(isspace); @@ -113,7 +113,7 @@ struct read_element_concrete { }; template -struct read_element_concrete { +struct ReadElementConcrete { bool operator()(GenericLexer& lexer, va_list* ap) { static_assert(kind == ReadKind::Normal, "Can't read a non-normal character"); @@ -130,7 +130,7 @@ struct read_element_concrete { }; template -struct read_element_concrete { +struct ReadElementConcrete { bool operator()(GenericLexer& lexer, va_list* ap) { lexer.ignore_while(isspace); @@ -164,7 +164,7 @@ struct read_element_concrete { }; template -struct read_element_concrete { +struct ReadElementConcrete { bool operator()(GenericLexer& lexer, va_list* ap) { lexer.ignore_while(isspace); @@ -198,7 +198,7 @@ struct read_element_concrete { }; template -struct read_element_concrete { +struct ReadElementConcrete { bool operator()(GenericLexer& lexer, va_list* ap) { lexer.ignore_while(isspace); @@ -232,7 +232,7 @@ struct read_element_concrete { }; template -struct read_element_concrete { +struct ReadElementConcrete { bool operator()(GenericLexer& lexer, va_list* ap) { lexer.ignore_while(isspace); @@ -263,7 +263,7 @@ struct read_element_concrete { }; template -struct read_element { +struct ReadElement { bool operator()(LengthModifier length_modifier, GenericLexer& input_lexer, va_list* ap) { switch (length_modifier) { @@ -271,42 +271,42 @@ struct read_element { case None: VERIFY_NOT_REACHED(); case Default: - return read_element_concrete {}(input_lexer, ap); + return ReadElementConcrete {}(input_lexer, ap); case Char: - return read_element_concrete {}(input_lexer, ap); + return ReadElementConcrete {}(input_lexer, ap); case Short: - return read_element_concrete {}(input_lexer, ap); + return ReadElementConcrete {}(input_lexer, ap); case Long: if constexpr (IsSame::value) - return read_element_concrete {}(input_lexer, ap); + return ReadElementConcrete {}(input_lexer, ap); if constexpr (IsSame::value) - return read_element_concrete {}(input_lexer, ap); + return ReadElementConcrete {}(input_lexer, ap); if constexpr (IsSame::value) - return read_element_concrete {}(input_lexer, ap); + return ReadElementConcrete {}(input_lexer, ap); return false; case LongLong: if constexpr (IsSame::value) - return read_element_concrete {}(input_lexer, ap); + return ReadElementConcrete {}(input_lexer, ap); if constexpr (IsSame::value) - return read_element_concrete {}(input_lexer, ap); + return ReadElementConcrete {}(input_lexer, ap); if constexpr (IsSame::value) - return read_element_concrete {}(input_lexer, ap); + return ReadElementConcrete {}(input_lexer, ap); return false; case IntMax: - return read_element_concrete {}(input_lexer, ap); + return ReadElementConcrete {}(input_lexer, ap); case Size: - return read_element_concrete {}(input_lexer, ap); + return ReadElementConcrete {}(input_lexer, ap); case PtrDiff: - return read_element_concrete {}(input_lexer, ap); + return ReadElementConcrete {}(input_lexer, ap); case LongDouble: - return read_element_concrete {}(input_lexer, ap); + return ReadElementConcrete {}(input_lexer, ap); } } }; template<> -struct read_element { - read_element(StringView scan_set = {}, bool invert = false) +struct ReadElement { + ReadElement(StringView scan_set = {}, bool invert = false) : scan_set(scan_set.is_null() ? " \t\n\f\r" : scan_set) , invert(scan_set.is_null() ? true : invert) , was_null(scan_set.is_null()) @@ -345,7 +345,7 @@ private: }; template<> -struct read_element { +struct ReadElement { bool operator()(LengthModifier length_modifier, GenericLexer& input_lexer, va_list* ap) { if (length_modifier != LengthModifier::Default) @@ -554,61 +554,61 @@ extern "C" int vsscanf(const char* input, const char* format, va_list ap) dbgln("Invalid conversion specifier {} in scanf!", (int)conversion_specifier); VERIFY_NOT_REACHED(); case Decimal: - if (!read_element {}(length_modifier, input_lexer, (va_list*)&ap)) + if (!ReadElement {}(length_modifier, input_lexer, (va_list*)&ap)) format_lexer.consume_all(); else ++elements_matched; break; case Integer: - if (!read_element {}(length_modifier, input_lexer, (va_list*)&ap)) + if (!ReadElement {}(length_modifier, input_lexer, (va_list*)&ap)) format_lexer.consume_all(); else ++elements_matched; break; case Octal: - if (!read_element {}(length_modifier, input_lexer, (va_list*)&ap)) + if (!ReadElement {}(length_modifier, input_lexer, (va_list*)&ap)) format_lexer.consume_all(); else ++elements_matched; break; case Unsigned: - if (!read_element {}(length_modifier, input_lexer, (va_list*)&ap)) + if (!ReadElement {}(length_modifier, input_lexer, (va_list*)&ap)) format_lexer.consume_all(); else ++elements_matched; break; case Hex: - if (!read_element {}(length_modifier, input_lexer, (va_list*)&ap)) + if (!ReadElement {}(length_modifier, input_lexer, (va_list*)&ap)) format_lexer.consume_all(); else ++elements_matched; break; case Floating: - if (!read_element {}(length_modifier, input_lexer, (va_list*)&ap)) + if (!ReadElement {}(length_modifier, input_lexer, (va_list*)&ap)) format_lexer.consume_all(); else ++elements_matched; break; case String: - if (!read_element {}(length_modifier, input_lexer, (va_list*)&ap)) + if (!ReadElement {}(length_modifier, input_lexer, (va_list*)&ap)) format_lexer.consume_all(); else ++elements_matched; break; case UseScanList: - if (!read_element { scanlist, invert_scanlist }(length_modifier, input_lexer, (va_list*)&ap)) + if (!ReadElement { scanlist, invert_scanlist }(length_modifier, input_lexer, (va_list*)&ap)) format_lexer.consume_all(); else ++elements_matched; break; case Character: - if (!read_element {}(length_modifier, input_lexer, (va_list*)&ap)) + if (!ReadElement {}(length_modifier, input_lexer, (va_list*)&ap)) format_lexer.consume_all(); else ++elements_matched; break; case Pointer: - if (!read_element {}(length_modifier, input_lexer, (va_list*)&ap)) + if (!ReadElement {}(length_modifier, input_lexer, (va_list*)&ap)) format_lexer.consume_all(); else ++elements_matched;