From 389660b6c45c77e313e70aaaff9c774a2ae4e0f3 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 14 Sep 2014 02:24:58 +1000
Subject: Update to latest lemon.

---
 libraries/lemon/lemon.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'libraries')

diff --git a/libraries/lemon/lemon.c b/libraries/lemon/lemon.c
index d7179ad..85e94f7 100644
--- a/libraries/lemon/lemon.c
+++ b/libraries/lemon/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;
-- 
cgit v1.1