mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-21 19:51:27 +00:00
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:
parent
dd0d0e036c
commit
06455b49c0
1 changed files with 1 additions and 2 deletions
|
@ -1086,8 +1086,7 @@ static int resolve_conflict(
|
|||
apx->type = SH_RESOLVED;
|
||||
}else{
|
||||
assert( spx->prec==spy->prec && spx->assoc==NONE );
|
||||
apy->type = SRCONFLICT;
|
||||
errcnt++;
|
||||
apy->type = ERROR;
|
||||
}
|
||||
}else if( apx->type==REDUCE && apy->type==REDUCE ){
|
||||
spx = apx->x.rp->precsym;
|
||||
|
|
Loading…
Reference in a new issue