mirror of
https://github.com/gbdev/rgbds.git
synced 2026-06-10 02:32:34 +00:00
Use templates to reduce the redundant number-lexing functions (#1963)
This commit is contained in:
Rangi
GitHub
+53
-120
@@ -526,7 +526,8 @@ static int peek();
|
||||
static void shiftChar();
|
||||
static int bumpChar();
|
||||
static int nextChar();
|
||||
static uint32_t readDecimalNumber(int initial);
|
||||
template<uint32_t Base>
|
||||
static uint32_t readNumber(int initial, char const *prefix);
|
||||
|
||||
static uint32_t readBracketedMacroArgNum() {
|
||||
bool enableExpansions = lexerState->enableExpansions;
|
||||
@@ -543,8 +544,8 @@ static uint32_t readBracketedMacroArgNum() {
|
||||
c = nextChar();
|
||||
}
|
||||
|
||||
if (isDigit(c)) {
|
||||
uint32_t n = readDecimalNumber(bumpChar());
|
||||
if (isDigit<10>(c)) {
|
||||
uint32_t n = readNumber<10>(bumpChar(), nullptr);
|
||||
if (n > INT32_MAX) {
|
||||
error("Number in bracketed macro argument is too large");
|
||||
return 0;
|
||||
@@ -968,7 +969,7 @@ static std::tuple<uint32_t, uint32_t, bool> readFractionDigits() {
|
||||
if (c == '_') {
|
||||
checkDigitSeparator(prevWasSeparator, "fixed-point");
|
||||
prevWasSeparator = true;
|
||||
} else if (isDigit(c)) {
|
||||
} else if (isDigit<10>(c)) {
|
||||
prevWasSeparator = false;
|
||||
int digit = c - '0';
|
||||
if (dividend > (UINT32_MAX - digit) / 10 || divisor > UINT32_MAX / 10) {
|
||||
@@ -976,7 +977,7 @@ static std::tuple<uint32_t, uint32_t, bool> readFractionDigits() {
|
||||
WARNING_LARGE_CONSTANT, "Fixed-point constant has too many fractional digits"
|
||||
);
|
||||
// Discard any additional digits
|
||||
for (int d = peek(); isDigit(d) || d == '_'; c = d, d = nextChar()) {}
|
||||
for (int d = peek(); isDigit<10>(d) || d == '_'; c = d, d = nextChar()) {}
|
||||
return {dividend, divisor, c == '_'};
|
||||
}
|
||||
dividend = dividend * 10 + digit;
|
||||
@@ -998,12 +999,12 @@ static uint8_t readPrecisionSuffix() {
|
||||
bool empty = true;
|
||||
|
||||
// '_' is not allowed after 'q'/'Q'
|
||||
for (int c = peek(); isDigit(c); c = nextChar()) {
|
||||
for (int c = peek(); isDigit<10>(c); c = nextChar()) {
|
||||
empty = false;
|
||||
int digit = c - '0';
|
||||
if (precision > (UINT8_MAX - digit) / 10) {
|
||||
// Discard any additional digits
|
||||
skipChars(isDigit);
|
||||
skipChars(isDigit<10>);
|
||||
// Return an invalid precision to cause a subsequent error, which is checked afterwards
|
||||
// to cover the default `options.fixPrecision` as well, just in case
|
||||
return UINT8_MAX;
|
||||
@@ -1051,8 +1052,13 @@ static bool isValidDigit(char c) {
|
||||
return isAlphanumeric(c) || c == '.' || c == '#' || c == '@';
|
||||
}
|
||||
|
||||
static bool isCustomBinDigit(int c) {
|
||||
return isBinDigit(c) || c == options.binDigits[0] || c == options.binDigits[1];
|
||||
static bool isAsmBinDigit(int c) {
|
||||
return isDigit<2>(c) || c == options.binDigits[0] || c == options.binDigits[1];
|
||||
}
|
||||
|
||||
static uint8_t parseAsmBinDigit(int c) {
|
||||
assume(isAsmBinDigit(c));
|
||||
return c == '1' || c == options.binDigits[1]; // Returns 0 or 1
|
||||
}
|
||||
|
||||
static bool checkDigitErrors(char const *digits, size_t n, char const *type) {
|
||||
@@ -1092,45 +1098,35 @@ void lexer_SetGfxDigits(char const digits[4]) {
|
||||
}
|
||||
}
|
||||
|
||||
static uint32_t readBinaryNumber(char const *prefix) {
|
||||
uint32_t number = 0;
|
||||
bool empty = true;
|
||||
bool prevWasSeparator = false;
|
||||
|
||||
for (int c = peek();; c = nextChar()) {
|
||||
if (c == '_') {
|
||||
checkDigitSeparator(prevWasSeparator, "integer");
|
||||
prevWasSeparator = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
int bit;
|
||||
if (c == '0' || c == options.binDigits[0]) {
|
||||
bit = 0;
|
||||
} else if (c == '1' || c == options.binDigits[1]) {
|
||||
bit = 1;
|
||||
template<uint32_t Base>
|
||||
static uint32_t readNumber(int initial, char const *prefix) {
|
||||
auto isSomeDigit = [](int c) {
|
||||
if constexpr (Base == 2) {
|
||||
return isAsmBinDigit(c);
|
||||
} else {
|
||||
break;
|
||||
return isDigit<Base>(c);
|
||||
}
|
||||
empty = false;
|
||||
prevWasSeparator = false;
|
||||
};
|
||||
auto parseSomeDigit = [](int c) {
|
||||
if constexpr (Base == 2) {
|
||||
return parseAsmBinDigit(c);
|
||||
} else {
|
||||
return parseDigit<Base>(c);
|
||||
}
|
||||
};
|
||||
|
||||
if (number > (UINT32_MAX - bit) / 2) {
|
||||
warning(WARNING_LARGE_CONSTANT, "Integer constant is too large");
|
||||
// Discard any additional digits
|
||||
skipChars([](int d) { return isCustomBinDigit(d) || d == '_'; });
|
||||
return 0;
|
||||
}
|
||||
number = number * 2 + bit;
|
||||
uint32_t number;
|
||||
bool empty;
|
||||
if constexpr (Base == 10) {
|
||||
assume(prefix == nullptr);
|
||||
number = parseSomeDigit(initial);
|
||||
empty = false;
|
||||
} else {
|
||||
assume(initial == 0 && prefix != nullptr);
|
||||
number = 0;
|
||||
empty = true;
|
||||
}
|
||||
|
||||
checkDigitsEnding(empty, prefix, prevWasSeparator, "integer");
|
||||
return number;
|
||||
}
|
||||
|
||||
static uint32_t readOctalNumber(char const *prefix) {
|
||||
uint32_t number = 0;
|
||||
bool empty = true;
|
||||
bool prevWasSeparator = false;
|
||||
|
||||
for (int c = peek();; c = nextChar()) {
|
||||
@@ -1140,83 +1136,20 @@ static uint32_t readOctalNumber(char const *prefix) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!isOctDigit(c)) {
|
||||
if (!isSomeDigit(c)) {
|
||||
break;
|
||||
}
|
||||
int digit = c - '0';
|
||||
int digit = parseSomeDigit(c);
|
||||
empty = false;
|
||||
prevWasSeparator = false;
|
||||
|
||||
if (number > (UINT32_MAX - digit) / 8) {
|
||||
if (number > (UINT32_MAX - digit) / Base) {
|
||||
warning(WARNING_LARGE_CONSTANT, "Integer constant is too large");
|
||||
// Discard any additional digits
|
||||
skipChars([](int d) { return isOctDigit(d) || d == '_'; });
|
||||
skipChars([&isSomeDigit](int d) { return isSomeDigit(d) || d == '_'; });
|
||||
return 0;
|
||||
}
|
||||
number = number * 8 + digit;
|
||||
}
|
||||
|
||||
checkDigitsEnding(empty, prefix, prevWasSeparator, "integer");
|
||||
return number;
|
||||
}
|
||||
|
||||
static uint32_t readDecimalNumber(int initial) {
|
||||
assume(isDigit(initial));
|
||||
uint32_t number = initial - '0';
|
||||
bool prevWasSeparator = false;
|
||||
|
||||
for (int c = peek();; c = nextChar()) {
|
||||
if (c == '_') {
|
||||
checkDigitSeparator(prevWasSeparator, "integer");
|
||||
prevWasSeparator = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!isDigit(c)) {
|
||||
break;
|
||||
}
|
||||
int digit = c - '0';
|
||||
prevWasSeparator = false;
|
||||
|
||||
if (number > (UINT32_MAX - digit) / 10) {
|
||||
warning(WARNING_LARGE_CONSTANT, "Integer constant is too large");
|
||||
// Discard any additional digits
|
||||
skipChars([](int d) { return isDigit(d) || d == '_'; });
|
||||
return 0;
|
||||
}
|
||||
number = number * 10 + digit;
|
||||
}
|
||||
|
||||
checkDigitsEnding(false, nullptr, prevWasSeparator, "integer");
|
||||
return number;
|
||||
}
|
||||
|
||||
static uint32_t readHexNumber(char const *prefix) {
|
||||
uint32_t number = 0;
|
||||
bool empty = true;
|
||||
bool prevWasSeparator = false;
|
||||
|
||||
for (int c = peek();; c = nextChar()) {
|
||||
if (c == '_') {
|
||||
checkDigitSeparator(prevWasSeparator, "integer");
|
||||
prevWasSeparator = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!isHexDigit(c)) {
|
||||
break;
|
||||
}
|
||||
int digit = parseHexDigit(c);
|
||||
empty = false;
|
||||
prevWasSeparator = false;
|
||||
|
||||
if (number > (UINT32_MAX - digit) / 16) {
|
||||
warning(WARNING_LARGE_CONSTANT, "Integer constant is too large");
|
||||
// Discard any additional digits
|
||||
skipChars([](int d) { return isHexDigit(d) || d == '_'; });
|
||||
return 0;
|
||||
}
|
||||
number = number * 16 + digit;
|
||||
number = number * Base + digit;
|
||||
}
|
||||
|
||||
checkDigitsEnding(empty, prefix, prevWasSeparator, "integer");
|
||||
@@ -1830,15 +1763,15 @@ static Token yylex_NORMAL() {
|
||||
case 'x':
|
||||
case 'X':
|
||||
shiftChar();
|
||||
return Token(T_(NUMBER), readHexNumber("\"0x\""));
|
||||
return Token(T_(NUMBER), readNumber<16>(0, "\"0x\""));
|
||||
case 'o':
|
||||
case 'O':
|
||||
shiftChar();
|
||||
return Token(T_(NUMBER), readOctalNumber("\"0o\""));
|
||||
return Token(T_(NUMBER), readNumber<8>(0, "\"0o\""));
|
||||
case 'b':
|
||||
case 'B':
|
||||
shiftChar();
|
||||
return Token(T_(NUMBER), readBinaryNumber("\"0b\""));
|
||||
return Token(T_(NUMBER), readNumber<2>(0, "\"0b\""));
|
||||
}
|
||||
[[fallthrough]];
|
||||
|
||||
@@ -1853,7 +1786,7 @@ static Token yylex_NORMAL() {
|
||||
case '7':
|
||||
case '8':
|
||||
case '9': {
|
||||
uint32_t n = readDecimalNumber(c);
|
||||
uint32_t n = readNumber<10>(c, nullptr);
|
||||
|
||||
if (peek() == '.') {
|
||||
shiftChar();
|
||||
@@ -1864,20 +1797,20 @@ static Token yylex_NORMAL() {
|
||||
|
||||
case '&': // Either &=, binary AND, logical AND, or an octal constant
|
||||
c = peek();
|
||||
if (isOctDigit(c) || c == '_') {
|
||||
return Token(T_(NUMBER), readOctalNumber("'&'"));
|
||||
if (isDigit<8>(c) || c == '_') {
|
||||
return Token(T_(NUMBER), readNumber<8>(0, "'&'"));
|
||||
}
|
||||
return oneOrTwo('=', T_(POP_ANDEQ), '&', T_(OP_LOGICAND), T_(OP_AND));
|
||||
|
||||
case '%': // Either %=, MOD, or a binary constant
|
||||
c = peek();
|
||||
if (isCustomBinDigit(c) || c == '_') {
|
||||
return Token(T_(NUMBER), readBinaryNumber("'%'"));
|
||||
if (isAsmBinDigit(c) || c == '_') {
|
||||
return Token(T_(NUMBER), readNumber<2>(0, "'%'"));
|
||||
}
|
||||
return oneOrTwo('=', T_(POP_MODEQ), T_(OP_MOD));
|
||||
|
||||
case '$': // Hex constant
|
||||
return Token(T_(NUMBER), readHexNumber("'$'"));
|
||||
return Token(T_(NUMBER), readNumber<16>(0, "'$'"));
|
||||
|
||||
case '`': // Gfx constant
|
||||
return Token(T_(NUMBER), readGfxConstant());
|
||||
|
||||
Reference in New Issue
Block a user