LibC: Convert LengthModifier & ConversionSpecifier to enum classes
These were preventing some AK classes from using the AK Concepts header due to the non-strictly namespaced ConversionSpecifier::Unsigned, and are not used as their underlying value, so enum classes are more appropriate anyways.
This commit is contained in:
Idan Horowitz
Linus Groh
parent
814195b060
commit
3f70efed9c
Notes:
sideshowbarker
2024-07-18 10:27:43 +09:00
Author: https://github.com/IdanHo Commit: https://github.com/SerenityOS/serenity/commit/3f70efed9cc Pull-request: https://github.com/SerenityOS/serenity/pull/8438
1 changed files with 54 additions and 54 deletions
|
|
@ -14,7 +14,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
enum LengthModifier {
|
||||
enum class LengthModifier {
|
||||
None,
|
||||
Default,
|
||||
Char,
|
||||
|
|
@ -27,7 +27,7 @@ enum LengthModifier {
|
|||
LongDouble,
|
||||
};
|
||||
|
||||
enum ConversionSpecifier {
|
||||
enum class ConversionSpecifier {
|
||||
Unspecified,
|
||||
Decimal,
|
||||
Integer,
|
||||
|
|
@ -254,15 +254,15 @@ struct ReadElement {
|
|||
{
|
||||
switch (length_modifier) {
|
||||
default:
|
||||
case None:
|
||||
case LengthModifier::None:
|
||||
VERIFY_NOT_REACHED();
|
||||
case Default:
|
||||
case LengthModifier::Default:
|
||||
return ReadElementConcrete<T, T, kind> {}(input_lexer, ap);
|
||||
case Char:
|
||||
case LengthModifier::Char:
|
||||
return ReadElementConcrete<T, char, kind> {}(input_lexer, ap);
|
||||
case Short:
|
||||
case LengthModifier::Short:
|
||||
return ReadElementConcrete<T, short, kind> {}(input_lexer, ap);
|
||||
case Long:
|
||||
case LengthModifier::Long:
|
||||
if constexpr (IsSame<T, int>)
|
||||
return ReadElementConcrete<T, long, kind> {}(input_lexer, ap);
|
||||
if constexpr (IsSame<T, unsigned>)
|
||||
|
|
@ -270,7 +270,7 @@ struct ReadElement {
|
|||
if constexpr (IsSame<T, float>)
|
||||
return ReadElementConcrete<int, double, kind> {}(input_lexer, ap);
|
||||
return false;
|
||||
case LongLong:
|
||||
case LengthModifier::LongLong:
|
||||
if constexpr (IsSame<T, int>)
|
||||
return ReadElementConcrete<long long, long long, kind> {}(input_lexer, ap);
|
||||
if constexpr (IsSame<T, unsigned>)
|
||||
|
|
@ -278,13 +278,13 @@ struct ReadElement {
|
|||
if constexpr (IsSame<T, float>)
|
||||
return ReadElementConcrete<long long, double, kind> {}(input_lexer, ap);
|
||||
return false;
|
||||
case IntMax:
|
||||
case LengthModifier::IntMax:
|
||||
return ReadElementConcrete<T, intmax_t, kind> {}(input_lexer, ap);
|
||||
case Size:
|
||||
case LengthModifier::Size:
|
||||
return ReadElementConcrete<T, size_t, kind> {}(input_lexer, ap);
|
||||
case PtrDiff:
|
||||
case LengthModifier::PtrDiff:
|
||||
return ReadElementConcrete<T, ptrdiff_t, kind> {}(input_lexer, ap);
|
||||
case LongDouble:
|
||||
case LengthModifier::LongDouble:
|
||||
return ReadElementConcrete<T, long double, kind> {}(input_lexer, ap);
|
||||
}
|
||||
}
|
||||
|
|
@ -420,84 +420,84 @@ extern "C" int vsscanf(const char* input, const char* format, va_list ap)
|
|||
|
||||
bool invert_scanlist = false;
|
||||
StringView scanlist;
|
||||
LengthModifier length_modifier { None };
|
||||
ConversionSpecifier conversion_specifier { Unspecified };
|
||||
LengthModifier length_modifier { LengthModifier::None };
|
||||
ConversionSpecifier conversion_specifier { ConversionSpecifier::Unspecified };
|
||||
reread_lookahead:;
|
||||
auto format_lookahead = format_lexer.peek();
|
||||
if (length_modifier == None) {
|
||||
if (length_modifier == LengthModifier::None) {
|
||||
switch (format_lookahead) {
|
||||
case 'h':
|
||||
if (format_lexer.peek(1) == 'h') {
|
||||
format_lexer.consume(2);
|
||||
length_modifier = Char;
|
||||
length_modifier = LengthModifier::Char;
|
||||
} else {
|
||||
format_lexer.consume(1);
|
||||
length_modifier = Short;
|
||||
length_modifier = LengthModifier::Short;
|
||||
}
|
||||
break;
|
||||
case 'l':
|
||||
if (format_lexer.peek(1) == 'l') {
|
||||
format_lexer.consume(2);
|
||||
length_modifier = LongLong;
|
||||
length_modifier = LengthModifier::LongLong;
|
||||
} else {
|
||||
format_lexer.consume(1);
|
||||
length_modifier = Long;
|
||||
length_modifier = LengthModifier::Long;
|
||||
}
|
||||
break;
|
||||
case 'j':
|
||||
format_lexer.consume();
|
||||
length_modifier = IntMax;
|
||||
length_modifier = LengthModifier::IntMax;
|
||||
break;
|
||||
case 'z':
|
||||
format_lexer.consume();
|
||||
length_modifier = Size;
|
||||
length_modifier = LengthModifier::Size;
|
||||
break;
|
||||
case 't':
|
||||
format_lexer.consume();
|
||||
length_modifier = PtrDiff;
|
||||
length_modifier = LengthModifier::PtrDiff;
|
||||
break;
|
||||
case 'L':
|
||||
format_lexer.consume();
|
||||
length_modifier = LongDouble;
|
||||
length_modifier = LengthModifier::LongDouble;
|
||||
break;
|
||||
default:
|
||||
length_modifier = Default;
|
||||
length_modifier = LengthModifier::Default;
|
||||
break;
|
||||
}
|
||||
goto reread_lookahead;
|
||||
}
|
||||
if (conversion_specifier == Unspecified) {
|
||||
if (conversion_specifier == ConversionSpecifier::Unspecified) {
|
||||
switch (format_lookahead) {
|
||||
case 'd':
|
||||
format_lexer.consume();
|
||||
conversion_specifier = Decimal;
|
||||
conversion_specifier = ConversionSpecifier::Decimal;
|
||||
break;
|
||||
case 'i':
|
||||
format_lexer.consume();
|
||||
conversion_specifier = Integer;
|
||||
conversion_specifier = ConversionSpecifier::Integer;
|
||||
break;
|
||||
case 'o':
|
||||
format_lexer.consume();
|
||||
conversion_specifier = Octal;
|
||||
conversion_specifier = ConversionSpecifier::Octal;
|
||||
break;
|
||||
case 'u':
|
||||
format_lexer.consume();
|
||||
conversion_specifier = Unsigned;
|
||||
conversion_specifier = ConversionSpecifier::Unsigned;
|
||||
break;
|
||||
case 'x':
|
||||
format_lexer.consume();
|
||||
conversion_specifier = Hex;
|
||||
conversion_specifier = ConversionSpecifier::Hex;
|
||||
break;
|
||||
case 'a':
|
||||
case 'e':
|
||||
case 'f':
|
||||
case 'g':
|
||||
format_lexer.consume();
|
||||
conversion_specifier = Floating;
|
||||
conversion_specifier = ConversionSpecifier::Floating;
|
||||
break;
|
||||
case 's':
|
||||
format_lexer.consume();
|
||||
conversion_specifier = String;
|
||||
conversion_specifier = ConversionSpecifier::String;
|
||||
break;
|
||||
case '[':
|
||||
format_lexer.consume();
|
||||
|
|
@ -506,33 +506,33 @@ extern "C" int vsscanf(const char* input, const char* format, va_list ap)
|
|||
scanlist = scanlist.substring_view(1);
|
||||
invert_scanlist = true;
|
||||
}
|
||||
conversion_specifier = UseScanList;
|
||||
conversion_specifier = ConversionSpecifier::UseScanList;
|
||||
break;
|
||||
case 'c':
|
||||
format_lexer.consume();
|
||||
conversion_specifier = Character;
|
||||
conversion_specifier = ConversionSpecifier::Character;
|
||||
break;
|
||||
case 'p':
|
||||
format_lexer.consume();
|
||||
conversion_specifier = Pointer;
|
||||
conversion_specifier = ConversionSpecifier::Pointer;
|
||||
break;
|
||||
case 'n':
|
||||
format_lexer.consume();
|
||||
conversion_specifier = OutputNumberOfBytes;
|
||||
conversion_specifier = ConversionSpecifier::OutputNumberOfBytes;
|
||||
break;
|
||||
case 'C':
|
||||
format_lexer.consume();
|
||||
length_modifier = Long;
|
||||
conversion_specifier = Character;
|
||||
length_modifier = LengthModifier::Long;
|
||||
conversion_specifier = ConversionSpecifier::Character;
|
||||
break;
|
||||
case 'S':
|
||||
format_lexer.consume();
|
||||
length_modifier = Long;
|
||||
conversion_specifier = String;
|
||||
length_modifier = LengthModifier::Long;
|
||||
conversion_specifier = ConversionSpecifier::String;
|
||||
break;
|
||||
default:
|
||||
format_lexer.consume();
|
||||
conversion_specifier = Invalid;
|
||||
conversion_specifier = ConversionSpecifier::Invalid;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -541,73 +541,73 @@ extern "C" int vsscanf(const char* input, const char* format, va_list ap)
|
|||
|
||||
// Now try to read.
|
||||
switch (conversion_specifier) {
|
||||
case Invalid:
|
||||
case Unspecified:
|
||||
case ConversionSpecifier::Invalid:
|
||||
case ConversionSpecifier::Unspecified:
|
||||
default:
|
||||
// "undefined behaviour", let's be nice and crash.
|
||||
dbgln("Invalid conversion specifier {} in scanf!", (int)conversion_specifier);
|
||||
VERIFY_NOT_REACHED();
|
||||
case Decimal:
|
||||
case ConversionSpecifier::Decimal:
|
||||
if (!ReadElement<int, ReadKind::Normal> {}(length_modifier, input_lexer, ap_or_null))
|
||||
format_lexer.consume_all();
|
||||
else
|
||||
++elements_matched;
|
||||
break;
|
||||
case Integer:
|
||||
case ConversionSpecifier::Integer:
|
||||
if (!ReadElement<int, ReadKind::Infer> {}(length_modifier, input_lexer, ap_or_null))
|
||||
format_lexer.consume_all();
|
||||
else
|
||||
++elements_matched;
|
||||
break;
|
||||
case Octal:
|
||||
case ConversionSpecifier::Octal:
|
||||
if (!ReadElement<unsigned, ReadKind::Octal> {}(length_modifier, input_lexer, ap_or_null))
|
||||
format_lexer.consume_all();
|
||||
else
|
||||
++elements_matched;
|
||||
break;
|
||||
case Unsigned:
|
||||
case ConversionSpecifier::Unsigned:
|
||||
if (!ReadElement<unsigned, ReadKind::Normal> {}(length_modifier, input_lexer, ap_or_null))
|
||||
format_lexer.consume_all();
|
||||
else
|
||||
++elements_matched;
|
||||
break;
|
||||
case Hex:
|
||||
case ConversionSpecifier::Hex:
|
||||
if (!ReadElement<unsigned, ReadKind::Hex> {}(length_modifier, input_lexer, ap_or_null))
|
||||
format_lexer.consume_all();
|
||||
else
|
||||
++elements_matched;
|
||||
break;
|
||||
case Floating:
|
||||
case ConversionSpecifier::Floating:
|
||||
if (!ReadElement<float, ReadKind::Normal> {}(length_modifier, input_lexer, ap_or_null))
|
||||
format_lexer.consume_all();
|
||||
else
|
||||
++elements_matched;
|
||||
break;
|
||||
case String:
|
||||
case ConversionSpecifier::String:
|
||||
if (!ReadElement<char*, ReadKind::Normal> {}(length_modifier, input_lexer, ap_or_null))
|
||||
format_lexer.consume_all();
|
||||
else
|
||||
++elements_matched;
|
||||
break;
|
||||
case UseScanList:
|
||||
case ConversionSpecifier::UseScanList:
|
||||
if (!ReadElement<char*, ReadKind::Normal> { scanlist, invert_scanlist }(length_modifier, input_lexer, ap_or_null))
|
||||
format_lexer.consume_all();
|
||||
else
|
||||
++elements_matched;
|
||||
break;
|
||||
case Character:
|
||||
case ConversionSpecifier::Character:
|
||||
if (!ReadElement<char, ReadKind::Normal> {}(length_modifier, input_lexer, ap_or_null))
|
||||
format_lexer.consume_all();
|
||||
else
|
||||
++elements_matched;
|
||||
break;
|
||||
case Pointer:
|
||||
case ConversionSpecifier::Pointer:
|
||||
if (!ReadElement<void*, ReadKind::Normal> {}(length_modifier, input_lexer, ap_or_null))
|
||||
format_lexer.consume_all();
|
||||
else
|
||||
++elements_matched;
|
||||
break;
|
||||
case OutputNumberOfBytes: {
|
||||
case ConversionSpecifier::OutputNumberOfBytes: {
|
||||
if (!suppress_assignment) {
|
||||
auto* ptr = va_arg(ap, int*);
|
||||
*ptr = input_lexer.tell();
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue