comparison src/buffer.c @ 45374:030fb28e7ec2

* buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address of the cdr part of a cons cell; instead, track the parent cell and call XSETCDR, or set the variable for the head of the list if we haven't started down the list yet.

45373:0ca1f86bf6fc

fix_overlays_in_range (start, end)
     register int start, end;
{
  Lisp_Object overlay;
  Lisp_Object before_list, after_list;
  Lisp_Object *ptail, *pbefore = &before_list, *pafter = &after_list;
  int startpos, endpos;

  /* This algorithm shifts links around instead of consing and GCing.
     The loop invariant is that before_list (resp. after_list) is a
     well-formed list except that its last element, the one that
     *pbefore (resp. *pafter) points to, is still uninitialized.
     So it's not a bug that before_list isn't initialized, although
     it may look strange.  */
  for (ptail = &current_buffer->overlays_before; CONSP (*ptail);)
    {
      overlay = XCAR (*ptail);
      endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
      if (endpos < start)
	break;
      startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
      if (endpos < end

	    }
	  /* Add it to the end of the wrong list.  Later on,
	     recenter_overlay_lists will move it to the right place.  */
	  if (endpos < XINT (current_buffer->overlay_center))
	    {
	      *pafter = *ptail;
	      pafter = &XCDR (*ptail);
	    }
	  else
	    {
	      *pbefore = *ptail;
	      pbefore = &XCDR (*ptail);
	    }
	  *ptail = XCDR (*ptail);
	}
      else
	ptail = &XCDR (*ptail);
    }
  for (ptail = &current_buffer->overlays_after; CONSP (*ptail);)
    {
      overlay = XCAR (*ptail);
      startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
      if (startpos >= end)
	break;
      endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
      if (startpos >= start

			   Qnil);
	      tem = startpos; startpos = endpos; endpos = tem;
	    }
	  if (endpos < XINT (current_buffer->overlay_center))
	    {
	      *pafter = *ptail;
	      pafter = &XCDR (*ptail);
	    }
	  else
	    {
	      *pbefore = *ptail;
	      pbefore = &XCDR (*ptail);
	    }
	  *ptail = XCDR (*ptail);
	}
      else
	ptail = &XCDR (*ptail);
    }

  /* Splice the constructed (wrong) lists into the buffer's lists,
     and let the recenter function make it sane again.  */
  *pbefore = current_buffer->overlays_before;
  current_buffer->overlays_before = before_list;
  recenter_overlay_lists (current_buffer,
			  XINT (current_buffer->overlay_center));

  *pafter = current_buffer->overlays_after;
  current_buffer->overlays_after = after_list;
  recenter_overlay_lists (current_buffer,
			  XINT (current_buffer->overlay_center));
}

/* We have two types of overlay: the one whose ending marker is

void
fix_overlays_before (bp, prev, pos)
     struct buffer *bp;
     int prev, pos;
{
  Lisp_Object *tailp = &bp->overlays_before;
  Lisp_Object *right_place;
  int end;

  /* After the insertion, the several overlays may be in incorrect
     order.  The possibility is that, in the list `overlays_before',
     an overlay which ends at POS appears after an overlay which ends

  /* At first, find a place where disordered overlays should be linked
     in.  It is where an overlay which end before POS exists. (i.e. an
     overlay whose ending marker is after-insertion-marker if disorder
     exists).  */
  while (!NILP (*tailp)
	 && ((end = OVERLAY_POSITION (OVERLAY_END (XCAR (*tailp))))
	     >= pos))
    tailp = &XCDR (*tailp);

  /* If we don't find such an overlay,
     or the found one ends before PREV,
     or the found one is the last one in the list,
     we don't have to fix anything.  */
  if (NILP (*tailp)
      || end < prev
      || NILP (XCDR (*tailp)))
    return;

  right_place = tailp;
  tailp = &XCDR (*tailp);

  /* Now, end position of overlays in the list *TAILP should be before
     or equal to PREV.  In the loop, an overlay which ends at POS is
     moved ahead to the place pointed by RIGHT_PLACE.  If we found an
     overlay which ends before PREV, the remaining overlays are in
     correct order.  */
  while (!NILP (*tailp))
    {
      end = OVERLAY_POSITION (OVERLAY_END (XCAR (*tailp)));

      if (end == pos)
	{			/* This overlay is disordered. */
	  Lisp_Object found = *tailp;

	  /* Unlink the found overlay.  */
	  *tailp = XCDR (found);
	  /* Move an overlay at RIGHT_PLACE to the next of the found one.  */
	  XCDR (found) = *right_place;
	  /* Link it into the right place.  */
	  *right_place = found;
	}
      else if (end == prev)
	tailp = &XCDR (*tailp);
      else			/* No more disordered overlay. */
	break;
    }
}


45374:030fb28e7ec2

