diff options
| author | David Walter Seikel | 2014-09-14 02:24:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2014-09-14 02:24:58 +1000 |
| commit | 389660b6c45c77e313e70aaaff9c774a2ae4e0f3 (patch) | |
| tree | 9a897d2b2bb1e1534f2dc84f79d2d49e265ffda8 /libraries/lemon | |
| parent | No idea why this is needed now when it wasn't needed before. Blame an EFL up... (diff) | |
| download | SledjHamr-389660b6c45c77e313e70aaaff9c774a2ae4e0f3.zip SledjHamr-389660b6c45c77e313e70aaaff9c774a2ae4e0f3.tar.gz SledjHamr-389660b6c45c77e313e70aaaff9c774a2ae4e0f3.tar.bz2 SledjHamr-389660b6c45c77e313e70aaaff9c774a2ae4e0f3.tar.xz | |
Update to latest lemon.
Diffstat (limited to 'libraries/lemon')
| -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; |