/* Code for doing intervals.
- Copyright (C) 1993 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
*/
-#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. */
+/* The rest of the file is within this conditional. */
#ifdef USE_TEXT_PROPERTIES
-/* Factor for weight-balancing interval trees. */
-Lisp_Object interval_balance_threshold;
+/* Test for membership, allowing for t (actually any non-cons) to mean the
+ universal set. */
+
+#define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set))
+
+Lisp_Object merge_properties_sticky ();
\f
-/* Utility functions for intervals. */
+/* Utility functions for intervals. */
-/* Create the root interval of some object, a buffer or string. */
+/* Create the root interval of some object, a buffer or string. */
INTERVAL
create_root_interval (parent)
Lisp_Object parent;
{
- INTERVAL new = make_interval ();
+ INTERVAL new;
+
+ CHECK_IMPURE (parent);
+
+ new = make_interval ();
if (XTYPE (parent) == Lisp_Buffer)
{
- new->total_length = BUF_Z (XBUFFER (parent)) - 1;
+ new->total_length = (BUF_Z (XBUFFER (parent))
+ - BUF_BEG (XBUFFER (parent)));
XBUFFER (parent)->intervals = new;
}
else if (XTYPE (parent) == Lisp_String)
}
/* Return 1 if the two intervals have the same properties,
- 0 otherwise. */
+ 0 otherwise. */
int
intervals_equal (i0, i1)
i0_cdr = i0->plist;
while (!NILP (i0_cdr))
{
- /* Lengths of the two plists were unequal */
+ /* Lengths of the two plists were unequal. */
if (i1_len == 0)
return 0;
i0_sym = Fcar (i0_cdr);
i1_val = Fmemq (i0_sym, i1->plist);
- /* i0 has something i1 doesn't */
+ /* i0 has something i1 doesn't. */
if (EQ (i1_val, Qnil))
return 0;
- /* i0 and i1 both have sym, but it has different values in each */
+ /* i0 and i1 both have sym, but it has different values in each. */
i0_cdr = Fcdr (i0_cdr);
- if (! EQ (i1_val, Fcar (i0_cdr)))
+ if (! EQ (Fcar (Fcdr (i1_val)), Fcar (i0_cdr)))
return 0;
i0_cdr = Fcdr (i0_cdr);
i1_len--;
}
- /* Lengths of the two plists were unequal */
+ /* Lengths of the two plists were unequal. */
if (i1_len > 0)
return 0;
}
\f
#if 0
-/* These functions are temporary, for debugging purposes only. */
+/* These functions are temporary, for debugging purposes only. */
INTERVAL search_interval, found_interval;
{
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. */
+ /* 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;
+ interval->parent->left = B;
else
- interval->parent->right = interval->left;
- interval->left->parent = interval->parent;
+ interval->parent->right = B;
+ B->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;
-
- /* 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;
+ interval->parent = 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));
+
+ /* 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;
+ interval->parent->left = B;
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;
+ interval->parent->right = B;
+ B->parent = interval->parent;
/* Make B the parent of A */
- i = interval->right->left;
- interval->right->left = interval;
- interval->parent = interval->right;
+ i = B->left;
+ B->left = interval;
+ interval->parent = 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));
+
+ /* 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
-/* Split INTERVAL into two pieces, starting the second piece at character
- position OFFSET (counting from 1), relative to INTERVAL. The right-hand
- piece (second, lexicographically) is returned.
+/* 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;
+
+ if (interval->parent == NULL_INTERVAL)
+ return interval;
+
+ parent = (Lisp_Object) (interval->parent);
+ interval = balance_an_interval (interval);
+
+ if (XTYPE (parent) == Lisp_Buffer)
+ XBUFFER (parent)->intervals = interval;
+ else if (XTYPE (parent) == Lisp_String)
+ 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 (tree->left);
+ if (tree->right)
+ balance_intervals (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
+ (second, lexicographically) is returned.
The size and position fields of the two intervals are set based upon
those of the original interval. The property list of the new interval
result.
Note that this does not change the position of INTERVAL; if it is a root,
- it is still a root after this operation. */
+ it is still a root after this operation. */
INTERVAL
split_interval_right (interval, offset)
{
INTERVAL new = make_interval ();
int position = interval->position;
- int new_length = LENGTH (interval) - offset + 1;
+ int new_length = LENGTH (interval) - offset;
- new->position = position + offset - 1;
+ new->position = position + offset;
new->parent = 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. */
+ /* 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;
+ balance_an_interval (new);
+ balance_possible_root_interval (interval);
+
return new;
}
-/* Split INTERVAL into two pieces, starting the second piece at character
- position OFFSET (counting from 1), relative to INTERVAL. The left-hand
- piece (first, lexicographically) is returned.
+/* Split INTERVAL into two pieces, starting the second piece at
+ character position OFFSET (counting from 0), relative to INTERVAL.
+ INTERVAL becomes the right-hand piece, and the left-hand piece
+ (first, lexicographically) is returned.
The size and position fields of the two intervals are set based upon
those of the original interval. The property list of the new interval
result.
Note that this does not change the position of INTERVAL; if it is a root,
- it is still a root after this operation. */
+ it is still a root after this operation. */
INTERVAL
split_interval_left (interval, offset)
{
INTERVAL new = make_interval ();
int position = interval->position;
- int new_length = offset - 1;
+ int new_length = offset;
new->position = interval->position;
- interval->position = interval->position + offset - 1;
+ interval->position = interval->position + offset;
new->parent = interval;
if (NULL_LEFT_CHILD (interval))
return new;
}
- /* Insert the new node between INTERVAL and its left child. */
+ /* 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);
+ new->total_length = new_length + new->left->total_length;
+
+ balance_an_interval (new);
+ balance_possible_root_interval (interval);
return new;
}
\f
/* Find the interval containing text position POSITION in the text
- represented by the interval tree TREE. POSITION is relative to
- the beginning of that 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.
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. */
+ will update this cache based on the result of find_interval. */
INLINE INTERVAL
find_interval (tree, position)
register INTERVAL tree;
register int position;
{
- register int relative_position = position;
+ /* The distance from the left edge of the subtree at TREE
+ to POSITION. */
+ register int relative_position = position - BEG;
if (NULL_INTERVAL_P (tree))
return NULL_INTERVAL;
- if (position > TOTAL_LENGTH (tree))
+ if (relative_position > TOTAL_LENGTH (tree))
abort (); /* Paranoia */
-#if 0
- position = TOTAL_LENGTH (tree);
-#endif
+
+ tree = balance_possible_root_interval (tree);
while (1)
{
- if (relative_position <= LEFT_TOTAL_LENGTH (tree))
+ if (relative_position < LEFT_TOTAL_LENGTH (tree))
{
tree = tree->left;
}
- else if (relative_position > (TOTAL_LENGTH (tree)
- - RIGHT_TOTAL_LENGTH (tree)))
+ else if (! NULL_RIGHT_CHILD (tree)
+ && relative_position >= (TOTAL_LENGTH (tree)
+ - RIGHT_TOTAL_LENGTH (tree)))
{
relative_position -= (TOTAL_LENGTH (tree)
- RIGHT_TOTAL_LENGTH (tree));
}
else
{
- tree->position = LEFT_TOTAL_LENGTH (tree)
- + position - relative_position + 1;
+ tree->position =
+ (position - relative_position /* the left edge of *tree */
+ + LEFT_TOTAL_LENGTH (tree)); /* the left edge of this interval */
+
return tree;
}
}
\f
/* Find the succeeding interval (lexicographically) to INTERVAL.
Sets the `position' field based on that of INTERVAL (see
- find_interval). */
+ find_interval). */
INTERVAL
next_interval (interval)
/* Find the preceding interval (lexicographically) to INTERVAL.
Sets the `position' field based on that of INTERVAL (see
- find_interval). */
+ find_interval). */
INTERVAL
previous_interval (interval)
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
- to the root. */
+ to the root. */
static INTERVAL
adjust_intervals_for_insertion (tree, position, length)
else
{
/* If we are to use zero-length intervals as buffer pointers,
- then this code will have to change. */
+ then this code will have to change. */
this->total_length += length;
this->position = LEFT_TOTAL_LENGTH (this)
+ position - relative_position + 1;
/* 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
If both intervals are "sticky", then make them belong to the left-most
interval. Another possibility would be to create a new interval for
- this text, and make it have the merged properties of both ends. */
+ this text, and make it have the merged properties of both ends. */
static INTERVAL
adjust_intervals_for_insertion (tree, position, length)
int position, length;
{
register INTERVAL i;
-
+ register INTERVAL temp;
+ int eobp = 0;
+
if (TOTAL_LENGTH (tree) == 0) /* Paranoia */
abort ();
- /* If inserting at point-max of a buffer, that position
- will be out of range. */
- if (position > TOTAL_LENGTH (tree))
- position = TOTAL_LENGTH (tree);
+ /* 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;
+ }
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. */
+ if (! (position == i->position || eobp)
+ && END_NONSTICKY_P (i)
+ && ! FRONT_STICKY_P (i))
+ {
+ 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. */
- if (position == i->position
- && position != 1)
+ both of them. We have to do this too, if we are at BEG or Z. */
+ if (position == i->position || eobp)
{
- register INTERVAL prev = previous_interval (i);
+ register INTERVAL prev;
+
+ if (position == BEG)
+ prev = 0;
+ else if (eobp)
+ {
+ prev = i;
+ i = 0;
+ }
+ else
+ prev = previous_interval (i);
+
+ /* 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;
+ 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))
+ {
+ 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 (! intervals_equal (i, &newi))
+ {
+ i = split_interval_left (i, length);
+ i->plist = newi.plist;
+ }
+ }
+ else if (! intervals_equal (prev, &newi))
+ {
+ prev = split_interval_right (prev,
+ position - prev->position);
+ prev->plist = newi.plist;
+ if (! NULL_INTERVAL_P (i)
+ && intervals_equal (prev, i))
+ merge_interval_right (prev);
+ }
- /* If both intervals are sticky here, then default to the
- left-most one. But perhaps we should create a new
- interval here instead... */
- if (END_STICKY_P (prev) || ! FRONT_STICKY_P (i))
- i = prev;
+ /* We will need to update the cache here later. */
+ }
+ else if (! prev && ! NILP (i->plist))
+ {
+ /* Just split off a new interval at the left.
+ Since I wasn't front-sticky, the empty plist is ok. */
+ i = split_interval_left (i, length);
+ }
}
- while (! NULL_INTERVAL_P (i))
+ /* Otherwise just extend the interval. */
+ else
{
- i->total_length += length;
- i = i->parent;
+ for (temp = i; ! NULL_INTERVAL_P (temp); temp = temp->parent)
+ {
+ 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, front, rear;
+ Lisp_Object lfront, lrear, rfront, rrear;
+ register Lisp_Object tail1, tail2, sym, lval, rval;
+ int use_left, use_right;
+
+ 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; ! NILP (tail1); tail1 = Fcdr (Fcdr (tail1)))
+ {
+ sym = Fcar (tail1);
+
+ /* Sticky properties get special treatment. */
+ if (EQ (sym, Qrear_nonsticky) || EQ (sym, Qfront_sticky))
+ continue;
+
+ rval = Fcar (Fcdr (tail1));
+ for (tail2 = pleft; ! NILP (tail2); tail2 = Fcdr (Fcdr (tail2)))
+ if (EQ (sym, Fcar (tail2)))
+ break;
+ lval = (NILP (tail2) ? Qnil : Fcar( Fcdr (tail2)));
+
+ use_left = ! TMEM (sym, lrear);
+ use_right = TMEM (sym, rfront);
+ if (use_left && use_right)
+ {
+ use_left = ! NILP (lval);
+ use_right = ! NILP (rval);
+ }
+ if (use_left)
+ {
+ /* We build props as (value sym ...) rather than (sym value ...)
+ because we plan to nreverse it when we're done. */
+ if (! NILP (lval))
+ props = Fcons (lval, Fcons (sym, props));
+ if (TMEM (sym, lfront))
+ front = Fcons (sym, front);
+ if (TMEM (sym, lrear))
+ rear = Fcons (sym, rear);
+ }
+ else if (use_right)
+ {
+ if (! NILP (rval))
+ props = Fcons (rval, Fcons (sym, props));
+ if (TMEM (sym, rfront))
+ front = Fcons (sym, front);
+ if (TMEM (sym, rrear))
+ rear = Fcons (sym, rear);
+ }
+ }
+
+ /* Now go through each element of PLEFT. */
+ for (tail2 = pleft; ! NILP (tail2); tail2 = Fcdr (Fcdr (tail2)))
+ {
+ sym = Fcar (tail2);
+
+ /* Sticky properties get special treatment. */
+ if (EQ (sym, Qrear_nonsticky) || EQ (sym, Qfront_sticky))
+ continue;
+
+ /* If sym is in PRIGHT, we've already considered it. */
+ for (tail1 = pright; ! NILP (tail1); tail1 = Fcdr (Fcdr (tail1)))
+ if (EQ (sym, Fcar (tail1)))
+ break;
+ if (! NILP (tail1))
+ continue;
+
+ lval = Fcar (Fcdr (tail2));
+
+ /* Since rval is known to be nil in this loop, the test simplifies. */
+ if (! TMEM (sym, lrear))
+ {
+ if (! NILP (lval))
+ props = Fcons (lval, Fcons (sym, props));
+ if (TMEM (sym, lfront))
+ front = Fcons (sym, front);
+ }
+ else if (TMEM (sym, rfront))
+ {
+ /* The value is nil, but we still inherit the stickiness
+ from the right. */
+ front = Fcons (sym, front);
+ if (TMEM (sym, rrear))
+ rear = Fcons (sym, rear);
+ }
+ }
+ props = Fnreverse (props);
+ if (! NILP (rear))
+ props = Fcons (Qrear_nonsticky, Fcons (Fnreverse (rear), props));
+ if (! NILP (front))
+ props = Fcons (Qfront_sticky, Fcons (Fnreverse (front), props));
+ return props;
+}
+
\f
/* Delete an node I from its interval tree by merging its subtrees
into one subtree which is then returned. Caller is responsible for
- storing the resulting subtree into its parent. */
+ storing the resulting subtree into its parent. */
static INTERVAL
delete_node (i)
and properly connecting the resultant subtree.
I is presumed to be empty; that is, no adjustments are made
- for the length of I. */
+ for the length of I. */
void
delete_interval (i)
register INTERVAL parent;
int amt = LENGTH (i);
- if (amt > 0) /* Only used on zero-length intervals now. */
+ if (amt > 0) /* Only used on zero-length intervals now. */
abort ();
if (ROOT_INTERVAL_P (i))
{
- Lisp_Object owner = (Lisp_Object) i->parent;
+ Lisp_Object owner;
+ owner = (Lisp_Object) i->parent;
parent = delete_node (i);
if (! NULL_INTERVAL_P (parent))
parent->parent = (INTERVAL) owner;
}
}
\f
-/* Find the interval in TREE corresponding to the character position FROM
- and delete as much as possible of AMOUNT from that interval, starting
- after the relative position of FROM within it. Return the amount
- actually deleted, and if the interval was zeroed-out, delete that
- interval node from the tree.
+/* Find the interval in TREE corresponding to the relative position
+ FROM and delete as much as possible of AMOUNT from that interval.
+ Return the amount actually deleted, and if the interval was
+ zeroed-out, delete that interval node from the tree.
+
+ Note that FROM is actually origin zero, aka relative to the
+ leftmost edge of tree. This is appropriate since we call ourselves
+ recursively on subtrees.
Do this by recursing down TREE to the interval in question, and
- deleting the appropriate amount of text. */
+ deleting the appropriate amount of text. */
static int
interval_deletion_adjustment (tree, from, amount)
return 0;
/* Left branch */
- if (relative_position <= LEFT_TOTAL_LENGTH (tree))
+ if (relative_position < LEFT_TOTAL_LENGTH (tree))
{
int subtract = interval_deletion_adjustment (tree->left,
relative_position,
return subtract;
}
/* Right branch */
- else if (relative_position > (TOTAL_LENGTH (tree)
- - RIGHT_TOTAL_LENGTH (tree)))
+ else if (relative_position >= (TOTAL_LENGTH (tree)
+ - RIGHT_TOTAL_LENGTH (tree)))
{
int subtract;
tree->total_length -= subtract;
return subtract;
}
- /* Here -- this node */
+ /* Here -- this node. */
else
{
- /* If this is a zero-length, marker interval, then
- we must skip it. */
-
- if (relative_position == LEFT_TOTAL_LENGTH (tree) + 1)
- {
- /* This means we're deleting from the beginning of this interval. */
- register int my_amount = LENGTH (tree);
-
- if (amount < my_amount)
- {
- tree->total_length -= amount;
- return amount;
- }
- else
- {
- tree->total_length -= my_amount;
- if (LENGTH (tree) != 0)
- abort (); /* Paranoia */
-
- delete_interval (tree);
- return my_amount;
- }
- }
- else /* Deleting starting in the middle. */
- {
- register int my_amount = ((tree->total_length
- - RIGHT_TOTAL_LENGTH (tree))
- - relative_position + 1);
-
- if (amount <= my_amount)
- {
- tree->total_length -= amount;
- return amount;
- }
- else
- {
- tree->total_length -= my_amount;
- return my_amount;
- }
- }
+ /* How much can we delete from this interval? */
+ int my_amount = ((tree->total_length
+ - RIGHT_TOTAL_LENGTH (tree))
+ - relative_position);
+
+ if (amount > my_amount)
+ amount = my_amount;
+
+ tree->total_length -= amount;
+ if (LENGTH (tree) == 0)
+ delete_interval (tree);
+
+ return amount;
}
- /* Never reach here */
+ /* Never reach here. */
}
-/* Effect the adjustments necessary to the interval tree of BUFFER
- to correspond to the deletion of LENGTH characters from that buffer
- text. The deletion is effected at position START (relative to the
- buffer). */
+/* Effect the adjustments necessary to the interval tree of BUFFER to
+ correspond to the deletion of LENGTH characters from that buffer
+ text. The deletion is effected at position START (which is a
+ buffer position, i.e. origin 1). */
static void
adjust_intervals_for_deletion (buffer, start, length)
if (NULL_INTERVAL_P (tree))
return;
+ if (start > BEG + TOTAL_LENGTH (tree)
+ || start + length > BEG + TOTAL_LENGTH (tree))
+ abort ();
+
if (length == TOTAL_LENGTH (tree))
{
buffer->intervals = NULL_INTERVAL;
return;
}
- if (start > TOTAL_LENGTH (tree))
- start = TOTAL_LENGTH (tree);
+ if (start > BEG + TOTAL_LENGTH (tree))
+ start = BEG + TOTAL_LENGTH (tree);
while (left_to_delete > 0)
{
- left_to_delete -= interval_deletion_adjustment (tree, start,
+ left_to_delete -= interval_deletion_adjustment (tree, start - 1,
left_to_delete);
tree = buffer->intervals;
if (left_to_delete == tree->total_length)
/* Make the adjustments necessary to the interval tree of BUFFER to
represent an addition or deletion of LENGTH characters starting
at position START. Addition or deletion is indicated by the sign
- of LENGTH. */
+ of LENGTH. */
INLINE void
offset_intervals (buffer, start, length)
IMPORTANT:
The caller must verify that this is not the last (rightmost)
- interval. */
+ interval. */
INTERVAL
merge_interval_right (i)
register int absorb = LENGTH (i);
register INTERVAL successor;
- /* Zero out this interval. */
+ /* Zero out this interval. */
i->total_length -= absorb;
- /* Find the succeeding interval. */
+ /* Find the succeeding interval. */
if (! NULL_RIGHT_CHILD (i)) /* It's below us. Add absorb
- as we descend. */
+ as we descend. */
{
successor = i->right;
while (! NULL_LEFT_CHILD (successor))
successor = i;
while (! NULL_PARENT (successor)) /* It's above us. Subtract as
- we ascend. */
+ we ascend. */
{
if (AM_LEFT_CHILD (successor))
{
}
/* This must be the rightmost or last interval and cannot
- be merged right. The caller should have known. */
+ be merged right. The caller should have known. */
abort ();
}
\f
The properties of I are lost. Interval node I is removed from the tree.
IMPORTANT:
- The caller must verify that this is not the first (leftmost) interval. */
+ The caller must verify that this is not the first (leftmost) interval. */
INTERVAL
merge_interval_left (i)
register int absorb = LENGTH (i);
register INTERVAL predecessor;
- /* Zero out this interval. */
+ /* Zero out this interval. */
i->total_length -= absorb;
- /* Find the preceding interval. */
+ /* Find the preceding interval. */
if (! NULL_LEFT_CHILD (i)) /* It's below us. Go down,
- adding ABSORB as we go. */
+ adding ABSORB as we go. */
{
predecessor = i->left;
while (! NULL_RIGHT_CHILD (predecessor))
predecessor = i;
while (! NULL_PARENT (predecessor)) /* It's above us. Go up,
- subtracting ABSORB. */
+ subtracting ABSORB. */
{
if (AM_RIGHT_CHILD (predecessor))
{
}
/* This must be the leftmost or first interval and cannot
- be merged left. The caller should have known. */
+ be merged left. The caller should have known. */
abort ();
}
\f
/* Make an exact copy of interval tree SOURCE which descends from
PARENT. This is done by recursing through SOURCE, copying
the current interval and its properties, and then adjusting
- the pointers of the copy. */
+ the pointers of the copy. */
static INTERVAL
reproduce_tree (source, parent)
return t;
}
+#if 0
+/* Nobody calls this. Perhaps it's a vestige of an earlier design. */
+
/* Make a new interval of length LENGTH starting at START in the
group of intervals INTERVALS, which is actually an interval tree.
Returns the new interval.
Generate an error if the new positions would overlap an existing
- interval. */
+ interval. */
static INTERVAL
make_new_interval (intervals, start, length)
if (slot->position == start)
{
- /* New right node. */
- split_interval_right (slot, length + 1);
+ /* New right node. */
+ split_interval_right (slot, length);
return slot;
}
if (slot->position + LENGTH (slot) == start + length)
{
- /* New left node. */
- split_interval_left (slot, LENGTH (slot) - length + 1);
+ /* New left node. */
+ split_interval_left (slot, LENGTH (slot) - length);
return slot;
}
- /* Convert interval SLOT into three intervals. */
- split_interval_left (slot, start - slot->position + 1);
- split_interval_right (slot, length + 1);
+ /* Convert interval SLOT into three intervals. */
+ split_interval_left (slot, start - slot->position);
+ split_interval_right (slot, length);
return slot;
}
+#endif
\f
/* Insert the intervals of SOURCE into BUFFER at POSITION.
+ LENGTH is the length of the text in SOURCE.
- This is used in insdel.c when inserting Lisp_Strings into
- the buffer. The text corresponding to SOURCE is already in
- the buffer when this is called. The intervals of new tree are
- those belonging to the string being inserted; a copy is not made.
+ This is used in insdel.c when inserting Lisp_Strings into the
+ buffer. The text corresponding to SOURCE is already in the buffer
+ when this is called. The intervals of new tree are a copy of those
+ 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.
intervals to the new text are "sticky", then the new text retains
only its properties, as if neither sticky property were set. Perhaps
we should consider merging all three sets of properties onto the new
- text... */
+ 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;
int middle;
/* If the new text has no properties, it becomes part of whatever
- interval it was inserted into. */
+ interval it was inserted into. */
if (NULL_INTERVAL_P (source))
- return;
+ {
+ Lisp_Object buf;
+ if (!inherit && ! NULL_INTERVAL_P (tree))
+ {
+ XSET (buf, Lisp_Buffer, buffer);
+ Fset_text_properties (make_number (position),
+ make_number (position + length),
+ Qnil, buf);
+ }
+ if (! NULL_INTERVAL_P (buffer->intervals))
+ buffer->intervals = balance_an_interval (buffer->intervals);
+ return;
+ }
if (NULL_INTERVAL_P (tree))
{
/* The inserted text constitutes the whole buffer, so
- simply copy over the interval structure. */
- if (BUF_Z (buffer) == TOTAL_LENGTH (source))
+ simply copy over the interval structure. */
+ if ((BUF_Z (buffer) - BUF_BEG (buffer)) == TOTAL_LENGTH (source))
{
- buffer->intervals = reproduce_tree (source, tree->parent);
- /* Explicitly free the old tree here. */
+ Lisp_Object buf;
+ XSET (buf, Lisp_Buffer, buffer);
+ buffer->intervals = reproduce_tree (source, buf);
+ /* Explicitly free the old tree here. */
return;
}
/* Create an interval tree in which to place a copy
- of the intervals of the inserted string. */
+ of the intervals of the inserted string. */
{
Lisp_Object buf;
XSET (buf, Lisp_Buffer, 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. */
+ {
+ buffer->intervals = reproduce_tree (source, tree->parent);
+ /* 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 */
if (position > under->position)
{
INTERVAL end_unchanged
- = split_interval_left (this, position - under->position + 1);
+ = split_interval_left (this, position - under->position);
copy_properties (under, end_unchanged);
under->position = position;
prev = 0;
else
{
prev = previous_interval (under);
- if (prev && !END_STICKY_P (prev))
+ if (prev && !END_NONSTICKY_P (prev))
prev = 0;
}
/* Insertion is now at beginning of UNDER. */
/* The inserted text "sticks" to the interval `under',
- which means it gets those properties. */
+ which means it gets those properties.
+ The properties of under are the result of
+ adjust_intervals_for_insertion, so stickyness has
+ already been taken care of. */
+
while (! NULL_INTERVAL_P (over))
{
- position = LENGTH (over) + 1;
- if (position < LENGTH (under))
- this = split_interval_left (under, position);
+ if (LENGTH (over) < LENGTH (under))
+ {
+ this = split_interval_left (under, LENGTH (over));
+ copy_properties (under, this);
+ }
else
this = under;
copy_properties (over, this);
- /* Insertion at the end of an interval, PREV,
- inherits from PREV if PREV is sticky at the end. */
- if (prev && ! FRONT_STICKY_P (under)
- && MERGE_INSERTIONS (prev))
- merge_properties (prev, this);
- /* Maybe it inherits from the following interval
- if that is sticky at the front. */
- else if ((FRONT_STICKY_P (under) || middle)
- && MERGE_INSERTIONS (under))
- merge_properties (under, 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 (buffer->intervals))
+ buffer->intervals = balance_an_interval (buffer->intervals);
return;
}
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;
}
+
+/* Get the value of property PROP from PLIST,
+ which is the plist of an interval.
+ We check for direct properties only! */
+
+Lisp_Object
+textget_direct (plist, prop)
+ Lisp_Object plist;
+ register Lisp_Object prop;
+{
+ register Lisp_Object tail;
+
+ for (tail = plist; !NILP (tail); tail = Fcdr (Fcdr (tail)))
+ {
+ if (EQ (prop, Fcar (tail)))
+ return Fcar (Fcdr (tail));
+ }
+
+ return Qnil;
+}
\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. */
+ before an intangible character, move to an ok place. */
void
set_point (position, buffer)
register struct buffer *buffer;
{
register INTERVAL to, from, toprev, fromprev, target;
- register int iposition = position;
int buffer_point;
register Lisp_Object obj;
int backwards = (position < BUF_PT (buffer)) ? 1 : 0;
return;
}
- /* Position Z is really one past the last char in the buffer. */
- if (position == BUF_ZV (buffer))
- iposition = position - 1;
-
/* Set TO to the interval containing the char after POSITION,
and TOPREV to the interval containing the char before POSITION.
Either one may be null. They may be equal. */
- to = find_interval (buffer->intervals, iposition);
+ to = find_interval (buffer->intervals, position);
if (position == BUF_BEGV (buffer))
toprev = 0;
else if (to->position == position)
toprev = previous_interval (to);
- else if (iposition != position)
- toprev = to, to = 0;
else
toprev = to;
/* Set FROM to the interval containing the char after PT,
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. */
+ /* We could cache this and save time. */
from = find_interval (buffer->intervals, buffer_point);
- if (from->position == BUF_BEGV (buffer))
+ if (buffer_point == BUF_BEGV (buffer))
fromprev = 0;
else if (from->position == BUF_PT (buffer))
fromprev = previous_interval (from);
else
fromprev = from;
- /* Moving within an interval */
+ /* Moving within an interval. */
if (to == from && toprev == fromprev && INTERVAL_VISIBLE_P (to))
{
buffer->text.pt = position;
return;
}
- /* If the new position is before an invisible character,
- move forward over all such. */
- while (! NULL_INTERVAL_P (to)
- && ! INTERVAL_VISIBLE_P (to)
- && ! DISPLAY_INVISIBLE_GLYPH (to))
+ /* If the new position is between two intangible characters,
+ move forward or backward across all such characters. */
+ if (NILP (Vinhibit_point_motion_hooks) && ! NULL_INTERVAL_P (to)
+ && ! NULL_INTERVAL_P (toprev))
{
- toprev = to;
- to = next_interval (to);
- if (NULL_INTERVAL_P (to))
- position = BUF_ZV (buffer);
+ if (backwards)
+ {
+ /* Make sure the following character is intangible
+ if the previous one is. */
+ if (toprev == to
+ || ! NILP (textget (to->plist, Qintangible)))
+ /* Ok, that is so. Back up across intangible text. */
+ while (! NULL_INTERVAL_P (toprev)
+ && ! NILP (textget (toprev->plist, Qintangible)))
+ {
+ to = toprev;
+ toprev = previous_interval (toprev);
+ if (NULL_INTERVAL_P (toprev))
+ position = BUF_BEGV (buffer);
+ else
+ /* This is the only line that's not
+ dual to the following loop.
+ That's because we want the position
+ at the end of TOPREV. */
+ position = to->position;
+ }
+ }
else
- position = to->position;
+ {
+ /* Make sure the previous character is intangible
+ if the following one is. */
+ if (toprev == to
+ || ! NILP (textget (toprev->plist, Qintangible)))
+ /* Ok, that is so. Advance across intangible text. */
+ while (! NULL_INTERVAL_P (to)
+ && ! NILP (textget (to->plist, Qintangible)))
+ {
+ toprev = to;
+ to = next_interval (to);
+ if (NULL_INTERVAL_P (to))
+ position = BUF_ZV (buffer);
+ else
+ position = to->position;
+ }
+ }
+ /* 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. */
}
buffer->text.pt = position;
/* We run point-left and point-entered hooks here, iff the
two intervals are not equivalent. These hooks take
(old_point, new_point) as arguments. */
- if (! intervals_equal (from, to)
- || ! intervals_equal (fromprev, toprev))
+ if (NILP (Vinhibit_point_motion_hooks)
+ && (! intervals_equal (from, to)
+ || ! intervals_equal (fromprev, toprev)))
{
Lisp_Object leave_after, leave_before, enter_after, enter_before;
}
}
-/* Set point temporarily, without checking any text properties. */
+/* Set point temporarily, without checking any text properties. */
INLINE void
temp_set_point (position, buffer)
if (NULL_INTERVAL_P (buffer->intervals))
return current_buffer->keymap;
- /* Perhaps we should just change `position' to the limit. */
+ /* Perhaps we should just change `position' to the limit. */
if (position > BUF_Z (buffer) || position < BUF_BEG (buffer))
abort ();
- /* Position Z is really one past the last char in the buffer. */
- if (position == BUF_ZV (buffer))
- return current_buffer->keymap;
-
interval = find_interval (buffer->intervals, position);
prop = textget (interval->plist, Qlocal_map);
if (NILP (prop))
(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. */
+ as arguments. */
void
verify_interval_modification (buf, start, end)
/* 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 == BUF_ZV (buf) ? start - 1 : start));
+ i = find_interval (intervals, start);
if (start == BUF_BEGV (buf))
prev = 0;
- if (i->position == start)
+ else if (i->position == start)
prev = previous_interval (i);
else if (i->position < start)
prev = i;
if (start == BUF_ZV (buf))
i = 0;
- if (NULL_INTERVAL_P (prev))
- {
- if (! INTERVAL_WRITABLE_P (i))
- error ("Attempt to insert within read-only text");
- }
- else if (NULL_INTERVAL_P (i))
+ /* 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 (! INTERVAL_WRITABLE_P (prev))
- error ("Attempt to insert within read-only text");
- }
- else
- {
- before = textget (prev->plist, Qread_only);
- after = textget (i->plist, Qread_only);
- if (! NILP (before) && EQ (before, after)
- /* This checks Vinhibit_read_only properly
- for the common value of the read-only property. */
- && ! INTERVAL_WRITABLE_P (i))
- error ("Attempt to insert within read-only text");
+ /* 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)))
+ {
+ Lisp_Object tem;
+
+ tem = textget (i->plist, Qfront_sticky);
+ if (TMEM (Qread_only, tem)
+ || (NILP (textget_direct (i->plist, Qread_only))
+ && TMEM (Qcategory, tem)))
+ error ("Attempt to insert within read-only text");
+ }
+ }
+
+ 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)))
+ {
+ Lisp_Object tem;
+
+ tem = textget (prev->plist, Qrear_nonsticky);
+ if (! TMEM (Qread_only, tem)
+ && (! NILP (textget_direct (prev->plist,Qread_only))
+ || ! TMEM (Qcategory, tem)))
+ error ("Attempt to insert within read-only text");
+ }
+ }
+ }
+ else 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)))
+ {
+ Lisp_Object tem;
+
+ tem = textget (i->plist, Qfront_sticky);
+ if (TMEM (Qread_only, tem)
+ || (NILP (textget_direct (i->plist, Qread_only))
+ && TMEM (Qcategory, tem)))
+ error ("Attempt to insert within read-only text");
+
+ tem = textget (prev->plist, Qrear_nonsticky);
+ if (! TMEM (Qread_only, tem)
+ && (! NILP (textget_direct (prev->plist, Qread_only))
+ || ! TMEM (Qcategory, tem)))
+ error ("Attempt to insert within read-only text");
+ }
+ }
}
- /* Run both mod hooks (just once if they're the same). */
+ /* Run both insert hooks (just once if they're the same). */
if (!NULL_INTERVAL_P (prev))
- prev_mod_hooks = textget (prev->plist, Qmodification_hooks);
+ prev_mod_hooks = textget (prev->plist, Qinsert_behind_hooks);
if (!NULL_INTERVAL_P (i))
- mod_hooks = textget (i->plist, Qmodification_hooks);
+ 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),
}
}
-/* 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'. */
-
-static INTERVAL
-balance_an_interval (i)
- INTERVAL i;
-{
- register int total_children_size = (LEFT_TOTAL_LENGTH (i)
- + RIGHT_TOTAL_LENGTH (i));
- register int threshold = (XFASTINT (interval_balance_threshold)
- * (total_children_size / 100));
-
- /* Balance within each side. */
- balance_intervals (i->left);
- balance_intervals (i->right);
-
- 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;
- }
-
- 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;
- }
-
- return i;
-}
-
-/* Balance the interval tree TREE. Balancing is by weight
- (the amount of text). */
-
-INTERVAL
-balance_intervals (tree)
- register INTERVAL tree;
-{
- register INTERVAL new_tree;
-
- if (NULL_INTERVAL_P (tree))
- return NULL_INTERVAL;
-
- new_tree = tree;
- do
- {
- tree = new_tree;
- new_tree = balance_an_interval (new_tree);
- }
- while (new_tree != tree);
-
- return new_tree;
-}
-
/* Produce an interval tree reflecting the intervals in
- TREE from START to START + LENGTH. */
+ TREE from START to START + LENGTH. */
INTERVAL
copy_intervals (tree, start, length)
if (NULL_INTERVAL_P (i) || LENGTH (i) == 0)
abort ();
- /* If there is only one interval and it's the default, return nil. */
+ /* If there is only one interval and it's the default, return nil. */
if ((start - i->position + 1 + length) < LENGTH (i)
&& DEFAULT_INTERVAL_P (i))
return NULL_INTERVAL;
while (got < length)
{
i = next_interval (i);
- t = split_interval_right (t, prevlen + 1);
+ t = split_interval_right (t, prevlen);
copy_properties (i, t);
prevlen = LENGTH (i);
got += prevlen;
}
- return balance_intervals (new);
+ return balance_an_interval (new);
}
-/* Give STRING the properties of BUFFER from POSITION to LENGTH. */
+/* Give STRING the properties of BUFFER from POSITION to LENGTH. */
INLINE void
copy_intervals_to_string (string, buffer, position, length)