diff 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.

--- a/src/intervals.c	Sun Jul 14 23:54:05 2002 +0000
+++ b/src/intervals.c	Mon Jul 15 00:00:41 2002 +0000
@@ -80,8 +80,8 @@
     }
   else if (STRINGP (parent))
     {
-      new->total_length = XSTRING (parent)->size;
-      XSTRING (parent)->intervals = new;
+      new->total_length = SCHARS (parent);
+      STRING_INTERVALS (parent) = new;
       new->position = 0;
     }
 
@@ -452,7 +452,7 @@
       if (BUFFERP (parent))
 	BUF_INTERVALS (XBUFFER (parent)) = interval;
       else if (STRINGP (parent))
-	XSTRING (parent)->intervals = interval;
+	STRING_INTERVALS (parent) = interval;
     }
 
   return interval;
@@ -1280,7 +1280,7 @@
       if (BUFFERP (owner))
 	BUF_INTERVALS (XBUFFER (owner)) = parent;
       else if (STRINGP (owner))
-	XSTRING (owner)->intervals = parent;
+	STRING_INTERVALS (owner) = parent;
       else
 	abort ();
 
@@ -2247,7 +2247,7 @@
   else if (BUFFERP (object))
     i = find_interval (BUF_INTERVALS (XBUFFER (object)), pos);
   else if (STRINGP (object))
-    i = find_interval (XSTRING (object)->intervals, pos);
+    i = find_interval (STRING_INTERVALS (object), pos);
   else
     abort ();
 
@@ -2384,7 +2384,7 @@
     return;
 
   SET_INTERVAL_OBJECT (interval_copy, string);
-  XSTRING (string)->intervals = interval_copy;
+  STRING_INTERVALS (string) = interval_copy;
 }
 
 /* Return 1 if strings S1 and S2 have identical properties; 0 otherwise.
@@ -2396,10 +2396,10 @@
 {
   INTERVAL i1, i2;
   int pos = 0;
-  int end = XSTRING (s1)->size;
+  int end = SCHARS (s1);
 
-  i1 = find_interval (XSTRING (s1)->intervals, 0);
-  i2 = find_interval (XSTRING (s2)->intervals, 0);
+  i1 = find_interval (STRING_INTERVALS (s1), 0);
+  i2 = find_interval (STRING_INTERVALS (s2), 0);
 
   while (pos < end)
     {