* src/state.h (SHIFT_DISABLE, SHIFT_IS_DISABLED): New.

* src/conflicts.c: Use it.
Restore a few missing `if (!SHIFT_IS_DISABLED)' which were
incorrectly ``simplified''.
This commit is contained in:
Akim Demaille
2001-12-05 09:32:23 +00:00
parent 9f136c0720
commit 9839bbe557
3 changed files with 33 additions and 12 deletions

View File

@@ -1,3 +1,11 @@
2001-12-05 Akim Demaille <akim@epita.fr>
* src/state.h (SHIFT_DISABLE, SHIFT_IS_DISABLED): New.
* src/conflicts.c: Use it.
Restore a few missing `if (!SHIFT_IS_DISABLED)' which were
incorrectly ``simplified''.
2001-12-05 Akim Demaille <akim@epita.fr>
* src/conflicts.c (flush_shift, resolve_sr_conflict): De-obfuscate