fix_overlays_in_range (start, end)
     register int start, end;
{
  Lisp_Object overlay;
  Lisp_Object before_list, after_list;
  /* These are either nil, indicating that before_list or after_list
     should be assigned, or the cons cell the cdr of which should be
     assigned.  */
  Lisp_Object beforep = Qnil, afterp = Qnil;
  /* 'Parent', likewise, indicates a cons cell or
     current_buffer->overlays_before or overlays_after, depending
     which loop we're in.  */
  Lisp_Object tail, parent;
  int startpos, endpos;

  /* This algorithm shifts links around instead of consing and GCing.
     The loop invariant is that before_list (resp. after_list) is a
     well-formed list except that its last element, the CDR of beforep
     (resp. afterp) if beforep (afterp) isn't nil or before_list
     (after_list) if it is, is still uninitialized.  So it's not a bug
     that before_list isn't initialized, although it may look
     strange.  */
  for (parent = Qnil, tail = current_buffer->overlays_before; CONSP (tail);)
    {
      overlay = XCAR (tail);
      endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
      if (endpos < start)
	break;
      startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
      if (endpos < end

	    }
	  /* Add it to the end of the wrong list.  Later on,
	     recenter_overlay_lists will move it to the right place.  */
	  if (endpos < XINT (current_buffer->overlay_center))
	    {
	      if (NILP (afterp))
		after_list = tail;
	      else
		XSETCDR (afterp, tail);
	      afterp = tail;
	    }
	  else
	    {
	      if (NILP (beforep))
		before_list = tail;
	      else
		XSETCDR (beforep, tail);
	      beforep = tail;
	    }
	  if (NILP (parent))
	    current_buffer->overlays_before = XCDR (tail);
	  else
	    XSETCDR (parent, XCDR (tail));
	  tail = XCDR (tail);
	}
      else
	parent = tail, tail = XCDR (parent);
    }
  for (parent = Qnil, tail = current_buffer->overlays_after; CONSP (tail);)
    {
      overlay = XCAR (tail);
      startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
      if (startpos >= end)
	break;
      endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
      if (startpos >= start

			   Qnil);
	      tem = startpos; startpos = endpos; endpos = tem;
	    }
	  if (endpos < XINT (current_buffer->overlay_center))
	    {
	      if (NILP (afterp))
		after_list = tail;
	      else
		XSETCDR (afterp, tail);
	      afterp = tail;
	    }
	  else
	    {
	      if (NILP (beforep))
		before_list = tail;
	      else
		XSETCDR (beforep, tail);
	      beforep = tail;
	    }
	  if (NILP (parent))
	    current_buffer->overlays_after = XCDR (tail);
	  else
	    XSETCDR (parent, XCDR (tail));
	  tail = XCDR (tail);
	}
      else
	parent = tail, tail = XCDR (parent);
    }

  /* Splice the constructed (wrong) lists into the buffer's lists,
     and let the recenter function make it sane again.  */
  if (!NILP (beforep))
    {
      XSETCDR (beforep, current_buffer->overlays_before);
      current_buffer->overlays_before = before_list;
    }
  recenter_overlay_lists (current_buffer,
			  XINT (current_buffer->overlay_center));

  if (!NILP (afterp))
    {
      XSETCDR (afterp, current_buffer->overlays_after);
      current_buffer->overlays_after = after_list;
    }
  recenter_overlay_lists (current_buffer,
			  XINT (current_buffer->overlay_center));
}

/* We have two types of overlay: the one whose ending marker is

void
fix_overlays_before (bp, prev, pos)
     struct buffer *bp;
     int prev, pos;
{
  /* If parent is nil, replace overlays_before; otherwise, XCDR(parent).  */
  Lisp_Object tail = bp->overlays_before, parent = Qnil;
  Lisp_Object right_pair;
  int end;

  /* After the insertion, the several overlays may be in incorrect
     order.  The possibility is that, in the list `overlays_before',
     an overlay which ends at POS appears after an overlay which ends

  /* At first, find a place where disordered overlays should be linked
     in.  It is where an overlay which end before POS exists. (i.e. an
     overlay whose ending marker is after-insertion-marker if disorder
     exists).  */
  while (!NILP (tail)
	 && ((end = OVERLAY_POSITION (OVERLAY_END (XCAR (tail))))
	     >= pos))
    {
      parent = tail;
      tail = XCDR (tail);
    }

  /* If we don't find such an overlay,
     or the found one ends before PREV,
     or the found one is the last one in the list,
     we don't have to fix anything.  */
  if (NILP (tail)
      || end < prev
      || NILP (XCDR (tail)))
    return;

  right_pair = parent;
  parent = tail;
  tail = XCDR (tail);

  /* Now, end position of overlays in the list TAIL should be before
     or equal to PREV.  In the loop, an overlay which ends at POS is
     moved ahead to the place indicated by the CDR of RIGHT_PAIR.  If
     we found an overlay which ends before PREV, the remaining
     overlays are in correct order.  */
  while (!NILP (tail))
    {
      end = OVERLAY_POSITION (OVERLAY_END (XCAR (tail)));

      if (end == pos)
	{			/* This overlay is disordered. */
	  Lisp_Object found = tail;

	  /* Unlink the found overlay.  */
	  XSETCDR (parent, XCDR (found));
	  /* Move an overlay at RIGHT_PLACE to the next of the found one,
	     and link it into the right place.  */
	  if (NILP (right_pair))
	    {
	      XSETCDR (found, bp->overlays_before);
	      bp->overlays_before = found;
	    }
	  else
	    {
	      XSETCDR (found, XCDR (right_pair));
	      XSETCDR (right_pair, found);
	    }
	}
      else if (end == prev)
	{
	  parent = tail;
	  tail = XCDR (tail);
	}
      else			/* No more disordered overlay. */
	break;
    }
}