shithub: rgbds

Info  •  Files  •  Log  •  Branches

Fix yacc conflict (asmfile/lastline/lines/line rules)

--- a/src/asm/asmy.y

+++ b/src/asm/asmy.y

@@ -497,14 +497,9 @@

 %%

-asmfile : lines lastline;

+asmfile : lines;

-lastline : /* empty */

-	| line {

-		nLineNo += 1;

-		nTotalLines += 1;

-	};

-

+/* Note: The lexer add '\n' at the end of the input */

 lines : /* empty */

 	| lines line '\n' {

 		nLineNo += 1;

@@ -511,8 +506,7 @@

 		nTotalLines += 1;

 	};

-line : /* empty */

-	| label

+line : label

 	| label cpu_command

 	| label macro

 	| label simple_pseudoop