gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-21 18:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow underscores in numeric literals

Browse Source 
Fixes #539

Changes \@'s output to start with "_u", not "_", so it will be valid within labels but not numerics
This commit is contained in:
Rangi
2020-12-09 11:01:51 -05:00
committed by Eldred Habert
parent 58739b0bf2
commit af530859f0
7 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/asm/lexer.c
View File

@@ -999,16 +999,16 @@ static void readNumber(int radix, int32_t baseValue)
{
uint32_t value = baseValue;
for (;;) {
for (;; shiftChars(1)) {
int c = peek(0);
if (c < '0' || c > '0' + radix - 1)
if (c == '_')
continue;
else if (c < '0' || c > '0' + radix - 1)
break;
if (value > (UINT32_MAX - (c - '0')) / radix)
warning(WARNING_LARGE_CONSTANT, "Integer constant is too large\n");
value = value * radix + (c - '0');
shiftChars(1);
}
yylval.nConstValue = value;
@@ -1019,17 +1019,19 @@ static void readFractionalPart(void)
uint32_t value = 0, divisor = 1;
dbgPrint("Reading fractional part\n");
for (;;) {
for (;; shiftChars(1)) {
int c = peek(0);
if (c < '0' || c > '9')
if (c == '_')
continue;
else if (c < '0' || c > '9')
break;
shiftChars(1);
if (divisor > (UINT32_MAX - (c - '0')) / 10) {
warning(WARNING_LARGE_CONSTANT,
"Precision of fixed-point constant is too large\n");
/* Discard any additional digits */
while (c = peek(0), c >= '0' && c <= '9')
shiftChars(1);
while (c = peek(0), (c >= '0' && c <= '9') || c == '_')
shiftChars(1);
break;
}
@@ -1055,7 +1057,7 @@ static void readBinaryNumber(void)
uint32_t value = 0;
dbgPrint("Reading binary number with digits [%c,%c]\n", binDigits[0], binDigits[1]);
for (;;) {
for (;; shiftChars(1)) {
int c = peek(0);
int bit;
@@ -1063,13 +1065,13 @@ static void readBinaryNumber(void)
bit = 0;
else if (c == binDigits[1])
bit = 1;
else if (c == '_')
continue;
else
break;
if (value > (UINT32_MAX - bit) / 2)
warning(WARNING_LARGE_CONSTANT, "Integer constant is too large\n");
value = value * 2 + bit;
shiftChars(1);
}
yylval.nConstValue = value;
@@ -1081,7 +1083,7 @@ static void readHexNumber(void)
bool empty = true;
dbgPrint("Reading hex number\n");
for (;;) {
for (;; shiftChars(1)) {
int c = peek(0);
if (c >= 'a' && c <= 'f') /* Convert letters to right after digits */
@@ -1090,6 +1092,8 @@ static void readHexNumber(void)
c = c - 'A' + 10;
else if (c >= '0' && c <= '9')
c = c - '0';
else if (c == '_' && !empty)
continue;
else
break;
@@ -1097,7 +1101,6 @@ static void readHexNumber(void)
warning(WARNING_LARGE_CONSTANT, "Integer constant is too large\n");
value = value * 16 + c;
shiftChars(1);
empty = false;
}