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

Simplify parsing of variable-length lists

Browse Source 
This change removes 2 reduce/reduce conflicts in the parser while
preserving the behaviour of the rules.

Note that now each list with empty elements will only print a warning
per line.

Signed-off-by: Antonio Niño Díaz <antonio_nd@outlook.com>
This commit is contained in:
Antonio Niño Díaz
2018-03-30 23:50:57 +01:00
parent c1a97f6541
commit efdd42c6a8
1 changed files with 28 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/asm/asmy.y
View File

@@ -28,6 +28,7 @@
#include "common.h" #include "common.h"
#include "linkdefs.h" #include "linkdefs.h"
uint32_t nListCountEmpty;
char *tzNewMacro; char *tzNewMacro;
uint32_t ulNewMacroSize; uint32_t ulNewMacroSize;
@@ -579,10 +580,12 @@ asmfile : lines;
/* Note: The lexer adds '\n' at the end of the input */ /* Note: The lexer adds '\n' at the end of the input */
lines : /* empty */ lines : /* empty */
| lines line '\n' { | lines {
nLineNo += 1; nListCountEmpty = 0;
nTotalLines += 1; } line '\n' {
} nLineNo += 1;
nTotalLines += 1;
}
; ;
line : label line : label
@@ -802,16 +805,28 @@ ds : T_POP_DS uconst
} }
; ;
db : T_POP_DB constlist_8bit_entry comma constlist_8bit db : T_POP_DB constlist_8bit_entry comma constlist_8bit {
| T_POP_DB constlist_8bit_entry_single if ((nPass == 1) && (nListCountEmpty > 0)) {
warning("Empty entry in list of 8-bit elements (treated as 0).");
}
}
| T_POP_DB constlist_8bit_entry
; ;
dw : T_POP_DW constlist_16bit_entry comma constlist_16bit dw : T_POP_DW constlist_16bit_entry comma constlist_16bit {
| T_POP_DW constlist_16bit_entry_single if ((nPass == 1) && (nListCountEmpty > 0)) {
warning("Empty entry in list of 16-bit elements (treated as 0).");
}
}
| T_POP_DW constlist_16bit_entry
; ;
dl : T_POP_DL constlist_32bit_entry comma constlist_32bit dl : T_POP_DL constlist_32bit_entry comma constlist_32bit {
| T_POP_DL constlist_32bit_entry_single if ((nPass == 1) && (nListCountEmpty > 0)) {
warning("Empty entry in list of 32-bit elements (treated as 0).");
}
}
| T_POP_DL constlist_32bit_entry
; ;
purge : T_POP_PURGE { purge : T_POP_PURGE {
@@ -1028,26 +1043,7 @@ constlist_8bit : constlist_8bit_entry
constlist_8bit_entry : /* empty */ constlist_8bit_entry : /* empty */
{ {
out_Skip(1); out_Skip(1);
if (nPass == 1) nListCountEmpty++;
warning("Empty entry in list of 8-bit elements (treated as 0).");
}
| const_8bit
{
out_RelByte(&$1);
}
| string
{
char *s = $1;
int32_t length = charmap_Convert(&s);
out_AbsByteGroup(s, length);
free(s);
}
;
constlist_8bit_entry_single : /* empty */
{
out_Skip(1);
} }
| const_8bit | const_8bit
{ {
@@ -1070,18 +1066,7 @@ constlist_16bit : constlist_16bit_entry
constlist_16bit_entry : /* empty */ constlist_16bit_entry : /* empty */
{ {
out_Skip(2); out_Skip(2);
if (nPass == 1) nListCountEmpty++;
warning("Empty entry in list of 16-bit elements (treated as 0).");
}
| const_16bit
{
out_RelWord(&$1);
}
;
constlist_16bit_entry_single : /* empty */
{
out_Skip(2);
} }
| const_16bit | const_16bit
{ {
@@ -1096,18 +1081,7 @@ constlist_32bit : constlist_32bit_entry
constlist_32bit_entry : /* empty */ constlist_32bit_entry : /* empty */
{ {
out_Skip(4); out_Skip(4);
if (nPass == 1) nListCountEmpty++;
warning("Empty entry in list of 32-bit elements (treated as 0).");
}
| relocconst
{
out_RelLong(&$1);
}
;
constlist_32bit_entry_single : /* empty */
{
out_Skip(4);
} }
| relocconst | relocconst
{ {