Maintain interval ->position fields correctly in update_interval

Also fix some anomalies in the handling of byte positions in regexp-emacs.c
This fixes bug #34525.

* src/intervals.c (SET_PARENT_POSITION): New macro.
(update_interval): When moving to an interval's parent, set that parent's
->position field, to maintain the consistency of the tree.

* src/intervals.h (struct interval): Amend the comment describing when
->position is valid.

* src/pdumper.c: Update the hash associated with struct interval.

* src/regex-emacs.c: (re_match_2_internal): Only invoke POINTER_TO_OFFSET on a
known character boundary.  Only perform arithmetic on character positions, not
on byte positions.  Correct the argument to an invocation of
UPDATE_SYNTAX_TABLE_FORWARD by adding 1 to it (in case wordend:).

* src/syntax.c: (update_syntax_table): Remove the now redundant code that set
the ->position field of all parents of the interval found by update_interval.

1 files changed, 0 insertions, 14 deletions

diff --git a/src/syntax.c b/src/syntax.c
index dd2f56f2cfa..fe1e2d236b9 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -340,20 +340,6 @@ update_syntax_table (ptrdiff_t charpos, EMACS_INT count, bool init,
       invalidate = false;
       if (!i)
         return;
-      /* interval_of updates only ->position of the return value, so
-         update the parents manually to speed up update_interval.  */
-      while (!NULL_PARENT (i))
-        {
-          if (AM_RIGHT_CHILD (i))
-            INTERVAL_PARENT (i)->position = i->position
-              - LEFT_TOTAL_LENGTH (i) + TOTAL_LENGTH (i) /* right end */
-              - TOTAL_LENGTH (INTERVAL_PARENT (i))
-              + LEFT_TOTAL_LENGTH (INTERVAL_PARENT (i));
-          else
-            INTERVAL_PARENT (i)->position = i->position - LEFT_TOTAL_LENGTH (i)
-              + TOTAL_LENGTH (i);
-          i = INTERVAL_PARENT (i);
-        }
       i = gl_state.forward_i;
       gl_state.b_property = i->position - gl_state.offset;
       gl_state.e_property = INTERVAL_LAST_POS (i) - gl_state.offset;