From 06455b49c0493a7d03a2c262d4a8535df1049aae Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 20 Mar 2016 10:15:18 -0500 Subject: [PATCH] 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) --- tools/lemon/lemon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c index 6f32074e30..5deb3493be 100644 --- a/tools/lemon/lemon.c +++ b/tools/lemon/lemon.c @@ -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;