diff options
| author | drh <drh@noemail.net> | 2014-06-09 13:11:40 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-06-09 13:11:40 +0000 |
| commit | 62a223e5dd9227b7aa41e66d53df723d61fcf185 (patch) | |
| tree | 2597df626dacf93ed81da8b323704a33a2a32ff1 /tool/lemon.c | |
| parent | 69e9782f23a55988290253d4580719bfd24ee233 (diff) | |
| download | sqlite-62a223e5dd9227b7aa41e66d53df723d61fcf185.tar.gz sqlite-62a223e5dd9227b7aa41e66d53df723d61fcf185.zip | |
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.
FossilOrigin-Name: 1925f3a0a2caa709569df015a8e0d26412f1a9ff
Diffstat (limited to 'tool/lemon.c')
| -rw-r--r-- | tool/lemon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tool/lemon.c b/tool/lemon.c index d7179ad42..85e94f700 100644 --- a/tool/lemon.c +++ b/tool/lemon.c @@ -1183,8 +1183,7 @@ static int resolve_conflict( apx->type = SH_RESOLVED; }else{ assert( spx->prec==spy->prec && spx->assoc==NONE ); - apy->type = SRCONFLICT; - errcnt++; + apx->type = ERROR; } }else if( apx->type==REDUCE && apy->type==REDUCE ){ spx = apx->x.rp->precsym; |