zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lemon update 2014-06-09 13:11:40 on branch trunk 

- Modify the %nonassoc directive in lemon so that it generates a run-time error rather than a parsing conflict. This changes is due to a bug report on the mailing list. SQLite does not use the %nonassoc directive in its grammar so this change does not affect SQLite. (user: drh)
This commit is contained in:
Randy Heit 2016-03-20 10:15:18 -05:00
parent dd0d0e036c
commit 06455b49c0
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/lemon/lemon.c
View File

@ -1086,8 +1086,7 @@ static int resolve_conflict(
apx->type = SH_RESOLVED; apx->type = SH_RESOLVED;
}else{ }else{
assert( spx->prec==spy->prec && spx->assoc==NONE ); assert( spx->prec==spy->prec && spx->assoc==NONE );
apy->type = SRCONFLICT; apy->type = ERROR;
errcnt++;
} }
}else if( apx->type==REDUCE && apy->type==REDUCE ){ }else if( apx->type==REDUCE && apy->type==REDUCE ){
spx = apx->x.rp->precsym; spx = apx->x.rp->precsym;