Typo.

diff --git a/ChangeLog b/ChangeLog
index 6e577c11330ea229f875a431b514e5fd8f14d640..3d6548b2f917324e7950b8eccd2a95dc791f794c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -176,26 +176,6 @@
        afterwards.  Do it...
        * src/main.c (main): here: call states_free after `output'.
 
        afterwards.  Do it...
        * src/main.c (main): here: call states_free after `output'.
 

-2002-06-30  Akim Demaille  <akim@epita.fr>
-
-       Use hash.h for the state hash table.
-
-       * src/LR0.c (STATE_HASH_SIZE, state_hash): Remove.
-       (allocate_storage): Use state_hash_new.
-       (free_storage): Use state_hash_free.
-       (new_state, get_state): Adjust.
-       * src/lalr.h, src/lalr.c (states): Move to...
-       * src/states.h (state_t): Remove the `link' member, no longer
-       used.
-       * src/states.h, src/states.c: here.
-       (state_hash_new, state_hash_free, state_hash_lookup)
-       (state_hash_insert, states_free): New.
-       * src/states.c (state_table, state_compare, state_hash): New.
-       * src/output.c (output_actions): Do not free states now, since we
-       still need to know the final_state number in `prepare', called
-       afterwards.  Do it...
-       * src/main.c (main): here: call states_free after `output'.
-

 2002-06-30  Akim Demaille  <akim@epita.fr>
 
        * src/state.h, src/state.c (state_new): New, extracted from...
 2002-06-30  Akim Demaille  <akim@epita.fr>
 
        * src/state.h, src/state.c (state_new): New, extracted from...

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 79562a9337e534fa945f9d1921ab6ee1000f3878..4694014948e5f9ecd1b2fe9942eb35819218fb19 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -368,7 +368,7 @@ id : '0';
 %%
 ]])
 
 %%
 ]])
 

-AT_CHECK([bison input.y -o input.c --report=all], 1, [],
+AT_CHECK([bison input.y -o input.c --report=all], 0, [],

 [input.y contains 1 reduce/reduce conflict.
 ])
 
 [input.y contains 1 reduce/reduce conflict.
 ])