From af6f62701c5ab36fa674ef430981003f5498432a Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Sun, 9 Feb 2020 22:02:47 +0100 Subject: [PATCH] Remove ambiguous charmap syntax The syntax was `charmap "anything", "string"`; the second string was already handled by `const`, but to the same effect... the ambiguous declaration has been removed, leaving us at "only" two reduce/reduce conflicts. --- src/asm/asmy.y | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/asm/asmy.y b/src/asm/asmy.y index 1b229601..52de18cf 100644 --- a/src/asm/asmy.y +++ b/src/asm/asmy.y @@ -997,14 +997,7 @@ incbin : T_POP_INCBIN string } ; -charmap : T_POP_CHARMAP string comma string - { - if (charmap_Add($2, $4[0] & 0xFF) == -1) { - fprintf(stderr, "Error parsing charmap. Either you've added too many (%i), or the input character length is too long (%i)' : %s\n", MAXCHARMAPS, CHARMAPLENGTH, strerror(errno)); - yyerror("Error parsing charmap."); - } - } - | T_POP_CHARMAP string comma const +charmap : T_POP_CHARMAP string comma const { if (charmap_Add($2, constexpr_GetConstantValue(&$4) & 0xFF) == -1) { fprintf(stderr, "Error parsing charmap. Either you've added too many (%i), or the input character length is too long (%i)' : %s\n", MAXCHARMAPS, CHARMAPLENGTH, strerror(errno));