comparison src/intervals.c @ 25747:062f4c69ff56

(rotate_right, rotate_left): Add braces to avoid ambiguous else warning. (split_interval_left): Remove unused variables. (previous_interval, adjust_intervals_for_deletion, set_point_both, set_point_both, set_intervals_multibyte_1): Ditto. (icount, idepth, zero_length): Move into #if 0 section below original position where these are used.

25746:8690532ba294

    return 0;

  return 1;
}

static int icount;
static int idepth;
static int zero_length;

/* Traverse an interval tree TREE, performing FUNCTION on each node.
   Pass FUNCTION two args: an interval, and ARG.  */

void

  position += LENGTH (tree);
  traverse_intervals (tree->right, position, depth + 1,  function, arg);
}

#if 0
/* These functions are temporary, for debugging purposes only.  */

INTERVAL search_interval, found_interval;

void

  INTERVAL B = interval->left;
  int old_total = interval->total_length;

  /* Deal with any Parent of A;  make it point to B.  */
  if (! ROOT_INTERVAL_P (interval))
    if (AM_LEFT_CHILD (interval))
      interval->parent->left = B;
    else
      interval->parent->right = B;
  B->parent = interval->parent;

  /* Make B the parent of A */
  i = B->right;
  B->right = interval;

  INTERVAL B = interval->right;
  int old_total = interval->total_length;

  /* Deal with any parent of A;  make it point to B.  */
  if (! ROOT_INTERVAL_P (interval))
    if (AM_LEFT_CHILD (interval))
      interval->parent->left = B;
    else
      interval->parent->right = B;
  B->parent = interval->parent;

  /* Make B the parent of A */
  i = B->left;
  B->left = interval;

split_interval_left (interval, offset)
     INTERVAL interval;
     int offset;
{
  INTERVAL new = make_interval ();
  int position = interval->position;
  int new_length = offset;

  new->position = interval->position;
  interval->position = interval->position + offset;
  new->parent = interval;

INTERVAL
previous_interval (interval)
     register INTERVAL interval;
{
  register INTERVAL i;
  register int position_of_previous;

  if (NULL_INTERVAL_P (interval))
    return NULL_INTERVAL;

  if (! NULL_LEFT_CHILD (interval))

     struct buffer *buffer;
     int start, length;
{
  register int left_to_delete = length;
  register INTERVAL tree = BUF_INTERVALS (buffer);
  register int deleted;
  Lisp_Object parent;
  int offset;

  XSETFASTINT (parent, (EMACS_INT) tree->parent);
  offset = (BUFFERP (parent) ? BUF_BEG (XBUFFER (parent)) : 0);

void
set_point_both (buffer, charpos, bytepos)
     register struct buffer *buffer;
     register int charpos, bytepos;
{
  register INTERVAL to, from, toprev, fromprev, target;
  int buffer_point;
  register Lisp_Object obj;
  int old_position = BUF_PT (buffer);
  int backwards = (charpos < old_position ? 1 : 0);
  int have_overlays;
  int original_position;

set_intervals_multibyte_1 (i, multi_flag, start, start_byte, end, end_byte)
     INTERVAL i;
     int multi_flag;
     int start, start_byte, end, end_byte;
{
  INTERVAL left, right;

  /* Fix the length of this interval.  */
  if (multi_flag)
    i->total_length = end - start;
  else
    i->total_length = end_byte - start_byte;

25747:062f4c69ff56

    return 0;

  return 1;
}


/* Traverse an interval tree TREE, performing FUNCTION on each node.
   Pass FUNCTION two args: an interval, and ARG.  */

void

  position += LENGTH (tree);
  traverse_intervals (tree->right, position, depth + 1,  function, arg);
}

#if 0

static int icount;
static int idepth;
static int zero_length;

/* These functions are temporary, for debugging purposes only.  */

INTERVAL search_interval, found_interval;

void

  INTERVAL B = interval->left;
  int old_total = interval->total_length;

  /* Deal with any Parent of A;  make it point to B.  */
  if (! ROOT_INTERVAL_P (interval))
    {
      if (AM_LEFT_CHILD (interval))
	interval->parent->left = B;
      else
	interval->parent->right = B;
    }
  B->parent = interval->parent;

  /* Make B the parent of A */
  i = B->right;
  B->right = interval;

  INTERVAL B = interval->right;
  int old_total = interval->total_length;

  /* Deal with any parent of A;  make it point to B.  */
  if (! ROOT_INTERVAL_P (interval))
    {
      if (AM_LEFT_CHILD (interval))
	interval->parent->left = B;
      else
	interval->parent->right = B;
    }
  B->parent = interval->parent;

  /* Make B the parent of A */
  i = B->left;
  B->left = interval;

split_interval_left (interval, offset)
     INTERVAL interval;
     int offset;
{
  INTERVAL new = make_interval ();
  int new_length = offset;

  new->position = interval->position;
  interval->position = interval->position + offset;
  new->parent = interval;

INTERVAL
previous_interval (interval)
     register INTERVAL interval;
{
  register INTERVAL i;

  if (NULL_INTERVAL_P (interval))
    return NULL_INTERVAL;

  if (! NULL_LEFT_CHILD (interval))

     struct buffer *buffer;
     int start, length;
{
  register int left_to_delete = length;
  register INTERVAL tree = BUF_INTERVALS (buffer);
  Lisp_Object parent;
  int offset;

  XSETFASTINT (parent, (EMACS_INT) tree->parent);
  offset = (BUFFERP (parent) ? BUF_BEG (XBUFFER (parent)) : 0);

void
set_point_both (buffer, charpos, bytepos)
     register struct buffer *buffer;
     register int charpos, bytepos;
{
  register INTERVAL to, from, toprev, fromprev;
  int buffer_point;
  int old_position = BUF_PT (buffer);
  int backwards = (charpos < old_position ? 1 : 0);
  int have_overlays;
  int original_position;

set_intervals_multibyte_1 (i, multi_flag, start, start_byte, end, end_byte)
     INTERVAL i;
     int multi_flag;
     int start, start_byte, end, end_byte;
{
  /* Fix the length of this interval.  */
  if (multi_flag)
    i->total_length = end - start;
  else
    i->total_length = end_byte - start_byte;