bison-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

tables: fix again the handling for useless tokens


From: Akim Demaille
Subject: tables: fix again the handling for useless tokens
Date: Sun, 7 Mar 2021 08:32:28 +0100

This is embarrassing.  I will release 3.7.6 with this fix.  Unfortunately I 
still don't have a test case for this.

commit b426de59c284cd512b1ec974ac39f4fdbd0d3f21
Author: Akim Demaille <akim.demaille@gmail.com>
Date:   Sun Mar 7 08:19:36 2021 +0100

    tables: fix again the handling for useless tokens
    
    The right-shift added in c22902e360e0fbbe9fd5657dcf107e03166da309
    ("tables: fix handling for useless tokens") is incorrect.  In
    particular, we need to reset the "new" bits.
    
    Reported by Bal√°zs Scheidler.
    https://github.com/akimd/bison/issues/74
    
    * src/tables.c (pos_set_set): Fix the right-shift.

diff --git a/src/tables.c b/src/tables.c
index 6c8fc1cc6..a0f7cb365 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -180,21 +180,26 @@ pos_set_set (int pos)
   int bitno = pos - pos_set_base;
   if (bitno < 0)
     {
+      // Need more room on the left.
+      // DELTA is positive.  Run 'bitset >> delta'.
       const int delta = pos_set_base - pos;
       const int old_size = bitset_size (pos_set);
       const int new_size = old_size + delta;
       bitset_resize (pos_set, new_size);
-      // Shift all the bits by DELTA.
+      // Right-shift all the bits by DELTA.  Be sure to reset the new
+      // bits on the left.
+      //
       // FIXME: add bitset_assign, and bitset_shift?
-      for (int i = new_size - 1; delta <= i ; --i)
-        if (bitset_test (pos_set, i))
-          bitset_set (pos_set, i + delta);
+      for (int i = new_size - 1; 0 <= i ; --i)
+        if (delta <= i && bitset_test (pos_set, i - delta))
+          bitset_set (pos_set, i);
         else
-          bitset_reset (pos_set, i + delta);
+          bitset_reset (pos_set, i);
       pos_set_base = pos;
       bitno = 0;
     }
   else if (bitset_size (pos_set) <= bitno)
+    // Need more room on the right.
     bitset_resize (pos_set, bitno + 1);
   bitset_set (pos_set, bitno);
 }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]