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

Refactor readGfxConstant for consistency, and edit warning message

Browse Source
This commit is contained in:
Rangi
2021-11-19 21:36:56 -05:00
parent 036b6c1b89
commit c7322258fc
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/asm/lexer.c
View File

@@ -1263,7 +1263,7 @@ static uint32_t readGfxConstant(void)
dbgPrint("Reading gfx constant with digits [%c,%c,%c,%c]\n", dbgPrint("Reading gfx constant with digits [%c,%c,%c,%c]\n",
gfxDigits[0], gfxDigits[1], gfxDigits[2], gfxDigits[3]); gfxDigits[0], gfxDigits[1], gfxDigits[2], gfxDigits[3]);
for (;;) { for (;; shiftChar()) {
int c = peek(); int c = peek();
uint32_t pixel; uint32_t pixel;
@@ -1284,14 +1284,13 @@ static uint32_t readGfxConstant(void)
} }
if (width < 9) if (width < 9)
width++; width++;
shiftChar();
} }
if (width == 0) if (width == 0)
error("Invalid graphics constant, no digits after '`'\n"); error("Invalid graphics constant, no digits after '`'\n");
else if (width == 9) else if (width == 9)
warning(WARNING_LARGE_CONSTANT, warning(WARNING_LARGE_CONSTANT,
"Graphics constant is too long, only 8 first pixels considered\n"); "Graphics constant is too long, only first 8 pixels considered\n");
return bp1 << 8 | bp0; return bp1 << 8 | bp0;
} }

2
test/asm/overflow.err
View File

@@ -5,4 +5,4 @@ warning: overflow.asm(24): [-Wdiv]
warning: overflow.asm(38): [-Wlarge-constant] warning: overflow.asm(38): [-Wlarge-constant]
Integer constant is too large Integer constant is too large
warning: overflow.asm(41): [-Wlarge-constant] warning: overflow.asm(41): [-Wlarge-constant]
Graphics constant is too long, only 8 first pixels considered Graphics constant is too long, only first 8 pixels considered