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

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

Browse Source
This commit is contained in:
Christophe Staïesse
2015-07-26 01:50:56 -06:00
committed by Anthony J. Bentley
parent 37b615f070
commit 81675bc4c7
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/asm/asmy.y
View File

@@ -497,22 +497,16 @@ void if_skip_to_endc( void )
%% %%
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 : /* empty */
| lines line '\n' { | lines line '\n' {
nLineNo += 1; nLineNo += 1;
nTotalLines += 1; nTotalLines += 1;
}; };
line : /* empty */ line : label
| label
| label cpu_command | label cpu_command
| label macro | label macro
| label simple_pseudoop | label simple_pseudoop