comparison src/intervals.c @ 46370:40db0673e6f0

Most uses of XSTRING combined with STRING_BYTES or indirection changed to SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references left unchanged for now.

46369:dd1d3b1d0053

      BUF_INTERVALS (XBUFFER (parent)) = new;
      new->position = 1;
    }
  else if (STRINGP (parent))
    {
      new->total_length = XSTRING (parent)->size;
      XSTRING (parent)->intervals = new;
      new->position = 0;
    }

  SET_INTERVAL_OBJECT (new, parent);

  if (have_parent)
    {
      if (BUFFERP (parent))
	BUF_INTERVALS (XBUFFER (parent)) = interval;
      else if (STRINGP (parent))
	XSTRING (parent)->intervals = interval;
    }

  return interval;
}

	SET_INTERVAL_OBJECT (parent, owner);

      if (BUFFERP (owner))
	BUF_INTERVALS (XBUFFER (owner)) = parent;
      else if (STRINGP (owner))
	XSTRING (owner)->intervals = parent;
      else
	abort ();

      return;
    }

  if (NILP (object))
    i = find_interval (BUF_INTERVALS (current_buffer), pos);
  else if (BUFFERP (object))
    i = find_interval (BUF_INTERVALS (XBUFFER (object)), pos);
  else if (STRINGP (object))
    i = find_interval (XSTRING (object)->intervals, pos);
  else
    abort ();

  if (NULL_INTERVAL_P (i) || (i->position + LENGTH (i) <= pos))
    return 0;

					   position, length);
  if (NULL_INTERVAL_P (interval_copy))
    return;

  SET_INTERVAL_OBJECT (interval_copy, string);
  XSTRING (string)->intervals = interval_copy;
}

/* Return 1 if strings S1 and S2 have identical properties; 0 otherwise.
   Assume they have identical characters.  */

compare_string_intervals (s1, s2)
     Lisp_Object s1, s2;
{
  INTERVAL i1, i2;
  int pos = 0;
  int end = XSTRING (s1)->size;

  i1 = find_interval (XSTRING (s1)->intervals, 0);
  i2 = find_interval (XSTRING (s2)->intervals, 0);

  while (pos < end)
    {
      /* Determine how far we can go before we reach the end of I1 or I2.  */
      int len1 = (i1 != 0 ? INTERVAL_LAST_POS (i1) : end) - pos;

46370:40db0673e6f0

      BUF_INTERVALS (XBUFFER (parent)) = new;
      new->position = 1;
    }
  else if (STRINGP (parent))
    {
      new->total_length = SCHARS (parent);
      STRING_INTERVALS (parent) = new;
      new->position = 0;
    }

  SET_INTERVAL_OBJECT (new, parent);

  if (have_parent)
    {
      if (BUFFERP (parent))
	BUF_INTERVALS (XBUFFER (parent)) = interval;
      else if (STRINGP (parent))
	STRING_INTERVALS (parent) = interval;
    }

  return interval;
}

	SET_INTERVAL_OBJECT (parent, owner);

      if (BUFFERP (owner))
	BUF_INTERVALS (XBUFFER (owner)) = parent;
      else if (STRINGP (owner))
	STRING_INTERVALS (owner) = parent;
      else
	abort ();

      return;
    }

  if (NILP (object))
    i = find_interval (BUF_INTERVALS (current_buffer), pos);
  else if (BUFFERP (object))
    i = find_interval (BUF_INTERVALS (XBUFFER (object)), pos);
  else if (STRINGP (object))
    i = find_interval (STRING_INTERVALS (object), pos);
  else
    abort ();

  if (NULL_INTERVAL_P (i) || (i->position + LENGTH (i) <= pos))
    return 0;

					   position, length);
  if (NULL_INTERVAL_P (interval_copy))
    return;

  SET_INTERVAL_OBJECT (interval_copy, string);
  STRING_INTERVALS (string) = interval_copy;
}

/* Return 1 if strings S1 and S2 have identical properties; 0 otherwise.
   Assume they have identical characters.  */

compare_string_intervals (s1, s2)
     Lisp_Object s1, s2;
{
  INTERVAL i1, i2;
  int pos = 0;
  int end = SCHARS (s1);

  i1 = find_interval (STRING_INTERVALS (s1), 0);
  i2 = find_interval (STRING_INTERVALS (s2), 0);

  while (pos < end)
    {
      /* Determine how far we can go before we reach the end of I1 or I2.  */
      int len1 = (i1 != 0 ? INTERVAL_LAST_POS (i1) : end) - pos;