/* Code for doing intervals.
- Copyright (C) 1993 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994, 1995, 1997, 1998 Free Software Foundation, Inc.
This file is part of GNU Emacs.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
/* NOTES:
*/
-#include "config.h"
+#include <config.h>
#include "lisp.h"
#include "intervals.h"
#include "buffer.h"
+#include "puresize.h"
+#include "keyboard.h"
-/* The rest of the file is within this conditional. */
-#ifdef USE_TEXT_PROPERTIES
+/* Test for membership, allowing for t (actually any non-cons) to mean the
+ universal set. */
-/* Factor for weight-balancing interval trees. */
-Lisp_Object interval_balance_threshold;
+#define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set))
+
+#define min(x, y) ((x) < (y) ? (x) : (y))
+
+Lisp_Object merge_properties_sticky ();
+static INTERVAL reproduce_tree P_ ((INTERVAL, INTERVAL));
+static INTERVAL reproduce_tree_obj P_ ((INTERVAL, Lisp_Object));
\f
/* Utility functions for intervals. */
create_root_interval (parent)
Lisp_Object parent;
{
- INTERVAL new = make_interval ();
+ INTERVAL new;
+
+ CHECK_IMPURE (parent);
- if (XTYPE (parent) == Lisp_Buffer)
+ new = make_interval ();
+
+ if (BUFFERP (parent))
{
new->total_length = (BUF_Z (XBUFFER (parent))
- BUF_BEG (XBUFFER (parent)));
- XBUFFER (parent)->intervals = new;
+ BUF_INTERVALS (XBUFFER (parent)) = new;
+ new->position = 1;
}
- else if (XTYPE (parent) == Lisp_String)
+ else if (STRINGP (parent))
{
new->total_length = XSTRING (parent)->size;
XSTRING (parent)->intervals = new;
+ new->position = 0;
}
- new->parent = (INTERVAL) parent;
- new->position = 1;
+ SET_INTERVAL_OBJECT (new, parent);
return new;
}
INTERVAL i0, i1;
{
register Lisp_Object i0_cdr, i0_sym, i1_val;
- register i1_len;
+ register int i1_len;
if (DEFAULT_INTERVAL_P (i0) && DEFAULT_INTERVAL_P (i1))
return 1;
return 1;
}
\f
-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. */
traverse_intervals (tree, position, depth, function, arg)
INTERVAL tree;
int position, depth;
- void (* function) ();
+ void (* function) P_ ((INTERVAL, Lisp_Object));
Lisp_Object arg;
{
if (NULL_INTERVAL_P (tree))
}
\f
#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;
register INTERVAL i = interval;
while (! ROOT_INTERVAL_P (i))
- i = i->parent;
+ i = INTERVAL_PARENT (i);
return i;
}
{
INTERVAL i;
INTERVAL B = interval->left;
- int len = LENGTH (interval);
+ 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 = interval->left;
- else
- interval->parent->right = interval->left;
- interval->left->parent = interval->parent;
-
- /* B gets the same length as A, since it get A's position in the tree. */
- interval->left->total_length = interval->total_length;
+ {
+ if (AM_LEFT_CHILD (interval))
+ INTERVAL_PARENT (interval)->left = B;
+ else
+ INTERVAL_PARENT (interval)->right = B;
+ }
+ COPY_INTERVAL_PARENT (B, interval);
- /* B becomes the parent of A. */
- i = interval->left->right;
- interval->left->right = interval;
- interval->parent = interval->left;
+ /* Make B the parent of A */
+ i = B->right;
+ B->right = interval;
+ SET_INTERVAL_PARENT (interval, B);
- /* A gets c as left child. */
+ /* Make A point to c */
interval->left = i;
if (! NULL_INTERVAL_P (i))
- i->parent = interval;
- interval->total_length = (len + LEFT_TOTAL_LENGTH (interval)
- + RIGHT_TOTAL_LENGTH (interval));
+ SET_INTERVAL_PARENT (i, interval);
+
+ /* A's total length is decreased by the length of B and its left child. */
+ interval->total_length -= B->total_length - LEFT_TOTAL_LENGTH (interval);
+
+ /* B must have the same total length of A. */
+ B->total_length = old_total;
return B;
}
-\f
+
/* Assuming that a right child exists, perform the following operation:
A B
{
INTERVAL i;
INTERVAL B = interval->right;
- int len = LENGTH (interval);
+ int old_total = interval->total_length;
- /* Deal with the parent of A. */
+ /* Deal with any parent of A; make it point to B. */
if (! ROOT_INTERVAL_P (interval))
- if (AM_LEFT_CHILD (interval))
- interval->parent->left = interval->right;
- else
- interval->parent->right = interval->right;
- interval->right->parent = interval->parent;
-
- /* B must have the same total length of A. */
- interval->right->total_length = interval->total_length;
+ {
+ if (AM_LEFT_CHILD (interval))
+ INTERVAL_PARENT (interval)->left = B;
+ else
+ INTERVAL_PARENT (interval)->right = B;
+ }
+ COPY_INTERVAL_PARENT (B, interval);
/* Make B the parent of A */
- i = interval->right->left;
- interval->right->left = interval;
- interval->parent = interval->right;
+ i = B->left;
+ B->left = interval;
+ SET_INTERVAL_PARENT (interval, B);
/* Make A point to c */
interval->right = i;
if (! NULL_INTERVAL_P (i))
- i->parent = interval;
- interval->total_length = (len + LEFT_TOTAL_LENGTH (interval)
- + RIGHT_TOTAL_LENGTH (interval));
+ SET_INTERVAL_PARENT (i, interval);
+
+ /* A's total length is decreased by the length of B and its right child. */
+ interval->total_length -= B->total_length - RIGHT_TOTAL_LENGTH (interval);
+
+ /* B must have the same total length of A. */
+ B->total_length = old_total;
return B;
}
\f
+/* Balance an interval tree with the assumption that the subtrees
+ themselves are already balanced. */
+
+static INTERVAL
+balance_an_interval (i)
+ INTERVAL i;
+{
+ register int old_diff, new_diff;
+
+ while (1)
+ {
+ old_diff = LEFT_TOTAL_LENGTH (i) - RIGHT_TOTAL_LENGTH (i);
+ if (old_diff > 0)
+ {
+ new_diff = i->total_length - i->left->total_length
+ + RIGHT_TOTAL_LENGTH (i->left) - LEFT_TOTAL_LENGTH (i->left);
+ if (abs (new_diff) >= old_diff)
+ break;
+ i = rotate_right (i);
+ balance_an_interval (i->right);
+ }
+ else if (old_diff < 0)
+ {
+ new_diff = i->total_length - i->right->total_length
+ + LEFT_TOTAL_LENGTH (i->right) - RIGHT_TOTAL_LENGTH (i->right);
+ if (abs (new_diff) >= -old_diff)
+ break;
+ i = rotate_left (i);
+ balance_an_interval (i->left);
+ }
+ else
+ break;
+ }
+ return i;
+}
+
+/* Balance INTERVAL, potentially stuffing it back into its parent
+ Lisp Object. */
+
+static INLINE INTERVAL
+balance_possible_root_interval (interval)
+ register INTERVAL interval;
+{
+ Lisp_Object parent;
+ int have_parent = 0;
+
+ if (!INTERVAL_HAS_OBJECT (interval) && !INTERVAL_HAS_PARENT (interval))
+ return interval;
+
+ if (INTERVAL_HAS_OBJECT (interval))
+ {
+ have_parent = 1;
+ GET_INTERVAL_OBJECT (parent, interval);
+ }
+ interval = balance_an_interval (interval);
+
+ if (have_parent)
+ {
+ if (BUFFERP (parent))
+ BUF_INTERVALS (XBUFFER (parent)) = interval;
+ else if (STRINGP (parent))
+ XSTRING (parent)->intervals = interval;
+ }
+
+ return interval;
+}
+
+/* Balance the interval tree TREE. Balancing is by weight
+ (the amount of text). */
+
+static INTERVAL
+balance_intervals_internal (tree)
+ register INTERVAL tree;
+{
+ /* Balance within each side. */
+ if (tree->left)
+ balance_intervals_internal (tree->left);
+ if (tree->right)
+ balance_intervals_internal (tree->right);
+ return balance_an_interval (tree);
+}
+
+/* Advertised interface to balance intervals. */
+
+INTERVAL
+balance_intervals (tree)
+ INTERVAL tree;
+{
+ if (tree == NULL_INTERVAL)
+ return NULL_INTERVAL;
+
+ return balance_intervals_internal (tree);
+}
+\f
/* Split INTERVAL into two pieces, starting the second piece at
character position OFFSET (counting from 0), relative to INTERVAL.
INTERVAL becomes the left-hand piece, and the right-hand piece
int new_length = LENGTH (interval) - offset;
new->position = position + offset;
- new->parent = interval;
+ SET_INTERVAL_PARENT (new, interval);
- if (LEAF_INTERVAL_P (interval) || NULL_RIGHT_CHILD (interval))
+ if (NULL_RIGHT_CHILD (interval))
{
interval->right = new;
new->total_length = new_length;
-
- return new;
}
-
- /* Insert the new node between INTERVAL and its right child. */
- new->right = interval->right;
- interval->right->parent = new;
- interval->right = new;
-
- new->total_length = new_length + new->right->total_length;
+ else
+ {
+ /* Insert the new node between INTERVAL and its right child. */
+ new->right = interval->right;
+ SET_INTERVAL_PARENT (interval->right, new);
+ interval->right = new;
+ new->total_length = new_length + new->right->total_length;
+ balance_an_interval (new);
+ }
+
+ balance_possible_root_interval (interval);
return new;
}
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;
+ SET_INTERVAL_PARENT (new, interval);
if (NULL_LEFT_CHILD (interval))
{
interval->left = new;
new->total_length = new_length;
-
- return new;
}
-
- /* Insert the new node between INTERVAL and its left child. */
- new->left = interval->left;
- new->left->parent = new;
- interval->left = new;
- new->total_length = new_length + LEFT_TOTAL_LENGTH (new);
+ else
+ {
+ /* Insert the new node between INTERVAL and its left child. */
+ new->left = interval->left;
+ SET_INTERVAL_PARENT (new->left, new);
+ interval->left = new;
+ new->total_length = new_length + new->left->total_length;
+ balance_an_interval (new);
+ }
+
+ balance_possible_root_interval (interval);
return new;
}
\f
+/* Return the proper position for the first character
+ described by the interval tree SOURCE.
+ This is 1 if the parent is a buffer,
+ 0 if the parent is a string or if there is no parent.
+
+ Don't use this function on an interval which is the child
+ of another interval! */
+
+int
+interval_start_pos (source)
+ INTERVAL source;
+{
+ Lisp_Object parent;
+
+ if (NULL_INTERVAL_P (source))
+ return 0;
+
+ if (! INTERVAL_HAS_OBJECT (source))
+ return 0;
+ GET_INTERVAL_OBJECT (parent, source);
+ if (BUFFERP (parent))
+ return BUF_BEG (XBUFFER (parent));
+ return 0;
+}
+
/* Find the interval containing text position POSITION in the text
represented by the interval tree TREE. POSITION is a buffer
- position; the earliest position is 1. If POSITION is at the end of
- the buffer, return the interval containing the last character.
+ position (starting from 1) or a string index (starting from 0).
+ If POSITION is at the end of the buffer or string,
+ return the interval containing the last character.
The `position' field, which is a cache of an interval's position,
is updated in the interval found. Other functions (e.g., next_interval)
will update this cache based on the result of find_interval. */
-INLINE INTERVAL
+INTERVAL
find_interval (tree, position)
register INTERVAL tree;
register int position;
{
/* The distance from the left edge of the subtree at TREE
to POSITION. */
- register int relative_position = position - BEG;
+ register int relative_position;
if (NULL_INTERVAL_P (tree))
return NULL_INTERVAL;
+ relative_position = position;
+ if (INTERVAL_HAS_OBJECT (tree))
+ {
+ Lisp_Object parent;
+ GET_INTERVAL_OBJECT (parent, tree);
+ if (BUFFERP (parent))
+ relative_position -= BUF_BEG (XBUFFER (parent));
+ }
+
if (relative_position > TOTAL_LENGTH (tree))
abort (); /* Paranoia */
+ tree = balance_possible_root_interval (tree);
+
while (1)
{
if (relative_position < LEFT_TOTAL_LENGTH (tree))
}
else
{
- tree->position =
- (position - relative_position /* the left edge of *tree */
- + LEFT_TOTAL_LENGTH (tree)); /* the left edge of this interval */
+ tree->position
+ = (position - relative_position /* the left edge of *tree */
+ + LEFT_TOTAL_LENGTH (tree)); /* the left edge of this interval */
return tree;
}
{
if (AM_LEFT_CHILD (i))
{
- i = i->parent;
+ i = INTERVAL_PARENT (i);
i->position = next_position;
return i;
}
- i = i->parent;
+ i = INTERVAL_PARENT (i);
}
return NULL_INTERVAL;
register INTERVAL interval;
{
register INTERVAL i;
- register position_of_previous;
if (NULL_INTERVAL_P (interval))
return NULL_INTERVAL;
{
if (AM_RIGHT_CHILD (i))
{
- i = i->parent;
+ i = INTERVAL_PARENT (i);
i->position = interval->position - LENGTH (i);
return i;
}
- i = i->parent;
+ i = INTERVAL_PARENT (i);
}
return NULL_INTERVAL;
}
+
+/* Find the interval containing POS given some non-NULL INTERVAL
+ in the same tree. Note that we need to update interval->position
+ if we go down the tree. */
+INTERVAL
+update_interval (i, pos)
+ register INTERVAL i;
+ int pos;
+{
+ if (NULL_INTERVAL_P (i))
+ return NULL_INTERVAL;
+
+ while (1)
+ {
+ if (pos < i->position)
+ {
+ /* Move left. */
+ if (pos >= i->position - TOTAL_LENGTH (i->left))
+ {
+ i->left->position = i->position - TOTAL_LENGTH (i->left)
+ + LEFT_TOTAL_LENGTH (i->left);
+ i = i->left; /* Move to the left child */
+ }
+ else if (NULL_PARENT (i))
+ error ("Point before start of properties");
+ else
+ i = INTERVAL_PARENT (i);
+ continue;
+ }
+ else if (pos >= INTERVAL_LAST_POS (i))
+ {
+ /* Move right. */
+ if (pos < INTERVAL_LAST_POS (i) + TOTAL_LENGTH (i->right))
+ {
+ i->right->position = INTERVAL_LAST_POS (i) +
+ LEFT_TOTAL_LENGTH (i->right);
+ i = i->right; /* Move to the right child */
+ }
+ else if (NULL_PARENT (i))
+ error ("Point after end of properties");
+ else
+ i = INTERVAL_PARENT (i);
+ continue;
+ }
+ else
+ return i;
+ }
+}
+
\f
#if 0
/* Traverse a path down the interval tree TREE to the interval
Modifications are needed to handle the hungry bits -- after simply
finding the interval at position (don't add length going down),
if it's the beginning of the interval, get the previous interval
- and check the hugry bits of both. Then add the length going back up
+ and check the hungry bits of both. Then add the length going back up
to the root. */
static INTERVAL
/* Effect an adjustment corresponding to the addition of LENGTH characters
of text. Do this by finding the interval containing POSITION in the
- interval tree TREE, and then adjusting all of it's ancestors by adding
+ interval tree TREE, and then adjusting all of its ancestors by adding
LENGTH to them.
If POSITION is the first character of an interval, meaning that point
register INTERVAL i;
register INTERVAL temp;
int eobp = 0;
+ Lisp_Object parent;
+ int offset;
if (TOTAL_LENGTH (tree) == 0) /* Paranoia */
abort ();
+ GET_INTERVAL_OBJECT (parent, tree);
+ offset = (BUFFERP (parent) ? BUF_BEG (XBUFFER (parent)) : 0);
+
/* If inserting at point-max of a buffer, that position will be out
of range. Remember that buffer positions are 1-based. */
- if (position >= BEG + TOTAL_LENGTH (tree)){
- position = BEG + TOTAL_LENGTH (tree);
- eobp = 1;
- }
+ if (position >= TOTAL_LENGTH (tree) + offset)
+ {
+ position = TOTAL_LENGTH (tree) + offset;
+ eobp = 1;
+ }
i = find_interval (tree, position);
+ /* If in middle of an interval which is not sticky either way,
+ we must not just give its properties to the insertion.
+ So split this interval at the insertion point.
+
+ Originally, the if condition here was this:
+ (! (position == i->position || eobp)
+ && END_NONSTICKY_P (i)
+ && FRONT_NONSTICKY_P (i))
+ But, these macros are now unreliable because of introduction of
+ Vtext_property_default_nonsticky. So, we always check properties
+ one by one if POSITION is in middle of an interval. */
+ if (! (position == i->position || eobp))
+ {
+ Lisp_Object tail;
+ Lisp_Object front, rear;
+
+ tail = i->plist;
+
+ /* Properties font-sticky and rear-nonsticky override
+ Vtext_property_default_nonsticky. So, if they are t, we can
+ skip one by one checking of properties. */
+ rear = textget (i->plist, Qrear_nonsticky);
+ if (! CONSP (rear) && ! NILP (rear))
+ {
+ /* All properties are nonsticky. We split the interval. */
+ goto check_done;
+ }
+ front = textget (i->plist, Qfront_sticky);
+ if (! CONSP (front) && ! NILP (front))
+ {
+ /* All properties are sticky. We don't split the interval. */
+ tail = Qnil;
+ goto check_done;
+ }
+
+ /* Does any actual property pose an actual problem? We break
+ the loop if we find a nonsticky property. */
+ for (; CONSP (tail); tail = Fcdr (XCDR (tail)))
+ {
+ Lisp_Object prop, tmp;
+ prop = XCAR (tail);
+
+ /* Is this particular property front-sticky? */
+ if (CONSP (front) && ! NILP (Fmemq (prop, front)))
+ continue;
+
+ /* Is this particular property rear-nonsticky? */
+ if (CONSP (rear) && ! NILP (Fmemq (prop, rear)))
+ break;
+
+ /* Is this particular property recorded as sticky or
+ nonsticky in Vtext_property_default_nonsticky? */
+ tmp = Fassq (prop, Vtext_property_default_nonsticky);
+ if (CONSP (tmp))
+ {
+ if (NILP (tmp))
+ continue;
+ break;
+ }
+
+ /* By default, a text property is rear-sticky, thus we
+ continue the loop. */
+ }
+
+ check_done:
+ /* If any property is a real problem, split the interval. */
+ if (! NILP (tail))
+ {
+ temp = split_interval_right (i, position - i->position);
+ copy_properties (i, temp);
+ i = temp;
+ }
+ }
+
/* If we are positioned between intervals, check the stickiness of
both of them. We have to do this too, if we are at BEG or Z. */
if (position == i->position || eobp)
/* Even if we are positioned between intervals, we default
to the left one if it exists. We extend it now and split
- off a part later, if stickyness demands it. */
- for (temp = prev ? prev : i; ! NULL_INTERVAL_P (temp); temp = temp->parent)
- temp->total_length += length;
+ off a part later, if stickiness demands it. */
+ for (temp = prev ? prev : i; temp; temp = INTERVAL_PARENT_OR_NULL (temp))
+ {
+ temp->total_length += length;
+ temp = balance_possible_root_interval (temp);
+ }
/* If at least one interval has sticky properties,
- we check the stickyness property by property. */
- if (END_NONSTICKY_P (prev) || FRONT_STICKY_P (i))
+ we check the stickiness property by property.
+
+ Originally, the if condition here was this:
+ (END_NONSTICKY_P (prev) || FRONT_STICKY_P (i))
+ But, these macros are now unreliable because of introduction
+ of Vtext_property_default_nonsticky. So, we always have to
+ check stickiness of properties one by one. If cache of
+ stickiness is implemented in the future, we may be able to
+ use those macros again. */
+ if (1)
{
- Lisp_Object pleft = NULL_INTERVAL_P (prev) ? Qnil : prev->plist;
- Lisp_Object pright = NULL_INTERVAL_P (i) ? Qnil : i->plist;
+ Lisp_Object pleft, pright;
struct interval newi;
+ pleft = NULL_INTERVAL_P (prev) ? Qnil : prev->plist;
+ pright = NULL_INTERVAL_P (i) ? Qnil : i->plist;
newi.plist = merge_properties_sticky (pleft, pright);
- if(! prev) /* i.e. position == BEG */
+ if (! prev) /* i.e. position == BEG */
{
if (! intervals_equal (i, &newi))
{
/* Otherwise just extend the interval. */
else
{
- for (temp = i; ! NULL_INTERVAL_P (temp); temp = temp->parent)
- temp->total_length += length;
+ for (temp = i; temp; temp = INTERVAL_PARENT_OR_NULL (temp))
+ {
+ temp->total_length += length;
+ temp = balance_possible_root_interval (temp);
+ }
}
return tree;
}
+/* Any property might be front-sticky on the left, rear-sticky on the left,
+ front-sticky on the right, or rear-sticky on the right; the 16 combinations
+ can be arranged in a matrix with rows denoting the left conditions and
+ columns denoting the right conditions:
+ _ __ _
+_ FR FR FR FR
+FR__ 0 1 2 3
+ _FR 4 5 6 7
+FR 8 9 A B
+ FR C D E F
+
+ left-props = '(front-sticky (p8 p9 pa pb pc pd pe pf)
+ rear-nonsticky (p4 p5 p6 p7 p8 p9 pa pb)
+ p0 L p1 L p2 L p3 L p4 L p5 L p6 L p7 L
+ p8 L p9 L pa L pb L pc L pd L pe L pf L)
+ right-props = '(front-sticky (p2 p3 p6 p7 pa pb pe pf)
+ rear-nonsticky (p1 p2 p5 p6 p9 pa pd pe)
+ p0 R p1 R p2 R p3 R p4 R p5 R p6 R p7 R
+ p8 R p9 R pa R pb R pc R pd R pe R pf R)
+
+ We inherit from whoever has a sticky side facing us. If both sides
+ do (cases 2, 3, E, and F), then we inherit from whichever side has a
+ non-nil value for the current property. If both sides do, then we take
+ from the left.
+
+ When we inherit a property, we get its stickiness as well as its value.
+ So, when we merge the above two lists, we expect to get this:
+
+ result = '(front-sticky (p6 p7 pa pb pc pd pe pf)
+ rear-nonsticky (p6 pa)
+ p0 L p1 L p2 L p3 L p6 R p7 R
+ pa R pb R pc L pd L pe L pf L)
+
+ The optimizable special cases are:
+ left rear-nonsticky = nil, right front-sticky = nil (inherit left)
+ left rear-nonsticky = t, right front-sticky = t (inherit right)
+ left rear-nonsticky = t, right front-sticky = nil (inherit none)
+*/
+
Lisp_Object
merge_properties_sticky (pleft, pright)
Lisp_Object pleft, pright;
{
- register Lisp_Object props = Qnil, front = Qnil, rear = Qnil;
-
- Lisp_Object lfront = textget (pleft, Qfront_sticky);
- Lisp_Object lrear = textget (pleft, Qrear_nonsticky);
- Lisp_Object rfront = textget (pright, Qfront_sticky);
- Lisp_Object rrear = textget (pright, Qrear_nonsticky);
-
- register Lisp_Object tail1, tail2, sym;
-
- /* Go through each element of PLEFT. */
- for (tail1 = pleft; ! NILP (tail1); tail1 = Fcdr (Fcdr (tail1)))
+ register Lisp_Object props, front, rear;
+ Lisp_Object lfront, lrear, rfront, rrear;
+ register Lisp_Object tail1, tail2, sym, lval, rval, cat;
+ int use_left, use_right;
+ int lpresent;
+
+ props = Qnil;
+ front = Qnil;
+ rear = Qnil;
+ lfront = textget (pleft, Qfront_sticky);
+ lrear = textget (pleft, Qrear_nonsticky);
+ rfront = textget (pright, Qfront_sticky);
+ rrear = textget (pright, Qrear_nonsticky);
+
+ /* Go through each element of PRIGHT. */
+ for (tail1 = pright; CONSP (tail1); tail1 = Fcdr (Fcdr (tail1)))
{
+ Lisp_Object tmp;
+
sym = Fcar (tail1);
/* Sticky properties get special treatment. */
if (EQ (sym, Qrear_nonsticky) || EQ (sym, Qfront_sticky))
continue;
-
- if (NILP (Fmemq (sym, lrear)))
+
+ rval = Fcar (Fcdr (tail1));
+ for (tail2 = pleft; CONSP (tail2); tail2 = Fcdr (Fcdr (tail2)))
+ if (EQ (sym, Fcar (tail2)))
+ break;
+
+ /* Indicate whether the property is explicitly defined on the left.
+ (We know it is defined explicitly on the right
+ because otherwise we don't get here.) */
+ lpresent = ! NILP (tail2);
+ lval = (NILP (tail2) ? Qnil : Fcar (Fcdr (tail2)));
+
+ /* Even if lrear or rfront say nothing about the stickiness of
+ SYM, Vtext_property_default_nonsticky may give default
+ stickiness to SYM. */
+ tmp = Fassq (sym, Vtext_property_default_nonsticky);
+ use_left = (lpresent
+ && ! (TMEM (sym, lrear)
+ || CONSP (tmp) && ! NILP (XCDR (tmp))));
+ use_right = (TMEM (sym, rfront)
+ || (CONSP (tmp) && NILP (XCDR (tmp))));
+ if (use_left && use_right)
{
- /* rear-sticky is dominant, we needn't search in PRIGHT. */
-
- props = Fcons (sym, Fcons (Fcar (Fcdr (tail1)), props));
- if (! NILP (Fmemq (sym, lfront)))
+ if (NILP (lval))
+ use_left = 0;
+ else if (NILP (rval))
+ use_right = 0;
+ }
+ if (use_left)
+ {
+ /* We build props as (value sym ...) rather than (sym value ...)
+ because we plan to nreverse it when we're done. */
+ props = Fcons (lval, Fcons (sym, props));
+ if (TMEM (sym, lfront))
front = Fcons (sym, front);
+ if (TMEM (sym, lrear))
+ rear = Fcons (sym, rear);
}
- else
+ else if (use_right)
{
- /* Go through PRIGHT, looking for sym. */
- for (tail2 = pright; ! NILP (tail2); tail2 = Fcdr (Fcdr (tail2)))
- if (EQ (sym, Fcar (tail2)))
- {
-
- if (! NILP (Fmemq (sym, rfront)))
- {
- /* Nonsticky at the left and sticky at the right,
- so take the right one. */
- props = Fcons (sym, Fcons (Fcar (Fcdr (tail2)), props));
- front = Fcons (sym, front);
- if (! NILP (Fmemq (sym, rrear)))
- rear = Fcons (sym, rear);
- }
- break;
- }
+ props = Fcons (rval, Fcons (sym, props));
+ if (TMEM (sym, rfront))
+ front = Fcons (sym, front);
+ if (TMEM (sym, rrear))
+ rear = Fcons (sym, rear);
}
}
- /* Now let's see what to keep from PRIGHT. */
- for (tail2 = pright; ! NILP (tail2); tail2 = Fcdr (Fcdr (tail2)))
+
+ /* Now go through each element of PLEFT. */
+ for (tail2 = pleft; CONSP (tail2); tail2 = Fcdr (Fcdr (tail2)))
{
+ Lisp_Object tmp;
+
sym = Fcar (tail2);
/* Sticky properties get special treatment. */
if (EQ (sym, Qrear_nonsticky) || EQ (sym, Qfront_sticky))
continue;
- /* If it ain't sticky, we don't take it. */
- if (NILP (Fmemq (sym, rfront)))
- continue;
-
- /* If sym is in PLEFT we already got it. */
- for (tail1 = pleft; ! NILP (tail1); tail1 = Fcdr (Fcdr (tail1)))
+ /* If sym is in PRIGHT, we've already considered it. */
+ for (tail1 = pright; CONSP (tail1); tail1 = Fcdr (Fcdr (tail1)))
if (EQ (sym, Fcar (tail1)))
break;
-
- if (NILP (tail1))
+ if (! NILP (tail1))
+ continue;
+
+ lval = Fcar (Fcdr (tail2));
+
+ /* Even if lrear or rfront say nothing about the stickiness of
+ SYM, Vtext_property_default_nonsticky may give default
+ stickiness to SYM. */
+ tmp = Fassq (sym, Vtext_property_default_nonsticky);
+
+ /* Since rval is known to be nil in this loop, the test simplifies. */
+ if (! (TMEM (sym, lrear) || (CONSP (tmp) && ! NILP (XCDR (tmp)))))
+ {
+ props = Fcons (lval, Fcons (sym, props));
+ if (TMEM (sym, lfront))
+ front = Fcons (sym, front);
+ }
+ else if (TMEM (sym, rfront) || (CONSP (tmp) && NILP (XCDR (tmp))))
{
- props = Fcons (sym, Fcons (Fcar (Fcdr (tail2)), props));
+ /* The value is nil, but we still inherit the stickiness
+ from the right. */
front = Fcons (sym, front);
- if (! NILP (Fmemq (sym, rrear)))
+ if (TMEM (sym, rrear))
rear = Fcons (sym, rear);
}
}
- if (! NILP (front))
- props = Fcons (Qfront_sticky, Fcons (front, props));
+ props = Fnreverse (props);
if (! NILP (rear))
- props = Fcons (Qrear_nonsticky, Fcons (rear, props));
+ props = Fcons (Qrear_nonsticky, Fcons (Fnreverse (rear), props));
+
+ cat = textget (props, Qcategory);
+ if (! NILP (front)
+ &&
+ /* If we have inherited a front-stick category property that is t,
+ we don't need to set up a detailed one. */
+ ! (! NILP (cat) && SYMBOLP (cat)
+ && EQ (Fget (cat, Qfront_sticky), Qt)))
+ props = Fcons (Qfront_sticky, Fcons (Fnreverse (front), props));
return props;
-
}
\f
this->total_length += migrate_amt;
}
this->left = migrate;
- migrate->parent = this;
+ SET_INTERVAL_PARENT (migrate, this);
return i->right;
}
if (ROOT_INTERVAL_P (i))
{
- Lisp_Object owner = (Lisp_Object) i->parent;
+ Lisp_Object owner;
+ GET_INTERVAL_OBJECT (owner, i);
parent = delete_node (i);
if (! NULL_INTERVAL_P (parent))
- parent->parent = (INTERVAL) owner;
+ SET_INTERVAL_OBJECT (parent, owner);
- if (XTYPE (owner) == Lisp_Buffer)
- XBUFFER (owner)->intervals = parent;
- else if (XTYPE (owner) == Lisp_String)
+ if (BUFFERP (owner))
+ BUF_INTERVALS (XBUFFER (owner)) = parent;
+ else if (STRINGP (owner))
XSTRING (owner)->intervals = parent;
else
abort ();
return;
}
- parent = i->parent;
+ parent = INTERVAL_PARENT (i);
if (AM_LEFT_CHILD (i))
{
parent->left = delete_node (i);
if (! NULL_INTERVAL_P (parent->left))
- parent->left->parent = parent;
+ SET_INTERVAL_PARENT (parent->left, parent);
}
else
{
parent->right = delete_node (i);
if (! NULL_INTERVAL_P (parent->right))
- parent->right->parent = parent;
+ SET_INTERVAL_PARENT (parent->right, parent);
}
}
\f
int start, length;
{
register int left_to_delete = length;
- register INTERVAL tree = buffer->intervals;
- register int deleted;
+ register INTERVAL tree = BUF_INTERVALS (buffer);
+ Lisp_Object parent;
+ int offset;
+
+ GET_INTERVAL_OBJECT (parent, tree);
+ offset = (BUFFERP (parent) ? BUF_BEG (XBUFFER (parent)) : 0);
if (NULL_INTERVAL_P (tree))
return;
- if (start > BEG + TOTAL_LENGTH (tree)
- || start + length > BEG + TOTAL_LENGTH (tree))
+ if (start > offset + TOTAL_LENGTH (tree)
+ || start + length > offset + TOTAL_LENGTH (tree))
abort ();
if (length == TOTAL_LENGTH (tree))
{
- buffer->intervals = NULL_INTERVAL;
+ BUF_INTERVALS (buffer) = NULL_INTERVAL;
return;
}
return;
}
- if (start > BEG + TOTAL_LENGTH (tree))
- start = BEG + TOTAL_LENGTH (tree);
+ if (start > offset + TOTAL_LENGTH (tree))
+ start = offset + TOTAL_LENGTH (tree);
while (left_to_delete > 0)
{
- left_to_delete -= interval_deletion_adjustment (tree, start - 1,
+ left_to_delete -= interval_deletion_adjustment (tree, start - offset,
left_to_delete);
- tree = buffer->intervals;
+ tree = BUF_INTERVALS (buffer);
if (left_to_delete == tree->total_length)
{
- buffer->intervals = NULL_INTERVAL;
+ BUF_INTERVALS (buffer) = NULL_INTERVAL;
return;
}
}
struct buffer *buffer;
int start, length;
{
- if (NULL_INTERVAL_P (buffer->intervals) || length == 0)
+ if (NULL_INTERVAL_P (BUF_INTERVALS (buffer)) || length == 0)
return;
if (length > 0)
- adjust_intervals_for_insertion (buffer->intervals, start, length);
+ adjust_intervals_for_insertion (BUF_INTERVALS (buffer), start, length);
else
adjust_intervals_for_deletion (buffer, start, -length);
}
{
if (AM_LEFT_CHILD (successor))
{
- successor = successor->parent;
+ successor = INTERVAL_PARENT (successor);
delete_interval (i);
return successor;
}
- successor = successor->parent;
+ successor = INTERVAL_PARENT (successor);
successor->total_length -= absorb;
}
{
if (AM_RIGHT_CHILD (predecessor))
{
- predecessor = predecessor->parent;
+ predecessor = INTERVAL_PARENT (predecessor);
delete_interval (i);
return predecessor;
}
- predecessor = predecessor->parent;
+ predecessor = INTERVAL_PARENT (predecessor);
predecessor->total_length -= absorb;
}
bcopy (source, t, INTERVAL_SIZE);
copy_properties (source, t);
- t->parent = parent;
+ SET_INTERVAL_PARENT (t, parent);
+ if (! NULL_LEFT_CHILD (source))
+ t->left = reproduce_tree (source->left, t);
+ if (! NULL_RIGHT_CHILD (source))
+ t->right = reproduce_tree (source->right, t);
+
+ return t;
+}
+
+static INTERVAL
+reproduce_tree_obj (source, parent)
+ INTERVAL source;
+ Lisp_Object parent;
+{
+ register INTERVAL t = make_interval ();
+
+ bcopy (source, t, INTERVAL_SIZE);
+ copy_properties (source, t);
+ SET_INTERVAL_OBJECT (t, parent);
if (! NULL_LEFT_CHILD (source))
t->left = reproduce_tree (source->left, t);
if (! NULL_RIGHT_CHILD (source))
#endif
\f
/* Insert the intervals of SOURCE into BUFFER at POSITION.
+ LENGTH is the length of the text in SOURCE.
+
+ The `position' field of the SOURCE intervals is assumed to be
+ consistent with its parent; therefore, SOURCE must be an
+ interval tree made with copy_interval or must be the whole
+ tree of a buffer or a string.
This is used in insdel.c when inserting Lisp_Strings into the
buffer. The text corresponding to SOURCE is already in the buffer
belonging to the string being inserted; intervals are never
shared.
- If the inserted text had no intervals associated, this function
+ If the inserted text had no intervals associated, and we don't
+ want to inherit the surrounding text's properties, this function
simply returns -- offset_intervals should handle placing the
text in the correct interval, depending on the sticky bits.
text... */
void
-graft_intervals_into_buffer (source, position, buffer)
+graft_intervals_into_buffer (source, position, length, buffer, inherit)
INTERVAL source;
- int position;
+ int position, length;
struct buffer *buffer;
+ int inherit;
{
register INTERVAL under, over, this, prev;
- register INTERVAL tree = buffer->intervals;
+ register INTERVAL tree;
int middle;
+ tree = BUF_INTERVALS (buffer);
+
/* If the new text has no properties, it becomes part of whatever
interval it was inserted into. */
if (NULL_INTERVAL_P (source))
- return;
+ {
+ Lisp_Object buf;
+ if (!inherit && ! NULL_INTERVAL_P (tree))
+ {
+ int saved_inhibit_modification_hooks = inhibit_modification_hooks;
+ XSETBUFFER (buf, buffer);
+ inhibit_modification_hooks = 1;
+ Fset_text_properties (make_number (position),
+ make_number (position + length),
+ Qnil, buf);
+ inhibit_modification_hooks = saved_inhibit_modification_hooks;
+ }
+ if (! NULL_INTERVAL_P (BUF_INTERVALS (buffer)))
+ BUF_INTERVALS (buffer) = balance_an_interval (BUF_INTERVALS (buffer));
+ return;
+ }
if (NULL_INTERVAL_P (tree))
{
if ((BUF_Z (buffer) - BUF_BEG (buffer)) == TOTAL_LENGTH (source))
{
Lisp_Object buf;
- XSET (buf, Lisp_Buffer, buffer);
- buffer->intervals = reproduce_tree (source, buf);
- /* Explicitly free the old tree here. */
+ XSETBUFFER (buf, buffer);
+ BUF_INTERVALS (buffer) = reproduce_tree_obj (source, buf);
+ BUF_INTERVALS (buffer)->position = 1;
+
+ /* Explicitly free the old tree here? */
return;
}
of the intervals of the inserted string. */
{
Lisp_Object buf;
- XSET (buf, Lisp_Buffer, buffer);
+ XSETBUFFER (buf, buffer);
tree = create_root_interval (buf);
}
}
- else
- if (TOTAL_LENGTH (tree) == TOTAL_LENGTH (source))
- /* If the buffer contains only the new string, but
- there was already some interval tree there, then it may be
- some zero length intervals. Eventually, do something clever
- about inserting properly. For now, just waste the old intervals. */
- {
- buffer->intervals = reproduce_tree (source, tree->parent);
- /* Explicitly free the old tree here. */
+ else if (TOTAL_LENGTH (tree) == TOTAL_LENGTH (source))
+ /* If the buffer contains only the new string, but
+ there was already some interval tree there, then it may be
+ some zero length intervals. Eventually, do something clever
+ about inserting properly. For now, just waste the old intervals. */
+ {
+ BUF_INTERVALS (buffer) = reproduce_tree (source, INTERVAL_PARENT (tree));
+ BUF_INTERVALS (buffer)->position = 1;
+ /* Explicitly free the old tree here. */
- return;
- }
- else
- /* Paranoia -- the text has already been added, so this buffer
- should be of non-zero length. */
- if (TOTAL_LENGTH (tree) == 0)
- abort ();
+ return;
+ }
+ /* Paranoia -- the text has already been added, so this buffer
+ should be of non-zero length. */
+ else if (TOTAL_LENGTH (tree) == 0)
+ abort ();
this = under = find_interval (tree, position);
if (NULL_INTERVAL_P (under)) /* Paranoia */
abort ();
- over = find_interval (source, 1);
+ over = find_interval (source, interval_start_pos (source));
/* Here for insertion in the middle of an interval.
Split off an equivalent interval to the right,
= split_interval_left (this, position - under->position);
copy_properties (under, end_unchanged);
under->position = position;
+#if 0
+ /* This code has no effect. */
prev = 0;
middle = 1;
+#endif /* 0 */
}
else
{
+ /* This call may have some effect because previous_interval may
+ update `position' fields of intervals. Thus, don't ignore it
+ for the moment. Someone please tell me the truth (K.Handa). */
prev = previous_interval (under);
+#if 0
+ /* But, this code surely has no effect. And, anyway,
+ END_NONSTICKY_P is unreliable now. */
if (prev && !END_NONSTICKY_P (prev))
prev = 0;
+#endif /* 0 */
}
/* Insertion is now at beginning of UNDER. */
/* The inserted text "sticks" to the interval `under',
which means it gets those properties.
The properties of under are the result of
- adjust_intervals_for_insertion, so stickyness has
+ adjust_intervals_for_insertion, so stickiness has
already been taken care of. */
while (! NULL_INTERVAL_P (over))
{
- if (LENGTH (over) + 1 < LENGTH (under))
+ if (LENGTH (over) < LENGTH (under))
{
this = split_interval_left (under, LENGTH (over));
copy_properties (under, this);
else
this = under;
copy_properties (over, this);
- if (MERGE_INSERTIONS (this))
+ if (inherit)
merge_properties (over, this);
else
copy_properties (over, this);
over = next_interval (over);
}
- buffer->intervals = balance_intervals (buffer->intervals);
+ if (! NULL_INTERVAL_P (BUF_INTERVALS (buffer)))
+ BUF_INTERVALS (buffer) = balance_an_interval (BUF_INTERVALS (buffer));
return;
}
/* Get the value of property PROP from PLIST,
which is the plist of an interval.
- We check for direct properties and for categories with property PROP. */
+ We check for direct properties, for categories with property PROP,
+ and for PROP appearing on the default-text-properties list. */
Lisp_Object
textget (plist, prop)
if (EQ (prop, tem))
return Fcar (Fcdr (tail));
if (EQ (tem, Qcategory))
- fallback = Fget (Fcar (Fcdr (tail)), prop);
+ {
+ tem = Fcar (Fcdr (tail));
+ if (SYMBOLP (tem))
+ fallback = Fget (tem, prop);
+ }
}
- return fallback;
+ if (! NILP (fallback))
+ return fallback;
+ if (CONSP (Vdefault_text_properties))
+ return Fplist_get (Vdefault_text_properties, prop);
+ return Qnil;
}
-/* Get the value of property PROP from PLIST,
- which is the plist of an interval.
- We check for direct properties only! */
+\f
+/* Set point "temporarily", without checking any text properties. */
-Lisp_Object
-textget_direct (plist, prop)
- Lisp_Object plist;
- register Lisp_Object prop;
+INLINE void
+temp_set_point (buffer, charpos)
+ struct buffer *buffer;
+ int charpos;
{
- register Lisp_Object tail;
+ temp_set_point_both (buffer, charpos,
+ buf_charpos_to_bytepos (buffer, charpos));
+}
- for (tail = plist; !NILP (tail); tail = Fcdr (Fcdr (tail)))
- {
- if (EQ (prop, Fcar (tail)))
- return Fcar (Fcdr (tail));
- }
+/* Set point in BUFFER "temporarily" to CHARPOS, which corresponds to
+ byte position BYTEPOS. */
- return Qnil;
+INLINE void
+temp_set_point_both (buffer, charpos, bytepos)
+ int charpos, bytepos;
+ struct buffer *buffer;
+{
+ /* In a single-byte buffer, the two positions must be equal. */
+ if (BUF_ZV (buffer) == BUF_ZV_BYTE (buffer)
+ && charpos != bytepos)
+ abort ();
+
+ if (charpos > bytepos)
+ abort ();
+
+ if (charpos > BUF_ZV (buffer) || charpos < BUF_BEGV (buffer))
+ abort ();
+
+ BUF_PT_BYTE (buffer) = bytepos;
+ BUF_PT (buffer) = charpos;
}
-\f
-/* Set point in BUFFER to POSITION. If the target position is
- before an invisible character which is not displayed with a special glyph,
- move back to an ok place to display. */
+
+/* Set point in BUFFER to CHARPOS. If the target position is
+ before an intangible character, move to an ok place. */
void
-set_point (position, buffer)
- register int position;
+set_point (buffer, charpos)
register struct buffer *buffer;
+ register int charpos;
{
- register INTERVAL to, from, toprev, fromprev, target;
+ set_point_both (buffer, charpos, buf_charpos_to_bytepos (buffer, charpos));
+}
+
+/* Set point in BUFFER to CHARPOS, which corresponds to byte
+ position BYTEPOS. If the target position is
+ before an intangible character, move to an ok place. */
+
+void
+set_point_both (buffer, charpos, bytepos)
+ register struct buffer *buffer;
+ register int charpos, bytepos;
+{
+ register INTERVAL to, from, toprev, fromprev;
int buffer_point;
- register Lisp_Object obj;
- int backwards = (position < BUF_PT (buffer)) ? 1 : 0;
- int old_position = buffer->text.pt;
+ int old_position = BUF_PT (buffer);
+ int backwards = (charpos < old_position ? 1 : 0);
+ int have_overlays;
+ int original_position;
+
+ buffer->point_before_scroll = Qnil;
- if (position == buffer->text.pt)
+ if (charpos == BUF_PT (buffer))
return;
+ /* In a single-byte buffer, the two positions must be equal. */
+ if (BUF_ZV (buffer) == BUF_ZV_BYTE (buffer)
+ && charpos != bytepos)
+ abort ();
+
/* Check this now, before checking if the buffer has any intervals.
That way, we can catch conditions which break this sanity check
whether or not there are intervals in the buffer. */
- if (position > BUF_Z (buffer) || position < BUF_BEG (buffer))
+ if (charpos > BUF_ZV (buffer) || charpos < BUF_BEGV (buffer))
abort ();
- if (NULL_INTERVAL_P (buffer->intervals))
+ have_overlays = (! NILP (buffer->overlays_before)
+ || ! NILP (buffer->overlays_after));
+
+ /* If we have no text properties and overlays,
+ then we can do it quickly. */
+ if (NULL_INTERVAL_P (BUF_INTERVALS (buffer)) && ! have_overlays)
{
- buffer->text.pt = position;
+ temp_set_point_both (buffer, charpos, bytepos);
return;
}
- /* Set TO to the interval containing the char after POSITION,
- and TOPREV to the interval containing the char before POSITION.
+ /* Set TO to the interval containing the char after CHARPOS,
+ and TOPREV to the interval containing the char before CHARPOS.
Either one may be null. They may be equal. */
- to = find_interval (buffer->intervals, position);
- if (position == BUF_BEGV (buffer))
+ to = find_interval (BUF_INTERVALS (buffer), charpos);
+ if (charpos == BUF_BEGV (buffer))
toprev = 0;
- else if (to->position == position)
+ else if (to && to->position == charpos)
toprev = previous_interval (to);
else
toprev = to;
and FROMPREV to the interval containing the char before PT.
Either one may be null. They may be equal. */
/* We could cache this and save time. */
- from = find_interval (buffer->intervals, buffer_point);
+ from = find_interval (BUF_INTERVALS (buffer), buffer_point);
if (buffer_point == BUF_BEGV (buffer))
fromprev = 0;
- else if (from->position == BUF_PT (buffer))
+ else if (from && from->position == BUF_PT (buffer))
fromprev = previous_interval (from);
else if (buffer_point != BUF_PT (buffer))
fromprev = from, from = 0;
fromprev = from;
/* Moving within an interval. */
- if (to == from && toprev == fromprev && INTERVAL_VISIBLE_P (to))
+ if (to == from && toprev == fromprev && INTERVAL_VISIBLE_P (to)
+ && ! have_overlays)
{
- buffer->text.pt = position;
+ temp_set_point_both (buffer, charpos, bytepos);
return;
}
- /* If the new position is before an invisible character
- that has an `invisible' property of value `hidden',
- move forward over all such. */
- while (! NULL_INTERVAL_P (to)
- && EQ (textget (to->plist, Qinvisible), Qhidden)
- && ! DISPLAY_INVISIBLE_GLYPH (to))
+ original_position = charpos;
+
+ /* If the new position is between two intangible characters
+ with the same intangible property value,
+ move forward or backward until a change in that property. */
+ if (NILP (Vinhibit_point_motion_hooks)
+ && ((! NULL_INTERVAL_P (to) && ! NULL_INTERVAL_P (toprev))
+ || have_overlays)
+ /* Intangibility never stops us from positioning at the beginning
+ or end of the buffer, so don't bother checking in that case. */
+ && charpos != BEGV && charpos != ZV)
{
- toprev = to;
- to = next_interval (to);
- if (NULL_INTERVAL_P (to))
- position = BUF_ZV (buffer);
+ Lisp_Object intangible_propval;
+ Lisp_Object pos;
+
+ XSETINT (pos, charpos);
+
+ if (backwards)
+ {
+ intangible_propval = Fget_char_property (make_number (charpos),
+ Qintangible, Qnil);
+
+ /* If following char is intangible,
+ skip back over all chars with matching intangible property. */
+ if (! NILP (intangible_propval))
+ while (XINT (pos) > BUF_BEGV (buffer)
+ && EQ (Fget_char_property (make_number (XINT (pos) - 1),
+ Qintangible, Qnil),
+ intangible_propval))
+ pos = Fprevious_char_property_change (pos, Qnil);
+ }
else
- position = to->position;
+ {
+ intangible_propval = Fget_char_property (make_number (charpos - 1),
+ Qintangible, Qnil);
+
+ /* If following char is intangible,
+ skip forward over all chars with matching intangible property. */
+ if (! NILP (intangible_propval))
+ while (XINT (pos) < BUF_ZV (buffer)
+ && EQ (Fget_char_property (pos, Qintangible, Qnil),
+ intangible_propval))
+ pos = Fnext_char_property_change (pos, Qnil);
+
+ }
+
+ charpos = XINT (pos);
+ bytepos = buf_charpos_to_bytepos (buffer, charpos);
}
- buffer->text.pt = position;
+ if (charpos != original_position)
+ {
+ /* Set TO to the interval containing the char after CHARPOS,
+ and TOPREV to the interval containing the char before CHARPOS.
+ Either one may be null. They may be equal. */
+ to = find_interval (BUF_INTERVALS (buffer), charpos);
+ if (charpos == BUF_BEGV (buffer))
+ toprev = 0;
+ else if (to && to->position == charpos)
+ toprev = previous_interval (to);
+ else
+ toprev = to;
+ }
+
+ /* Here TO is the interval after the stopping point
+ and TOPREV is the interval before the stopping point.
+ One or the other may be null. */
+
+ temp_set_point_both (buffer, charpos, bytepos);
/* We run point-left and point-entered hooks here, iff the
two intervals are not equivalent. These hooks take
enter_before = Qnil;
if (! EQ (leave_before, enter_before) && !NILP (leave_before))
- call2 (leave_before, old_position, position);
+ call2 (leave_before, make_number (old_position),
+ make_number (charpos));
if (! EQ (leave_after, enter_after) && !NILP (leave_after))
- call2 (leave_after, old_position, position);
+ call2 (leave_after, make_number (old_position),
+ make_number (charpos));
if (! EQ (enter_before, leave_before) && !NILP (enter_before))
- call2 (enter_before, old_position, position);
+ call2 (enter_before, make_number (old_position),
+ make_number (charpos));
if (! EQ (enter_after, leave_after) && !NILP (enter_after))
- call2 (enter_after, old_position, position);
+ call2 (enter_after, make_number (old_position),
+ make_number (charpos));
}
}
-
-/* Set point temporarily, without checking any text properties. */
-
-INLINE void
-temp_set_point (position, buffer)
- int position;
- struct buffer *buffer;
-{
- buffer->text.pt = position;
-}
\f
-/* Return the proper local map for position POSITION in BUFFER.
- Use the map specified by the local-map property, if any.
- Otherwise, use BUFFER's local map. */
+/* Move point to POSITION, unless POSITION is inside an intangible
+ segment that reaches all the way to point. */
-Lisp_Object
-get_local_map (position, buffer)
- register int position;
- register struct buffer *buffer;
+void
+move_if_not_intangible (position)
+ int position;
{
- register INTERVAL interval;
- Lisp_Object prop, tem;
-
- if (NULL_INTERVAL_P (buffer->intervals))
- return current_buffer->keymap;
-
- /* Perhaps we should just change `position' to the limit. */
- if (position > BUF_Z (buffer) || position < BUF_BEG (buffer))
- abort ();
-
- interval = find_interval (buffer->intervals, position);
- prop = textget (interval->plist, Qlocal_map);
- if (NILP (prop))
- return current_buffer->keymap;
+ Lisp_Object pos;
+ Lisp_Object intangible_propval;
- /* Use the local map only if it is valid. */
- tem = Fkeymapp (prop);
- if (!NILP (tem))
- return prop;
-
- return current_buffer->keymap;
-}
-\f
-/* Call the modification hook functions in LIST, each with START and END. */
+ XSETINT (pos, position);
-static void
-call_mod_hooks (list, start, end)
- Lisp_Object list, start, end;
-{
- struct gcpro gcpro1;
- GCPRO1 (list);
- while (!NILP (list))
+ if (! NILP (Vinhibit_point_motion_hooks))
+ /* If intangible is inhibited, always move point to POSITION. */
+ ;
+ else if (PT < position && XINT (pos) < ZV)
{
- call2 (Fcar (list), start, end);
- list = Fcdr (list);
+ /* We want to move forward, so check the text before POSITION. */
+
+ intangible_propval = Fget_char_property (pos,
+ Qintangible, Qnil);
+
+ /* If following char is intangible,
+ skip back over all chars with matching intangible property. */
+ if (! NILP (intangible_propval))
+ while (XINT (pos) > BEGV
+ && EQ (Fget_char_property (make_number (XINT (pos) - 1),
+ Qintangible, Qnil),
+ intangible_propval))
+ pos = Fprevious_char_property_change (pos, Qnil);
}
- UNGCPRO;
-}
-
-/* Check for read-only intervals and signal an error if we find one.
- Then check for any modification hooks in the range START up to
- (but not including) TO. Create a list of all these hooks in
- lexicographic order, eliminating consecutive extra copies of the
- same hook. Then call those hooks in order, with START and END - 1
- as arguments. */
-
-void
-verify_interval_modification (buf, start, end)
- struct buffer *buf;
- int start, end;
-{
- register INTERVAL intervals = buf->intervals;
- register INTERVAL i, prev;
- Lisp_Object hooks;
- register Lisp_Object prev_mod_hooks;
- Lisp_Object mod_hooks;
- struct gcpro gcpro1;
-
- hooks = Qnil;
- prev_mod_hooks = Qnil;
- mod_hooks = Qnil;
-
- if (NULL_INTERVAL_P (intervals))
- return;
-
- if (start > end)
+ else if (XINT (pos) > BEGV)
{
- int temp = start;
- start = end;
- end = temp;
- }
+ /* We want to move backward, so check the text after POSITION. */
- /* For an insert operation, check the two chars around the position. */
- if (start == end)
- {
- INTERVAL prev;
- Lisp_Object before, after;
+ intangible_propval = Fget_char_property (make_number (XINT (pos) - 1),
+ Qintangible, Qnil);
- /* Set I to the interval containing the char after START,
- and PREV to the interval containing the char before START.
- Either one may be null. They may be equal. */
- i = find_interval (intervals, start);
+ /* If following char is intangible,
+ skip forward over all chars with matching intangible property. */
+ if (! NILP (intangible_propval))
+ while (XINT (pos) < ZV
+ && EQ (Fget_char_property (pos, Qintangible, Qnil),
+ intangible_propval))
+ pos = Fnext_char_property_change (pos, Qnil);
- if (start == BUF_BEGV (buf))
- prev = 0;
- else if (i->position == start)
- prev = previous_interval (i);
- else if (i->position < start)
- prev = i;
- if (start == BUF_ZV (buf))
- i = 0;
-
- /* If Vinhibit_read_only is set and is not a list, we can
- skip the read_only checks. */
- if (NILP (Vinhibit_read_only) || CONSP (Vinhibit_read_only))
- {
- /* If I and PREV differ we need to check for the read-only
- property together with its stickyness. If either I or
- PREV are 0, this check is all we need.
- We have to take special care, since read-only may be
- indirectly defined via the category property. */
- if (i != prev)
- {
- if (! NULL_INTERVAL_P (i))
- {
- after = textget (i->plist, Qread_only);
-
- /* If interval I is read-only and read-only is
- front-sticky, inhibit insertion.
- Check for read-only as well as category. */
- if (! NILP (after)
- && NILP (Fmemq (after, Vinhibit_read_only))
- && (! NILP (Fmemq (Qread_only,
- textget (i->plist, Qfront_sticky)))
- || (NILP (textget_direct (i->plist, Qread_only))
- && ! NILP (Fmemq (Qcategory,
- textget (i->plist,
- Qfront_sticky))))))
- error ("Attempt to insert within read-only text");
- }
- else
- after = Qnil;
- if (! NULL_INTERVAL_P (prev))
- {
- before = textget (prev->plist, Qread_only);
-
- /* If interval PREV is read-only and read-only isn't
- rear-nonsticky, inhibit insertion.
- Check for read-only as well as category. */
- if (! NILP (before)
- && NILP (Fmemq (before, Vinhibit_read_only))
- && NILP (Fmemq (Qread_only,
- textget (prev->plist, Qrear_nonsticky)))
- && (! NILP (textget_direct (prev->plist,Qread_only))
- || NILP (Fmemq (Qcategory,
- textget (prev->plist,
- Qrear_nonsticky)))))
- error ("Attempt to insert within read-only text");
- }
- else
- before = Qnil;
- }
- else if (! NULL_INTERVAL_P (i))
- before = after = textget (i->plist, Qread_only);
- if (! NULL_INTERVAL_P (i) && ! NULL_INTERVAL_P (prev))
- {
- /* If I and PREV differ, neither of them has a sticky
- read-only property. It only remains to check, whether
- they have a common read-only property. */
- if (! NILP (before) && EQ (before, after))
- error ("Attempt to insert within read-only text");
- }
- }
-
- /* Run both insert hooks (just once if they're the same). */
- if (!NULL_INTERVAL_P (prev))
- prev_mod_hooks = textget (prev->plist, Qinsert_behind_hooks);
- if (!NULL_INTERVAL_P (i))
- mod_hooks = textget (i->plist, Qinsert_in_front_hooks);
- GCPRO1 (mod_hooks);
- if (! NILP (prev_mod_hooks))
- call_mod_hooks (prev_mod_hooks, make_number (start),
- make_number (end));
- UNGCPRO;
- if (! NILP (mod_hooks) && ! EQ (mod_hooks, prev_mod_hooks))
- call_mod_hooks (mod_hooks, make_number (start), make_number (end));
}
- else
- {
- /* Loop over intervals on or next to START...END,
- collecting their hooks. */
- i = find_interval (intervals, start);
- do
- {
- if (! INTERVAL_WRITABLE_P (i))
- error ("Attempt to modify read-only text");
-
- mod_hooks = textget (i->plist, Qmodification_hooks);
- if (! NILP (mod_hooks) && ! EQ (mod_hooks, prev_mod_hooks))
- {
- hooks = Fcons (mod_hooks, hooks);
- prev_mod_hooks = mod_hooks;
- }
+ /* If the whole stretch between PT and POSITION isn't intangible,
+ try moving to POSITION (which means we actually move farther
+ if POSITION is inside of intangible text). */
- i = next_interval (i);
- }
- /* Keep going thru the interval containing the char before END. */
- while (! NULL_INTERVAL_P (i) && i->position < end);
-
- GCPRO1 (hooks);
- hooks = Fnreverse (hooks);
- while (! EQ (hooks, Qnil))
- {
- call_mod_hooks (Fcar (hooks), make_number (start),
- make_number (end));
- hooks = Fcdr (hooks);
- }
- UNGCPRO;
- }
+ if (XINT (pos) != PT)
+ SET_PT (position);
}
+\f
+/* If text at position POS has property PROP, set *VAL to the property
+ value, *START and *END to the beginning and end of a region that
+ has the same property, and return 1. Otherwise return 0.
-/* Balance an interval node if the amount of text in its left and right
- subtrees differs by more than the percentage specified by
- `interval-balance-threshold'. */
+ OBJECT is the string or buffer to look for the property in;
+ nil means the current buffer. */
-static INTERVAL
-balance_an_interval (i)
- INTERVAL i;
+int
+get_property_and_range (pos, prop, val, start, end, object)
+ int pos;
+ Lisp_Object prop, *val;
+ int *start, *end;
+ Lisp_Object object;
{
- register int total_children_size = (LEFT_TOTAL_LENGTH (i)
- + RIGHT_TOTAL_LENGTH (i));
- register int threshold = (XFASTINT (interval_balance_threshold)
- * (total_children_size / 100));
+ INTERVAL i, prev, next;
+
+ 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 ();
- /* Balance within each side. */
- balance_intervals (i->left);
- balance_intervals (i->right);
+ if (NULL_INTERVAL_P (i) || (i->position + LENGTH (i) <= pos))
+ return 0;
+ *val = textget (i->plist, prop);
+ if (NILP (*val))
+ return 0;
- if (LEFT_TOTAL_LENGTH (i) > RIGHT_TOTAL_LENGTH (i)
- && (LEFT_TOTAL_LENGTH (i) - RIGHT_TOTAL_LENGTH (i)) > threshold)
- {
- i = rotate_right (i);
- /* If that made it unbalanced the other way, take it back. */
- if (RIGHT_TOTAL_LENGTH (i) > LEFT_TOTAL_LENGTH (i)
- && (RIGHT_TOTAL_LENGTH (i) - LEFT_TOTAL_LENGTH (i)) > threshold)
- return rotate_left (i);
- return i;
- }
+ next = i; /* remember it in advance */
+ prev = previous_interval (i);
+ while (! NULL_INTERVAL_P (prev)
+ && EQ (*val, textget (prev->plist, prop)))
+ i = prev, prev = previous_interval (prev);
+ *start = i->position;
- if (RIGHT_TOTAL_LENGTH (i) > LEFT_TOTAL_LENGTH (i)
- && (RIGHT_TOTAL_LENGTH (i) - LEFT_TOTAL_LENGTH (i)) > threshold)
- {
- i = rotate_left (i);
- if (LEFT_TOTAL_LENGTH (i) > RIGHT_TOTAL_LENGTH (i)
- && (LEFT_TOTAL_LENGTH (i) - RIGHT_TOTAL_LENGTH (i)) > threshold)
- return rotate_right (i);
- return i;
- }
+ next = next_interval (i);
+ while (! NULL_INTERVAL_P (next)
+ && EQ (*val, textget (next->plist, prop)))
+ i = next, next = next_interval (next);
+ *end = i->position + LENGTH (i);
- return i;
+ return 1;
}
+\f
+/* If TYPE is `keymap', return the map specified by the `keymap'
+ property at POSITION in BUFFER or nil.
-/* Balance the interval tree TREE. Balancing is by weight
- (the amount of text). */
+ Otherwise return the proper local map for position POSITION in
+ BUFFER. Use the map specified by the local-map property, if any.
+ Otherwise, use BUFFER's local map. */
-INTERVAL
-balance_intervals (tree)
- register INTERVAL tree;
+Lisp_Object
+get_local_map (position, buffer, type)
+ register int position;
+ register struct buffer *buffer;
+ enum map_property type;
{
- register INTERVAL new_tree;
+ Lisp_Object prop, tem, lispy_position, lispy_buffer;
+ int old_begv, old_zv, old_begv_byte, old_zv_byte;
- if (NULL_INTERVAL_P (tree))
- return NULL_INTERVAL;
+ /* Perhaps we should just change `position' to the limit. */
+ if (position > BUF_Z (buffer) || position < BUF_BEG (buffer))
+ abort ();
- new_tree = tree;
- do
- {
- tree = new_tree;
- new_tree = balance_an_interval (new_tree);
- }
- while (new_tree != tree);
+ /* Ignore narrowing, so that a local map continues to be valid even if
+ the visible region contains no characters and hence no properties. */
+ old_begv = BUF_BEGV (buffer);
+ old_zv = BUF_ZV (buffer);
+ old_begv_byte = BUF_BEGV_BYTE (buffer);
+ old_zv_byte = BUF_ZV_BYTE (buffer);
+ BUF_BEGV (buffer) = BUF_BEG (buffer);
+ BUF_ZV (buffer) = BUF_Z (buffer);
+ BUF_BEGV_BYTE (buffer) = BUF_BEG_BYTE (buffer);
+ BUF_ZV_BYTE (buffer) = BUF_Z_BYTE (buffer);
+
+ /* There are no properties at the end of the buffer, so in that case
+ check for a local map on the last character of the buffer instead. */
+ if (position == BUF_Z (buffer) && BUF_Z (buffer) > BUF_BEG (buffer))
+ --position;
+ XSETFASTINT (lispy_position, position);
+ XSETBUFFER (lispy_buffer, buffer);
+ prop = Fget_char_property (lispy_position,
+ type == keymap ? Qkeymap : Qlocal_map,
+ lispy_buffer);
+
+ BUF_BEGV (buffer) = old_begv;
+ BUF_ZV (buffer) = old_zv;
+ BUF_BEGV_BYTE (buffer) = old_begv_byte;
+ BUF_ZV_BYTE (buffer) = old_zv_byte;
- return new_tree;
-}
+ /* Use the local map only if it is valid. */
+ /* Do allow symbols that are defined as keymaps. */
+ if (SYMBOLP (prop) && !NILP (prop))
+ prop = indirect_function (prop);
+ if (!NILP (prop)
+ && (tem = Fkeymapp (prop), !NILP (tem)))
+ return prop;
+ if (type == keymap)
+ return Qnil;
+ else
+ return buffer->keymap;
+}
+\f
/* Produce an interval tree reflecting the intervals in
- TREE from START to START + LENGTH. */
+ TREE from START to START + LENGTH.
+ The new interval tree has no parent and has a starting-position of 0. */
INTERVAL
copy_intervals (tree, start, length)
return NULL_INTERVAL;
new = make_interval ();
- new->position = 1;
+ new->position = 0;
got = (LENGTH (i) - (start - i->position));
new->total_length = length;
copy_properties (i, new);
got += prevlen;
}
- return balance_intervals (new);
+ return balance_an_interval (new);
}
/* Give STRING the properties of BUFFER from POSITION to LENGTH. */
INLINE void
copy_intervals_to_string (string, buffer, position, length)
- Lisp_Object string, buffer;
+ Lisp_Object string;
+ struct buffer *buffer;
int position, length;
{
- INTERVAL interval_copy = copy_intervals (XBUFFER (buffer)->intervals,
+ INTERVAL interval_copy = copy_intervals (BUF_INTERVALS (buffer),
position, length);
if (NULL_INTERVAL_P (interval_copy))
return;
- interval_copy->parent = (INTERVAL) string;
+ SET_INTERVAL_OBJECT (interval_copy, string);
XSTRING (string)->intervals = interval_copy;
}
+\f
+/* Return 1 if strings S1 and S2 have identical properties; 0 otherwise.
+ Assume they have identical characters. */
-#endif /* USE_TEXT_PROPERTIES */
+int
+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;
+ int len2 = (i2 != 0 ? INTERVAL_LAST_POS (i2) : end) - pos;
+ int distance = min (len1, len2);
+
+ /* If we ever find a mismatch between the strings,
+ they differ. */
+ if (! intervals_equal (i1, i2))
+ return 0;
+
+ /* Advance POS till the end of the shorter interval,
+ and advance one or both interval pointers for the new position. */
+ pos += distance;
+ if (len1 == distance)
+ i1 = next_interval (i1);
+ if (len2 == distance)
+ i2 = next_interval (i2);
+ }
+ return 1;
+}
+\f
+/* Recursively adjust interval I in the current buffer
+ for setting enable_multibyte_characters to MULTI_FLAG.
+ The range of interval I is START ... END in characters,
+ START_BYTE ... END_BYTE in bytes. */
+
+static void
+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;
+
+ /* Recursively fix the length of the subintervals. */
+ if (i->left)
+ {
+ int left_end, left_end_byte;
+
+ if (multi_flag)
+ {
+ left_end_byte = start_byte + LEFT_TOTAL_LENGTH (i);
+ left_end = BYTE_TO_CHAR (left_end_byte);
+ }
+ else
+ {
+ left_end = start + LEFT_TOTAL_LENGTH (i);
+ left_end_byte = CHAR_TO_BYTE (left_end);
+ }
+
+ set_intervals_multibyte_1 (i->left, multi_flag, start, start_byte,
+ left_end, left_end_byte);
+ }
+ if (i->right)
+ {
+ int right_start_byte, right_start;
+
+ if (multi_flag)
+ {
+ right_start_byte = end_byte - RIGHT_TOTAL_LENGTH (i);
+ right_start = BYTE_TO_CHAR (right_start_byte);
+ }
+ else
+ {
+ right_start = end - RIGHT_TOTAL_LENGTH (i);
+ right_start_byte = CHAR_TO_BYTE (right_start);
+ }
+
+ set_intervals_multibyte_1 (i->right, multi_flag,
+ right_start, right_start_byte,
+ end, end_byte);
+ }
+}
+
+/* Update the intervals of the current buffer
+ to fit the contents as multibyte (if MULTI_FLAG is 1)
+ or to fit them as non-multibyte (if MULTI_FLAG is 0). */
+
+void
+set_intervals_multibyte (multi_flag)
+ int multi_flag;
+{
+ if (BUF_INTERVALS (current_buffer))
+ set_intervals_multibyte_1 (BUF_INTERVALS (current_buffer), multi_flag,
+ BEG, BEG_BYTE, Z, Z_BYTE);
+}
HCoop / bpt / emacs.git / blobdiff