From 81675bc4c71faaa00f037018c8eee4c1cf66183c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christophe=20Sta=C3=AFesse?= <chastai@skynet.be>
Date: Sun, 26 Jul 2015 01:50:56 -0600
Subject: [PATCH] Fix yacc conflict (asmfile/lastline/lines/line rules)

---
 src/asm/asmy.y | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/asm/asmy.y b/src/asm/asmy.y
index 3e9b3837..ee181254 100644
--- a/src/asm/asmy.y
+++ b/src/asm/asmy.y
@@ -497,22 +497,16 @@ void	if_skip_to_endc( void )
 
 %%
 
-asmfile : lines lastline;
-
-lastline : /* empty */
-	| line {
-		nLineNo += 1;
-		nTotalLines += 1;
-	};
+asmfile : lines;
 
+/* Note: The lexer add '\n' at the end of the input */
 lines : /* empty */
 	| lines line '\n' {
 		nLineNo += 1;
 		nTotalLines += 1;
 	};
 
-line : /* empty */
-	| label
+line : label
 	| label cpu_command
 	| label macro
 	| label simple_pseudoop