diff options
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/lemon/lemon.c | 3 |
1 files changed, 1 insertions, 2 deletions
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( | |||
| 1183 | apx->type = SH_RESOLVED; | 1183 | apx->type = SH_RESOLVED; |
| 1184 | }else{ | 1184 | }else{ |
| 1185 | assert( spx->prec==spy->prec && spx->assoc==NONE ); | 1185 | assert( spx->prec==spy->prec && spx->assoc==NONE ); |
| 1186 | apy->type = SRCONFLICT; | 1186 | apx->type = ERROR; |
| 1187 | errcnt++; | ||
| 1188 | } | 1187 | } |
| 1189 | }else if( apx->type==REDUCE && apy->type==REDUCE ){ | 1188 | }else if( apx->type==REDUCE && apy->type==REDUCE ){ |
| 1190 | spx = apx->x.rp->precsym; | 1189 | spx = apx->x.rp->precsym; |