Mercurial > emacs
annotate src/intervals.c @ 14911:f736e9cb067e libc-960329 libc-960330 libc-960331 libc-960401 libc-960402 libc-960403 libc-960404 libc-960405 libc-960406 libc-960407 libc-960408
(aux): Delete another duplicate entry.
| author | Doug Evans <dje@gnu.org> |
|---|---|
| date | Fri, 29 Mar 1996 01:49:55 +0000 |
| parents | ee40177f6c68 |
| children | 98d8e063fdae |
| rev | line source |
|---|---|
| 1157 | 1 /* Code for doing intervals. |
| 11235 | 2 Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. |
| 1157 | 3 |
| 4 This file is part of GNU Emacs. | |
| 5 | |
| 6 GNU Emacs is free software; you can redistribute it and/or modify | |
| 7 it under the terms of the GNU General Public License as published by | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
8 the Free Software Foundation; either version 2, or (at your option) |
| 1157 | 9 any later version. |
| 10 | |
| 11 GNU Emacs is distributed in the hope that it will be useful, | |
| 12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 GNU General Public License for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with GNU Emacs; see the file COPYING. If not, write to | |
|
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
|
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
19 Boston, MA 02111-1307, USA. */ |
| 1157 | 20 |
| 21 | |
| 22 /* NOTES: | |
| 23 | |
| 24 Have to ensure that we can't put symbol nil on a plist, or some | |
| 25 functions may work incorrectly. | |
| 26 | |
| 27 An idea: Have the owner of the tree keep count of splits and/or | |
| 28 insertion lengths (in intervals), and balance after every N. | |
| 29 | |
| 30 Need to call *_left_hook when buffer is killed. | |
| 31 | |
| 32 Scan for zero-length, or 0-length to see notes about handling | |
| 33 zero length interval-markers. | |
| 34 | |
| 35 There are comments around about freeing intervals. It might be | |
| 36 faster to explicitly free them (put them on the free list) than | |
| 37 to GC them. | |
| 38 | |
| 39 */ | |
| 40 | |
| 41 | |
|
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
4638
diff
changeset
|
42 #include <config.h> |
| 1157 | 43 #include "lisp.h" |
| 44 #include "intervals.h" | |
| 45 #include "buffer.h" | |
| 4962 | 46 #include "puresize.h" |
| 8897 | 47 #include "keyboard.h" |
| 1157 | 48 |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
49 /* The rest of the file is within this conditional. */ |
|
1301
5a27062b8b7f
* intervals.c: Conditionalize all functions on
Joseph Arceneaux <jla@gnu.org>
parents:
1288
diff
changeset
|
50 #ifdef USE_TEXT_PROPERTIES |
|
5a27062b8b7f
* intervals.c: Conditionalize all functions on
Joseph Arceneaux <jla@gnu.org>
parents:
1288
diff
changeset
|
51 |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
52 /* Test for membership, allowing for t (actually any non-cons) to mean the |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
53 universal set. */ |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
54 |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
55 #define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set)) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
56 |
|
10113
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
57 #define min(x, y) ((x) < (y) ? (x) : (y)) |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
58 |
|
5173
d48ba25b35bf
(merge_properties_sticky): Declared.
Richard M. Stallman <rms@gnu.org>
parents:
5169
diff
changeset
|
59 Lisp_Object merge_properties_sticky (); |
| 1157 | 60 |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
61 /* Utility functions for intervals. */ |
| 1157 | 62 |
| 63 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
64 /* Create the root interval of some object, a buffer or string. */ |
| 1157 | 65 |
| 66 INTERVAL | |
| 67 create_root_interval (parent) | |
| 68 Lisp_Object parent; | |
| 69 { | |
| 4962 | 70 INTERVAL new; |
| 71 | |
| 72 CHECK_IMPURE (parent); | |
| 73 | |
| 74 new = make_interval (); | |
| 1157 | 75 |
|
9125
a78f02f76f03
(create_root_interval, balance_possible_root_interval, delete_interval): Use
Karl Heuer <kwzh@gnu.org>
parents:
9072
diff
changeset
|
76 if (BUFFERP (parent)) |
| 1157 | 77 { |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
78 new->total_length = (BUF_Z (XBUFFER (parent)) |
|
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
79 - BUF_BEG (XBUFFER (parent))); |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
80 BUF_INTERVALS (XBUFFER (parent)) = new; |
| 1157 | 81 } |
|
9125
a78f02f76f03
(create_root_interval, balance_possible_root_interval, delete_interval): Use
Karl Heuer <kwzh@gnu.org>
parents:
9072
diff
changeset
|
82 else if (STRINGP (parent)) |
| 1157 | 83 { |
| 84 new->total_length = XSTRING (parent)->size; | |
| 85 XSTRING (parent)->intervals = new; | |
| 86 } | |
| 87 | |
| 88 new->parent = (INTERVAL) parent; | |
| 89 new->position = 1; | |
| 90 | |
| 91 return new; | |
| 92 } | |
| 93 | |
| 94 /* Make the interval TARGET have exactly the properties of SOURCE */ | |
| 95 | |
| 96 void | |
| 97 copy_properties (source, target) | |
| 98 register INTERVAL source, target; | |
| 99 { | |
| 100 if (DEFAULT_INTERVAL_P (source) && DEFAULT_INTERVAL_P (target)) | |
| 101 return; | |
| 102 | |
| 103 COPY_INTERVAL_CACHE (source, target); | |
| 104 target->plist = Fcopy_sequence (source->plist); | |
| 105 } | |
| 106 | |
| 107 /* Merge the properties of interval SOURCE into the properties | |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
108 of interval TARGET. That is to say, each property in SOURCE |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
109 is added to TARGET if TARGET has no such property as yet. */ |
| 1157 | 110 |
| 111 static void | |
| 112 merge_properties (source, target) | |
| 113 register INTERVAL source, target; | |
| 114 { | |
| 115 register Lisp_Object o, sym, val; | |
| 116 | |
| 117 if (DEFAULT_INTERVAL_P (source) && DEFAULT_INTERVAL_P (target)) | |
| 118 return; | |
| 119 | |
| 120 MERGE_INTERVAL_CACHE (source, target); | |
| 121 | |
| 122 o = source->plist; | |
| 123 while (! EQ (o, Qnil)) | |
| 124 { | |
| 125 sym = Fcar (o); | |
| 126 val = Fmemq (sym, target->plist); | |
| 127 | |
| 128 if (NILP (val)) | |
| 129 { | |
| 130 o = Fcdr (o); | |
| 131 val = Fcar (o); | |
| 132 target->plist = Fcons (sym, Fcons (val, target->plist)); | |
| 133 o = Fcdr (o); | |
| 134 } | |
| 135 else | |
| 136 o = Fcdr (Fcdr (o)); | |
| 137 } | |
| 138 } | |
| 139 | |
| 140 /* Return 1 if the two intervals have the same properties, | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
141 0 otherwise. */ |
| 1157 | 142 |
| 143 int | |
| 144 intervals_equal (i0, i1) | |
| 145 INTERVAL i0, i1; | |
| 146 { | |
| 147 register Lisp_Object i0_cdr, i0_sym, i1_val; | |
| 148 register i1_len; | |
| 149 | |
| 150 if (DEFAULT_INTERVAL_P (i0) && DEFAULT_INTERVAL_P (i1)) | |
| 151 return 1; | |
| 152 | |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
153 if (DEFAULT_INTERVAL_P (i0) || DEFAULT_INTERVAL_P (i1)) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
154 return 0; |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
155 |
| 1157 | 156 i1_len = XFASTINT (Flength (i1->plist)); |
| 157 if (i1_len & 0x1) /* Paranoia -- plists are always even */ | |
| 158 abort (); | |
| 159 i1_len /= 2; | |
| 160 i0_cdr = i0->plist; | |
| 161 while (!NILP (i0_cdr)) | |
| 162 { | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
163 /* Lengths of the two plists were unequal. */ |
| 1157 | 164 if (i1_len == 0) |
| 165 return 0; | |
| 166 | |
| 167 i0_sym = Fcar (i0_cdr); | |
| 168 i1_val = Fmemq (i0_sym, i1->plist); | |
| 169 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
170 /* i0 has something i1 doesn't. */ |
| 1157 | 171 if (EQ (i1_val, Qnil)) |
| 172 return 0; | |
| 173 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
174 /* i0 and i1 both have sym, but it has different values in each. */ |
| 1157 | 175 i0_cdr = Fcdr (i0_cdr); |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
176 if (! EQ (Fcar (Fcdr (i1_val)), Fcar (i0_cdr))) |
| 1157 | 177 return 0; |
| 178 | |
| 179 i0_cdr = Fcdr (i0_cdr); | |
| 180 i1_len--; | |
| 181 } | |
| 182 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
183 /* Lengths of the two plists were unequal. */ |
| 1157 | 184 if (i1_len > 0) |
| 185 return 0; | |
| 186 | |
| 187 return 1; | |
| 188 } | |
| 189 | |
| 190 static int icount; | |
| 191 static int idepth; | |
| 192 static int zero_length; | |
| 193 | |
| 194 /* Traverse an interval tree TREE, performing FUNCTION on each node. | |
|
1958
8bc716df45e3
(traverse_intervals): New arg ARG.
Richard M. Stallman <rms@gnu.org>
parents:
1412
diff
changeset
|
195 Pass FUNCTION two args: an interval, and ARG. */ |
| 1157 | 196 |
| 197 void | |
|
1958
8bc716df45e3
(traverse_intervals): New arg ARG.
Richard M. Stallman <rms@gnu.org>
parents:
1412
diff
changeset
|
198 traverse_intervals (tree, position, depth, function, arg) |
| 1157 | 199 INTERVAL tree; |
|
1412
6097878fbd46
* intervals.c (traverse_intervals): New parameter `depth'.
Joseph Arceneaux <jla@gnu.org>
parents:
1316
diff
changeset
|
200 int position, depth; |
| 1157 | 201 void (* function) (); |
|
1958
8bc716df45e3
(traverse_intervals): New arg ARG.
Richard M. Stallman <rms@gnu.org>
parents:
1412
diff
changeset
|
202 Lisp_Object arg; |
| 1157 | 203 { |
| 204 if (NULL_INTERVAL_P (tree)) | |
| 205 return; | |
| 206 | |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
207 traverse_intervals (tree->left, position, depth + 1, function, arg); |
| 1157 | 208 position += LEFT_TOTAL_LENGTH (tree); |
| 209 tree->position = position; | |
|
1958
8bc716df45e3
(traverse_intervals): New arg ARG.
Richard M. Stallman <rms@gnu.org>
parents:
1412
diff
changeset
|
210 (*function) (tree, arg); |
| 1157 | 211 position += LENGTH (tree); |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
212 traverse_intervals (tree->right, position, depth + 1, function, arg); |
| 1157 | 213 } |
| 214 | |
| 215 #if 0 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
216 /* These functions are temporary, for debugging purposes only. */ |
| 1157 | 217 |
| 218 INTERVAL search_interval, found_interval; | |
| 219 | |
| 220 void | |
| 221 check_for_interval (i) | |
| 222 register INTERVAL i; | |
| 223 { | |
| 224 if (i == search_interval) | |
| 225 { | |
| 226 found_interval = i; | |
| 227 icount++; | |
| 228 } | |
| 229 } | |
| 230 | |
| 231 INTERVAL | |
| 232 search_for_interval (i, tree) | |
| 233 register INTERVAL i, tree; | |
| 234 { | |
| 235 icount = 0; | |
| 236 search_interval = i; | |
| 237 found_interval = NULL_INTERVAL; | |
|
1958
8bc716df45e3
(traverse_intervals): New arg ARG.
Richard M. Stallman <rms@gnu.org>
parents:
1412
diff
changeset
|
238 traverse_intervals (tree, 1, 0, &check_for_interval, Qnil); |
| 1157 | 239 return found_interval; |
| 240 } | |
| 241 | |
| 242 static void | |
| 243 inc_interval_count (i) | |
| 244 INTERVAL i; | |
| 245 { | |
| 246 icount++; | |
| 247 if (LENGTH (i) == 0) | |
| 248 zero_length++; | |
| 249 if (depth > idepth) | |
| 250 idepth = depth; | |
| 251 } | |
| 252 | |
| 253 int | |
| 254 count_intervals (i) | |
| 255 register INTERVAL i; | |
| 256 { | |
| 257 icount = 0; | |
| 258 idepth = 0; | |
| 259 zero_length = 0; | |
|
1958
8bc716df45e3
(traverse_intervals): New arg ARG.
Richard M. Stallman <rms@gnu.org>
parents:
1412
diff
changeset
|
260 traverse_intervals (i, 1, 0, &inc_interval_count, Qnil); |
| 1157 | 261 |
| 262 return icount; | |
| 263 } | |
| 264 | |
| 265 static INTERVAL | |
| 266 root_interval (interval) | |
| 267 INTERVAL interval; | |
| 268 { | |
| 269 register INTERVAL i = interval; | |
| 270 | |
| 271 while (! ROOT_INTERVAL_P (i)) | |
| 272 i = i->parent; | |
| 273 | |
| 274 return i; | |
| 275 } | |
| 276 #endif | |
| 277 | |
| 278 /* Assuming that a left child exists, perform the following operation: | |
| 279 | |
| 280 A B | |
| 281 / \ / \ | |
| 282 B => A | |
| 283 / \ / \ | |
| 284 c c | |
| 285 */ | |
| 286 | |
| 287 static INTERVAL | |
| 288 rotate_right (interval) | |
| 289 INTERVAL interval; | |
| 290 { | |
| 291 INTERVAL i; | |
| 292 INTERVAL B = interval->left; | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
293 int old_total = interval->total_length; |
| 1157 | 294 |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
295 /* Deal with any Parent of A; make it point to B. */ |
| 1157 | 296 if (! ROOT_INTERVAL_P (interval)) |
| 297 if (AM_LEFT_CHILD (interval)) | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
298 interval->parent->left = B; |
| 1157 | 299 else |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
300 interval->parent->right = B; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
301 B->parent = interval->parent; |
| 1157 | 302 |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
303 /* Make B the parent of A */ |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
304 i = B->right; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
305 B->right = interval; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
306 interval->parent = B; |
| 1157 | 307 |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
308 /* Make A point to c */ |
| 1157 | 309 interval->left = i; |
| 310 if (! NULL_INTERVAL_P (i)) | |
| 311 i->parent = interval; | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
312 |
|
5760
ffe89784cef2
(merge_properties_sticky): Preserve original order of properties.
Karl Heuer <kwzh@gnu.org>
parents:
5666
diff
changeset
|
313 /* A's total length is decreased by the length of B and its left child. */ |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
314 interval->total_length -= B->total_length - LEFT_TOTAL_LENGTH (interval); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
315 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
316 /* B must have the same total length of A. */ |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
317 B->total_length = old_total; |
| 1157 | 318 |
| 319 return B; | |
| 320 } | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
321 |
| 1157 | 322 /* Assuming that a right child exists, perform the following operation: |
| 323 | |
| 324 A B | |
| 325 / \ / \ | |
| 326 B => A | |
| 327 / \ / \ | |
| 328 c c | |
| 329 */ | |
| 330 | |
| 331 static INTERVAL | |
| 332 rotate_left (interval) | |
| 333 INTERVAL interval; | |
| 334 { | |
| 335 INTERVAL i; | |
| 336 INTERVAL B = interval->right; | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
337 int old_total = interval->total_length; |
| 1157 | 338 |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
339 /* Deal with any parent of A; make it point to B. */ |
| 1157 | 340 if (! ROOT_INTERVAL_P (interval)) |
| 341 if (AM_LEFT_CHILD (interval)) | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
342 interval->parent->left = B; |
| 1157 | 343 else |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
344 interval->parent->right = B; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
345 B->parent = interval->parent; |
| 1157 | 346 |
| 347 /* Make B the parent of A */ | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
348 i = B->left; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
349 B->left = interval; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
350 interval->parent = B; |
| 1157 | 351 |
| 352 /* Make A point to c */ | |
| 353 interval->right = i; | |
| 354 if (! NULL_INTERVAL_P (i)) | |
| 355 i->parent = interval; | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
356 |
|
5760
ffe89784cef2
(merge_properties_sticky): Preserve original order of properties.
Karl Heuer <kwzh@gnu.org>
parents:
5666
diff
changeset
|
357 /* A's total length is decreased by the length of B and its right child. */ |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
358 interval->total_length -= B->total_length - RIGHT_TOTAL_LENGTH (interval); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
359 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
360 /* B must have the same total length of A. */ |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
361 B->total_length = old_total; |
| 1157 | 362 |
| 363 return B; | |
| 364 } | |
| 365 | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
366 /* Balance an interval tree with the assumption that the subtrees |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
367 themselves are already balanced. */ |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
368 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
369 static INTERVAL |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
370 balance_an_interval (i) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
371 INTERVAL i; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
372 { |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
373 register int old_diff, new_diff; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
374 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
375 while (1) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
376 { |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
377 old_diff = LEFT_TOTAL_LENGTH (i) - RIGHT_TOTAL_LENGTH (i); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
378 if (old_diff > 0) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
379 { |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
380 new_diff = i->total_length - i->left->total_length |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
381 + RIGHT_TOTAL_LENGTH (i->left) - LEFT_TOTAL_LENGTH (i->left); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
382 if (abs (new_diff) >= old_diff) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
383 break; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
384 i = rotate_right (i); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
385 balance_an_interval (i->right); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
386 } |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
387 else if (old_diff < 0) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
388 { |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
389 new_diff = i->total_length - i->right->total_length |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
390 + LEFT_TOTAL_LENGTH (i->right) - RIGHT_TOTAL_LENGTH (i->right); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
391 if (abs (new_diff) >= -old_diff) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
392 break; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
393 i = rotate_left (i); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
394 balance_an_interval (i->left); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
395 } |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
396 else |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
397 break; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
398 } |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
399 return i; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
400 } |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
401 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
402 /* Balance INTERVAL, potentially stuffing it back into its parent |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
403 Lisp Object. */ |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
404 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
405 static INLINE INTERVAL |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
406 balance_possible_root_interval (interval) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
407 register INTERVAL interval; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
408 { |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
409 Lisp_Object parent; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
410 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
411 if (interval->parent == NULL_INTERVAL) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
412 return interval; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
413 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
414 parent = (Lisp_Object) (interval->parent); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
415 interval = balance_an_interval (interval); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
416 |
|
9125
a78f02f76f03
(create_root_interval, balance_possible_root_interval, delete_interval): Use
Karl Heuer <kwzh@gnu.org>
parents:
9072
diff
changeset
|
417 if (BUFFERP (parent)) |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
418 BUF_INTERVALS (XBUFFER (parent)) = interval; |
|
9125
a78f02f76f03
(create_root_interval, balance_possible_root_interval, delete_interval): Use
Karl Heuer <kwzh@gnu.org>
parents:
9072
diff
changeset
|
419 else if (STRINGP (parent)) |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
420 XSTRING (parent)->intervals = interval; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
421 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
422 return interval; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
423 } |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
424 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
425 /* Balance the interval tree TREE. Balancing is by weight |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
426 (the amount of text). */ |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
427 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
428 static INTERVAL |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
429 balance_intervals_internal (tree) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
430 register INTERVAL tree; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
431 { |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
432 /* Balance within each side. */ |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
433 if (tree->left) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
434 balance_intervals (tree->left); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
435 if (tree->right) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
436 balance_intervals (tree->right); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
437 return balance_an_interval (tree); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
438 } |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
439 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
440 /* Advertised interface to balance intervals. */ |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
441 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
442 INTERVAL |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
443 balance_intervals (tree) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
444 INTERVAL tree; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
445 { |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
446 if (tree == NULL_INTERVAL) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
447 return NULL_INTERVAL; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
448 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
449 return balance_intervals_internal (tree); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
450 } |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
451 |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
452 /* Split INTERVAL into two pieces, starting the second piece at |
|
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
453 character position OFFSET (counting from 0), relative to INTERVAL. |
|
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
454 INTERVAL becomes the left-hand piece, and the right-hand piece |
|
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
455 (second, lexicographically) is returned. |
| 1164 | 456 |
| 457 The size and position fields of the two intervals are set based upon | |
| 458 those of the original interval. The property list of the new interval | |
| 459 is reset, thus it is up to the caller to do the right thing with the | |
| 460 result. | |
| 1157 | 461 |
| 462 Note that this does not change the position of INTERVAL; if it is a root, | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
463 it is still a root after this operation. */ |
| 1157 | 464 |
| 465 INTERVAL | |
| 1164 | 466 split_interval_right (interval, offset) |
| 1157 | 467 INTERVAL interval; |
| 1164 | 468 int offset; |
| 1157 | 469 { |
| 470 INTERVAL new = make_interval (); | |
| 471 int position = interval->position; | |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
472 int new_length = LENGTH (interval) - offset; |
| 1157 | 473 |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
474 new->position = position + offset; |
| 1157 | 475 new->parent = interval; |
| 476 | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
477 if (NULL_RIGHT_CHILD (interval)) |
| 1157 | 478 { |
| 479 interval->right = new; | |
| 480 new->total_length = new_length; | |
| 481 | |
| 482 return new; | |
| 483 } | |
| 484 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
485 /* Insert the new node between INTERVAL and its right child. */ |
| 1157 | 486 new->right = interval->right; |
| 487 interval->right->parent = new; | |
| 488 interval->right = new; | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
489 new->total_length = new_length + new->right->total_length; |
| 1157 | 490 |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
491 balance_an_interval (new); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
492 balance_possible_root_interval (interval); |
| 1157 | 493 |
| 494 return new; | |
| 495 } | |
| 496 | |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
497 /* Split INTERVAL into two pieces, starting the second piece at |
|
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
498 character position OFFSET (counting from 0), relative to INTERVAL. |
|
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
499 INTERVAL becomes the right-hand piece, and the left-hand piece |
|
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
500 (first, lexicographically) is returned. |
| 1157 | 501 |
| 1164 | 502 The size and position fields of the two intervals are set based upon |
| 503 those of the original interval. The property list of the new interval | |
| 504 is reset, thus it is up to the caller to do the right thing with the | |
| 505 result. | |
| 506 | |
| 507 Note that this does not change the position of INTERVAL; if it is a root, | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
508 it is still a root after this operation. */ |
| 1157 | 509 |
| 510 INTERVAL | |
| 1164 | 511 split_interval_left (interval, offset) |
| 1157 | 512 INTERVAL interval; |
| 1164 | 513 int offset; |
| 1157 | 514 { |
| 515 INTERVAL new = make_interval (); | |
| 516 int position = interval->position; | |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
517 int new_length = offset; |
| 1157 | 518 |
| 519 new->position = interval->position; | |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
520 interval->position = interval->position + offset; |
| 1157 | 521 new->parent = interval; |
| 522 | |
| 523 if (NULL_LEFT_CHILD (interval)) | |
| 524 { | |
| 525 interval->left = new; | |
| 526 new->total_length = new_length; | |
| 527 | |
| 528 return new; | |
| 529 } | |
| 530 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
531 /* Insert the new node between INTERVAL and its left child. */ |
| 1157 | 532 new->left = interval->left; |
| 533 new->left->parent = new; | |
| 534 interval->left = new; | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
535 new->total_length = new_length + new->left->total_length; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
536 |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
537 balance_an_interval (new); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
538 balance_possible_root_interval (interval); |
| 1157 | 539 |
| 540 return new; | |
| 541 } | |
| 542 | |
| 1164 | 543 /* Find the interval containing text position POSITION in the text |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
544 represented by the interval tree TREE. POSITION is a buffer |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
545 position; the earliest position is 1. If POSITION is at the end of |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
546 the buffer, return the interval containing the last character. |
| 1157 | 547 |
| 1164 | 548 The `position' field, which is a cache of an interval's position, |
| 549 is updated in the interval found. Other functions (e.g., next_interval) | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
550 will update this cache based on the result of find_interval. */ |
| 1164 | 551 |
| 552 INLINE INTERVAL | |
| 1157 | 553 find_interval (tree, position) |
| 554 register INTERVAL tree; | |
| 555 register int position; | |
| 556 { | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
557 /* The distance from the left edge of the subtree at TREE |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
558 to POSITION. */ |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
559 register int relative_position = position - BEG; |
| 1157 | 560 |
| 561 if (NULL_INTERVAL_P (tree)) | |
| 562 return NULL_INTERVAL; | |
| 563 | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
564 if (relative_position > TOTAL_LENGTH (tree)) |
| 1157 | 565 abort (); /* Paranoia */ |
| 566 | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
567 tree = balance_possible_root_interval (tree); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
568 |
| 1157 | 569 while (1) |
| 570 { | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
571 if (relative_position < LEFT_TOTAL_LENGTH (tree)) |
| 1157 | 572 { |
| 573 tree = tree->left; | |
| 574 } | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
575 else if (! NULL_RIGHT_CHILD (tree) |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
576 && relative_position >= (TOTAL_LENGTH (tree) |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
577 - RIGHT_TOTAL_LENGTH (tree))) |
| 1157 | 578 { |
| 579 relative_position -= (TOTAL_LENGTH (tree) | |
| 580 - RIGHT_TOTAL_LENGTH (tree)); | |
| 581 tree = tree->right; | |
| 582 } | |
| 583 else | |
| 584 { | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
585 tree->position = |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
586 (position - relative_position /* the left edge of *tree */ |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
587 + LEFT_TOTAL_LENGTH (tree)); /* the left edge of this interval */ |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
588 |
| 1157 | 589 return tree; |
| 590 } | |
| 591 } | |
| 592 } | |
| 593 | |
| 594 /* Find the succeeding interval (lexicographically) to INTERVAL. | |
| 1164 | 595 Sets the `position' field based on that of INTERVAL (see |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
596 find_interval). */ |
| 1157 | 597 |
| 598 INTERVAL | |
| 599 next_interval (interval) | |
| 600 register INTERVAL interval; | |
| 601 { | |
| 602 register INTERVAL i = interval; | |
| 603 register int next_position; | |
| 604 | |
| 605 if (NULL_INTERVAL_P (i)) | |
| 606 return NULL_INTERVAL; | |
| 607 next_position = interval->position + LENGTH (interval); | |
| 608 | |
| 609 if (! NULL_RIGHT_CHILD (i)) | |
| 610 { | |
| 611 i = i->right; | |
| 612 while (! NULL_LEFT_CHILD (i)) | |
| 613 i = i->left; | |
| 614 | |
| 615 i->position = next_position; | |
| 616 return i; | |
| 617 } | |
| 618 | |
| 619 while (! NULL_PARENT (i)) | |
| 620 { | |
| 621 if (AM_LEFT_CHILD (i)) | |
| 622 { | |
| 623 i = i->parent; | |
| 624 i->position = next_position; | |
| 625 return i; | |
| 626 } | |
| 627 | |
| 628 i = i->parent; | |
| 629 } | |
| 630 | |
| 631 return NULL_INTERVAL; | |
| 632 } | |
| 633 | |
| 634 /* Find the preceding interval (lexicographically) to INTERVAL. | |
| 1164 | 635 Sets the `position' field based on that of INTERVAL (see |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
636 find_interval). */ |
| 1157 | 637 |
| 638 INTERVAL | |
| 639 previous_interval (interval) | |
| 640 register INTERVAL interval; | |
| 641 { | |
| 642 register INTERVAL i; | |
| 643 register position_of_previous; | |
| 644 | |
| 645 if (NULL_INTERVAL_P (interval)) | |
| 646 return NULL_INTERVAL; | |
| 647 | |
| 648 if (! NULL_LEFT_CHILD (interval)) | |
| 649 { | |
| 650 i = interval->left; | |
| 651 while (! NULL_RIGHT_CHILD (i)) | |
| 652 i = i->right; | |
| 653 | |
| 654 i->position = interval->position - LENGTH (i); | |
| 655 return i; | |
| 656 } | |
| 657 | |
| 658 i = interval; | |
| 659 while (! NULL_PARENT (i)) | |
| 660 { | |
| 661 if (AM_RIGHT_CHILD (i)) | |
| 662 { | |
| 663 i = i->parent; | |
| 664 | |
| 665 i->position = interval->position - LENGTH (i); | |
| 666 return i; | |
| 667 } | |
| 668 i = i->parent; | |
| 669 } | |
| 670 | |
| 671 return NULL_INTERVAL; | |
| 672 } | |
| 673 | |
| 1164 | 674 #if 0 |
| 1157 | 675 /* Traverse a path down the interval tree TREE to the interval |
| 676 containing POSITION, adjusting all nodes on the path for | |
| 677 an addition of LENGTH characters. Insertion between two intervals | |
| 678 (i.e., point == i->position, where i is second interval) means | |
| 679 text goes into second interval. | |
| 680 | |
| 681 Modifications are needed to handle the hungry bits -- after simply | |
| 682 finding the interval at position (don't add length going down), | |
| 683 if it's the beginning of the interval, get the previous interval | |
| 14036 | 684 and check the hungry bits of both. Then add the length going back up |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
685 to the root. */ |
| 1157 | 686 |
| 687 static INTERVAL | |
| 688 adjust_intervals_for_insertion (tree, position, length) | |
| 689 INTERVAL tree; | |
| 690 int position, length; | |
| 691 { | |
| 692 register int relative_position; | |
| 693 register INTERVAL this; | |
| 694 | |
| 695 if (TOTAL_LENGTH (tree) == 0) /* Paranoia */ | |
| 696 abort (); | |
| 697 | |
| 698 /* If inserting at point-max of a buffer, that position | |
| 699 will be out of range */ | |
| 700 if (position > TOTAL_LENGTH (tree)) | |
| 701 position = TOTAL_LENGTH (tree); | |
| 702 relative_position = position; | |
| 703 this = tree; | |
| 704 | |
| 705 while (1) | |
| 706 { | |
| 707 if (relative_position <= LEFT_TOTAL_LENGTH (this)) | |
| 708 { | |
| 709 this->total_length += length; | |
| 710 this = this->left; | |
| 711 } | |
| 712 else if (relative_position > (TOTAL_LENGTH (this) | |
| 713 - RIGHT_TOTAL_LENGTH (this))) | |
| 714 { | |
| 715 relative_position -= (TOTAL_LENGTH (this) | |
| 716 - RIGHT_TOTAL_LENGTH (this)); | |
| 717 this->total_length += length; | |
| 718 this = this->right; | |
| 719 } | |
| 720 else | |
| 721 { | |
| 722 /* If we are to use zero-length intervals as buffer pointers, | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
723 then this code will have to change. */ |
| 1157 | 724 this->total_length += length; |
| 725 this->position = LEFT_TOTAL_LENGTH (this) | |
| 726 + position - relative_position + 1; | |
| 727 return tree; | |
| 728 } | |
| 729 } | |
| 730 } | |
| 1164 | 731 #endif |
| 732 | |
| 733 /* Effect an adjustment corresponding to the addition of LENGTH characters | |
| 734 of text. Do this by finding the interval containing POSITION in the | |
|
5760
ffe89784cef2
(merge_properties_sticky): Preserve original order of properties.
Karl Heuer <kwzh@gnu.org>
parents:
5666
diff
changeset
|
735 interval tree TREE, and then adjusting all of its ancestors by adding |
| 1164 | 736 LENGTH to them. |
| 737 | |
| 738 If POSITION is the first character of an interval, meaning that point | |
| 739 is actually between the two intervals, make the new text belong to | |
| 740 the interval which is "sticky". | |
| 741 | |
| 1189 | 742 If both intervals are "sticky", then make them belong to the left-most |
| 1164 | 743 interval. Another possibility would be to create a new interval for |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
744 this text, and make it have the merged properties of both ends. */ |
| 1164 | 745 |
| 746 static INTERVAL | |
| 747 adjust_intervals_for_insertion (tree, position, length) | |
| 748 INTERVAL tree; | |
| 749 int position, length; | |
| 750 { | |
| 751 register INTERVAL i; | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
752 register INTERVAL temp; |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
753 int eobp = 0; |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
754 |
| 1164 | 755 if (TOTAL_LENGTH (tree) == 0) /* Paranoia */ |
| 756 abort (); | |
| 757 | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
758 /* If inserting at point-max of a buffer, that position will be out |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
759 of range. Remember that buffer positions are 1-based. */ |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
760 if (position >= BEG + TOTAL_LENGTH (tree)){ |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
761 position = BEG + TOTAL_LENGTH (tree); |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
762 eobp = 1; |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
763 } |
| 1164 | 764 |
| 765 i = find_interval (tree, position); | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
766 |
|
4638
3872f91770fc
(adjust_intervals_for_insertion): If inserting in middle
Richard M. Stallman <rms@gnu.org>
parents:
4383
diff
changeset
|
767 /* If in middle of an interval which is not sticky either way, |
|
3872f91770fc
(adjust_intervals_for_insertion): If inserting in middle
Richard M. Stallman <rms@gnu.org>
parents:
4383
diff
changeset
|
768 we must not just give its properties to the insertion. |
|
3872f91770fc
(adjust_intervals_for_insertion): If inserting in middle
Richard M. Stallman <rms@gnu.org>
parents:
4383
diff
changeset
|
769 So split this interval at the insertion point. */ |
|
3872f91770fc
(adjust_intervals_for_insertion): If inserting in middle
Richard M. Stallman <rms@gnu.org>
parents:
4383
diff
changeset
|
770 if (! (position == i->position || eobp) |
|
3872f91770fc
(adjust_intervals_for_insertion): If inserting in middle
Richard M. Stallman <rms@gnu.org>
parents:
4383
diff
changeset
|
771 && END_NONSTICKY_P (i) |
|
3872f91770fc
(adjust_intervals_for_insertion): If inserting in middle
Richard M. Stallman <rms@gnu.org>
parents:
4383
diff
changeset
|
772 && ! FRONT_STICKY_P (i)) |
|
3872f91770fc
(adjust_intervals_for_insertion): If inserting in middle
Richard M. Stallman <rms@gnu.org>
parents:
4383
diff
changeset
|
773 { |
|
3872f91770fc
(adjust_intervals_for_insertion): If inserting in middle
Richard M. Stallman <rms@gnu.org>
parents:
4383
diff
changeset
|
774 temp = split_interval_right (i, position - i->position); |
|
3872f91770fc
(adjust_intervals_for_insertion): If inserting in middle
Richard M. Stallman <rms@gnu.org>
parents:
4383
diff
changeset
|
775 copy_properties (i, temp); |
|
3872f91770fc
(adjust_intervals_for_insertion): If inserting in middle
Richard M. Stallman <rms@gnu.org>
parents:
4383
diff
changeset
|
776 i = temp; |
|
3872f91770fc
(adjust_intervals_for_insertion): If inserting in middle
Richard M. Stallman <rms@gnu.org>
parents:
4383
diff
changeset
|
777 } |
|
3872f91770fc
(adjust_intervals_for_insertion): If inserting in middle
Richard M. Stallman <rms@gnu.org>
parents:
4383
diff
changeset
|
778 |
| 1164 | 779 /* If we are positioned between intervals, check the stickiness of |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
780 both of them. We have to do this too, if we are at BEG or Z. */ |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
781 if (position == i->position || eobp) |
| 1164 | 782 { |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
783 register INTERVAL prev; |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
784 |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
785 if (position == BEG) |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
786 prev = 0; |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
787 else if (eobp) |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
788 { |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
789 prev = i; |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
790 i = 0; |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
791 } |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
792 else |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
793 prev = previous_interval (i); |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
794 |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
795 /* Even if we are positioned between intervals, we default |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
796 to the left one if it exists. We extend it now and split |
| 14036 | 797 off a part later, if stickiness demands it. */ |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
798 for (temp = prev ? prev : i;! NULL_INTERVAL_P (temp); temp = temp->parent) |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
799 { |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
800 temp->total_length += length; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
801 temp = balance_possible_root_interval (temp); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
802 } |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
803 |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
804 /* If at least one interval has sticky properties, |
| 14036 | 805 we check the stickiness property by property. */ |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
806 if (END_NONSTICKY_P (prev) || FRONT_STICKY_P (i)) |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
807 { |
|
6501
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
808 Lisp_Object pleft, pright; |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
809 struct interval newi; |
| 1164 | 810 |
|
6501
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
811 pleft = NULL_INTERVAL_P (prev) ? Qnil : prev->plist; |
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
812 pright = NULL_INTERVAL_P (i) ? Qnil : i->plist; |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
813 newi.plist = merge_properties_sticky (pleft, pright); |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
814 |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
815 if(! prev) /* i.e. position == BEG */ |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
816 { |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
817 if (! intervals_equal (i, &newi)) |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
818 { |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
819 i = split_interval_left (i, length); |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
820 i->plist = newi.plist; |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
821 } |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
822 } |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
823 else if (! intervals_equal (prev, &newi)) |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
824 { |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
825 prev = split_interval_right (prev, |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
826 position - prev->position); |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
827 prev->plist = newi.plist; |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
828 if (! NULL_INTERVAL_P (i) |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
829 && intervals_equal (prev, i)) |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
830 merge_interval_right (prev); |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
831 } |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
832 |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
833 /* We will need to update the cache here later. */ |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
834 } |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
835 else if (! prev && ! NILP (i->plist)) |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
836 { |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
837 /* Just split off a new interval at the left. |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
838 Since I wasn't front-sticky, the empty plist is ok. */ |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
839 i = split_interval_left (i, length); |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
840 } |
| 1164 | 841 } |
| 842 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
843 /* Otherwise just extend the interval. */ |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
844 else |
| 1164 | 845 { |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
846 for (temp = i; ! NULL_INTERVAL_P (temp); temp = temp->parent) |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
847 { |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
848 temp->total_length += length; |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
849 temp = balance_possible_root_interval (temp); |
|
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
850 } |
| 1164 | 851 } |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
852 |
| 1164 | 853 return tree; |
| 854 } | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
855 |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
856 /* Any property might be front-sticky on the left, rear-sticky on the left, |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
857 front-sticky on the right, or rear-sticky on the right; the 16 combinations |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
858 can be arranged in a matrix with rows denoting the left conditions and |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
859 columns denoting the right conditions: |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
860 _ __ _ |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
861 _ FR FR FR FR |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
862 FR__ 0 1 2 3 |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
863 _FR 4 5 6 7 |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
864 FR 8 9 A B |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
865 FR C D E F |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
866 |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
867 left-props = '(front-sticky (p8 p9 pa pb pc pd pe pf) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
868 rear-nonsticky (p4 p5 p6 p7 p8 p9 pa pb) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
869 p0 L p1 L p2 L p3 L p4 L p5 L p6 L p7 L |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
870 p8 L p9 L pa L pb L pc L pd L pe L pf L) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
871 right-props = '(front-sticky (p2 p3 p6 p7 pa pb pe pf) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
872 rear-nonsticky (p1 p2 p5 p6 p9 pa pd pe) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
873 p0 R p1 R p2 R p3 R p4 R p5 R p6 R p7 R |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
874 p8 R p9 R pa R pb R pc R pd R pe R pf R) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
875 |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
876 We inherit from whoever has a sticky side facing us. If both sides |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
877 do (cases 2, 3, E, and F), then we inherit from whichever side has a |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
878 non-nil value for the current property. If both sides do, then we take |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
879 from the left. |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
880 |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
881 When we inherit a property, we get its stickiness as well as its value. |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
882 So, when we merge the above two lists, we expect to get this: |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
883 |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
884 result = '(front-sticky (p6 p7 pa pb pc pd pe pf) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
885 rear-nonsticky (p6 pa) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
886 p0 L p1 L p2 L p3 L p6 R p7 R |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
887 pa R pb R pc L pd L pe L pf L) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
888 |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
889 The optimizable special cases are: |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
890 left rear-nonsticky = nil, right front-sticky = nil (inherit left) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
891 left rear-nonsticky = t, right front-sticky = t (inherit right) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
892 left rear-nonsticky = t, right front-sticky = nil (inherit none) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
893 */ |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
894 |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
895 Lisp_Object |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
896 merge_properties_sticky (pleft, pright) |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
897 Lisp_Object pleft, pright; |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
898 { |
|
6501
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
899 register Lisp_Object props, front, rear; |
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
900 Lisp_Object lfront, lrear, rfront, rrear; |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
901 register Lisp_Object tail1, tail2, sym, lval, rval; |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
902 int use_left, use_right; |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
903 |
|
6501
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
904 props = Qnil; |
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
905 front = Qnil; |
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
906 rear = Qnil; |
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
907 lfront = textget (pleft, Qfront_sticky); |
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
908 lrear = textget (pleft, Qrear_nonsticky); |
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
909 rfront = textget (pright, Qfront_sticky); |
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
910 rrear = textget (pright, Qrear_nonsticky); |
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
911 |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
912 /* Go through each element of PRIGHT. */ |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
913 for (tail1 = pright; ! NILP (tail1); tail1 = Fcdr (Fcdr (tail1))) |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
914 { |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
915 sym = Fcar (tail1); |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
916 |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
917 /* Sticky properties get special treatment. */ |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
918 if (EQ (sym, Qrear_nonsticky) || EQ (sym, Qfront_sticky)) |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
919 continue; |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
920 |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
921 rval = Fcar (Fcdr (tail1)); |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
922 for (tail2 = pleft; ! NILP (tail2); tail2 = Fcdr (Fcdr (tail2))) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
923 if (EQ (sym, Fcar (tail2))) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
924 break; |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
925 lval = (NILP (tail2) ? Qnil : Fcar( Fcdr (tail2))); |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
926 |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
927 use_left = ! TMEM (sym, lrear); |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
928 use_right = TMEM (sym, rfront); |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
929 if (use_left && use_right) |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
930 { |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
931 use_left = ! NILP (lval); |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
932 use_right = ! NILP (rval); |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
933 } |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
934 if (use_left) |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
935 { |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
936 /* We build props as (value sym ...) rather than (sym value ...) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
937 because we plan to nreverse it when we're done. */ |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
938 if (! NILP (lval)) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
939 props = Fcons (lval, Fcons (sym, props)); |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
940 if (TMEM (sym, lfront)) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
941 front = Fcons (sym, front); |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
942 if (TMEM (sym, lrear)) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
943 rear = Fcons (sym, rear); |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
944 } |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
945 else if (use_right) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
946 { |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
947 if (! NILP (rval)) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
948 props = Fcons (rval, Fcons (sym, props)); |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
949 if (TMEM (sym, rfront)) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
950 front = Fcons (sym, front); |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
951 if (TMEM (sym, rrear)) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
952 rear = Fcons (sym, rear); |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
953 } |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
954 } |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
955 |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
956 /* Now go through each element of PLEFT. */ |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
957 for (tail2 = pleft; ! NILP (tail2); tail2 = Fcdr (Fcdr (tail2))) |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
958 { |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
959 sym = Fcar (tail2); |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
960 |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
961 /* Sticky properties get special treatment. */ |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
962 if (EQ (sym, Qrear_nonsticky) || EQ (sym, Qfront_sticky)) |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
963 continue; |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
964 |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
965 /* If sym is in PRIGHT, we've already considered it. */ |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
966 for (tail1 = pright; ! NILP (tail1); tail1 = Fcdr (Fcdr (tail1))) |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
967 if (EQ (sym, Fcar (tail1))) |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
968 break; |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
969 if (! NILP (tail1)) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
970 continue; |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
971 |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
972 lval = Fcar (Fcdr (tail2)); |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
973 |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
974 /* Since rval is known to be nil in this loop, the test simplifies. */ |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
975 if (! TMEM (sym, lrear)) |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
976 { |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
977 if (! NILP (lval)) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
978 props = Fcons (lval, Fcons (sym, props)); |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
979 if (TMEM (sym, lfront)) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
980 front = Fcons (sym, front); |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
981 } |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
982 else if (TMEM (sym, rfront)) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
983 { |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
984 /* The value is nil, but we still inherit the stickiness |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
985 from the right. */ |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
986 front = Fcons (sym, front); |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
987 if (TMEM (sym, rrear)) |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
988 rear = Fcons (sym, rear); |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
989 } |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
990 } |
|
5760
ffe89784cef2
(merge_properties_sticky): Preserve original order of properties.
Karl Heuer <kwzh@gnu.org>
parents:
5666
diff
changeset
|
991 props = Fnreverse (props); |
|
5768
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
992 if (! NILP (rear)) |
|
ab11e2af95ef
Add comments describing the rules used by the merge algorithm.
Karl Heuer <kwzh@gnu.org>
parents:
5760
diff
changeset
|
993 props = Fcons (Qrear_nonsticky, Fcons (Fnreverse (rear), props)); |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
994 if (! NILP (front)) |
|
5760
ffe89784cef2
(merge_properties_sticky): Preserve original order of properties.
Karl Heuer <kwzh@gnu.org>
parents:
5666
diff
changeset
|
995 props = Fcons (Qfront_sticky, Fcons (Fnreverse (front), props)); |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
996 return props; |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
997 } |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
998 |
| 1157 | 999 |
| 1164 | 1000 /* Delete an node I from its interval tree by merging its subtrees |
| 1001 into one subtree which is then returned. Caller is responsible for | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1002 storing the resulting subtree into its parent. */ |
| 1157 | 1003 |
| 1004 static INTERVAL | |
| 1005 delete_node (i) | |
| 1006 register INTERVAL i; | |
| 1007 { | |
| 1008 register INTERVAL migrate, this; | |
| 1009 register int migrate_amt; | |
| 1010 | |
| 1011 if (NULL_INTERVAL_P (i->left)) | |
| 1012 return i->right; | |
| 1013 if (NULL_INTERVAL_P (i->right)) | |
| 1014 return i->left; | |
| 1015 | |
| 1016 migrate = i->left; | |
| 1017 migrate_amt = i->left->total_length; | |
| 1018 this = i->right; | |
| 1019 this->total_length += migrate_amt; | |
| 1020 while (! NULL_INTERVAL_P (this->left)) | |
| 1021 { | |
| 1022 this = this->left; | |
| 1023 this->total_length += migrate_amt; | |
| 1024 } | |
| 1025 this->left = migrate; | |
| 1026 migrate->parent = this; | |
| 1027 | |
| 1028 return i->right; | |
| 1029 } | |
| 1030 | |
| 1031 /* Delete interval I from its tree by calling `delete_node' | |
| 1032 and properly connecting the resultant subtree. | |
| 1033 | |
| 1034 I is presumed to be empty; that is, no adjustments are made | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1035 for the length of I. */ |
| 1157 | 1036 |
| 1037 void | |
| 1038 delete_interval (i) | |
| 1039 register INTERVAL i; | |
| 1040 { | |
| 1041 register INTERVAL parent; | |
| 1042 int amt = LENGTH (i); | |
| 1043 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1044 if (amt > 0) /* Only used on zero-length intervals now. */ |
| 1157 | 1045 abort (); |
| 1046 | |
| 1047 if (ROOT_INTERVAL_P (i)) | |
| 1048 { | |
|
6501
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
1049 Lisp_Object owner; |
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
parents:
5780
diff
changeset
|
1050 owner = (Lisp_Object) i->parent; |
| 1157 | 1051 parent = delete_node (i); |
| 1052 if (! NULL_INTERVAL_P (parent)) | |
| 1053 parent->parent = (INTERVAL) owner; | |
| 1054 | |
|
9125
a78f02f76f03
(create_root_interval, balance_possible_root_interval, delete_interval): Use
Karl Heuer <kwzh@gnu.org>
parents:
9072
diff
changeset
|
1055 if (BUFFERP (owner)) |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1056 BUF_INTERVALS (XBUFFER (owner)) = parent; |
|
9125
a78f02f76f03
(create_root_interval, balance_possible_root_interval, delete_interval): Use
Karl Heuer <kwzh@gnu.org>
parents:
9072
diff
changeset
|
1057 else if (STRINGP (owner)) |
| 1157 | 1058 XSTRING (owner)->intervals = parent; |
| 1059 else | |
| 1060 abort (); | |
| 1061 | |
| 1062 return; | |
| 1063 } | |
| 1064 | |
| 1065 parent = i->parent; | |
| 1066 if (AM_LEFT_CHILD (i)) | |
| 1067 { | |
| 1068 parent->left = delete_node (i); | |
| 1069 if (! NULL_INTERVAL_P (parent->left)) | |
| 1070 parent->left->parent = parent; | |
| 1071 } | |
| 1072 else | |
| 1073 { | |
| 1074 parent->right = delete_node (i); | |
| 1075 if (! NULL_INTERVAL_P (parent->right)) | |
| 1076 parent->right->parent = parent; | |
| 1077 } | |
| 1078 } | |
| 1079 | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1080 /* Find the interval in TREE corresponding to the relative position |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1081 FROM and delete as much as possible of AMOUNT from that interval. |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1082 Return the amount actually deleted, and if the interval was |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1083 zeroed-out, delete that interval node from the tree. |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1084 |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1085 Note that FROM is actually origin zero, aka relative to the |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1086 leftmost edge of tree. This is appropriate since we call ourselves |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1087 recursively on subtrees. |
| 1157 | 1088 |
| 1189 | 1089 Do this by recursing down TREE to the interval in question, and |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1090 deleting the appropriate amount of text. */ |
| 1157 | 1091 |
| 1092 static int | |
| 1093 interval_deletion_adjustment (tree, from, amount) | |
| 1094 register INTERVAL tree; | |
| 1095 register int from, amount; | |
| 1096 { | |
| 1097 register int relative_position = from; | |
| 1098 | |
| 1099 if (NULL_INTERVAL_P (tree)) | |
| 1100 return 0; | |
| 1101 | |
| 1102 /* Left branch */ | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1103 if (relative_position < LEFT_TOTAL_LENGTH (tree)) |
| 1157 | 1104 { |
| 1105 int subtract = interval_deletion_adjustment (tree->left, | |
| 1106 relative_position, | |
| 1107 amount); | |
| 1108 tree->total_length -= subtract; | |
| 1109 return subtract; | |
| 1110 } | |
| 1111 /* Right branch */ | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1112 else if (relative_position >= (TOTAL_LENGTH (tree) |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1113 - RIGHT_TOTAL_LENGTH (tree))) |
| 1157 | 1114 { |
| 1115 int subtract; | |
| 1116 | |
| 1117 relative_position -= (tree->total_length | |
| 1118 - RIGHT_TOTAL_LENGTH (tree)); | |
| 1119 subtract = interval_deletion_adjustment (tree->right, | |
| 1120 relative_position, | |
| 1121 amount); | |
| 1122 tree->total_length -= subtract; | |
| 1123 return subtract; | |
| 1124 } | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1125 /* Here -- this node. */ |
| 1157 | 1126 else |
| 1127 { | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1128 /* How much can we delete from this interval? */ |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1129 int my_amount = ((tree->total_length |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1130 - RIGHT_TOTAL_LENGTH (tree)) |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1131 - relative_position); |
| 1157 | 1132 |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1133 if (amount > my_amount) |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1134 amount = my_amount; |
| 1157 | 1135 |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1136 tree->total_length -= amount; |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1137 if (LENGTH (tree) == 0) |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1138 delete_interval (tree); |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1139 |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1140 return amount; |
| 1157 | 1141 } |
| 1142 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1143 /* Never reach here. */ |
| 1157 | 1144 } |
| 1145 | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1146 /* Effect the adjustments necessary to the interval tree of BUFFER to |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1147 correspond to the deletion of LENGTH characters from that buffer |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1148 text. The deletion is effected at position START (which is a |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1149 buffer position, i.e. origin 1). */ |
| 1189 | 1150 |
| 1157 | 1151 static void |
| 1152 adjust_intervals_for_deletion (buffer, start, length) | |
| 1153 struct buffer *buffer; | |
| 1154 int start, length; | |
| 1155 { | |
| 1156 register int left_to_delete = length; | |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1157 register INTERVAL tree = BUF_INTERVALS (buffer); |
| 1157 | 1158 register int deleted; |
| 1159 | |
| 1160 if (NULL_INTERVAL_P (tree)) | |
| 1161 return; | |
| 1162 | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1163 if (start > BEG + TOTAL_LENGTH (tree) |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1164 || start + length > BEG + TOTAL_LENGTH (tree)) |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1165 abort (); |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1166 |
| 1157 | 1167 if (length == TOTAL_LENGTH (tree)) |
| 1168 { | |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1169 BUF_INTERVALS (buffer) = NULL_INTERVAL; |
| 1157 | 1170 return; |
| 1171 } | |
| 1172 | |
| 1173 if (ONLY_INTERVAL_P (tree)) | |
| 1174 { | |
| 1175 tree->total_length -= length; | |
| 1176 return; | |
| 1177 } | |
| 1178 | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1179 if (start > BEG + TOTAL_LENGTH (tree)) |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1180 start = BEG + TOTAL_LENGTH (tree); |
| 1157 | 1181 while (left_to_delete > 0) |
| 1182 { | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1183 left_to_delete -= interval_deletion_adjustment (tree, start - 1, |
| 1157 | 1184 left_to_delete); |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1185 tree = BUF_INTERVALS (buffer); |
| 1157 | 1186 if (left_to_delete == tree->total_length) |
| 1187 { | |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1188 BUF_INTERVALS (buffer) = NULL_INTERVAL; |
| 1157 | 1189 return; |
| 1190 } | |
| 1191 } | |
| 1192 } | |
| 1193 | |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3490
diff
changeset
|
1194 /* Make the adjustments necessary to the interval tree of BUFFER to |
| 1189 | 1195 represent an addition or deletion of LENGTH characters starting |
| 1196 at position START. Addition or deletion is indicated by the sign | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1197 of LENGTH. */ |
| 1157 | 1198 |
| 1199 INLINE void | |
| 1200 offset_intervals (buffer, start, length) | |
| 1201 struct buffer *buffer; | |
| 1202 int start, length; | |
| 1203 { | |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1204 if (NULL_INTERVAL_P (BUF_INTERVALS (buffer)) || length == 0) |
| 1157 | 1205 return; |
| 1206 | |
| 1207 if (length > 0) | |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1208 adjust_intervals_for_insertion (BUF_INTERVALS (buffer), start, length); |
| 1157 | 1209 else |
| 1210 adjust_intervals_for_deletion (buffer, start, -length); | |
| 1211 } | |
| 1211 | 1212 |
| 1213 /* Merge interval I with its lexicographic successor. The resulting | |
| 1214 interval is returned, and has the properties of the original | |
| 1215 successor. The properties of I are lost. I is removed from the | |
| 1216 interval tree. | |
| 1157 | 1217 |
| 1211 | 1218 IMPORTANT: |
| 1219 The caller must verify that this is not the last (rightmost) | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1220 interval. */ |
| 1211 | 1221 |
| 1222 INTERVAL | |
| 1223 merge_interval_right (i) | |
| 1224 register INTERVAL i; | |
| 1225 { | |
| 1226 register int absorb = LENGTH (i); | |
| 1227 register INTERVAL successor; | |
| 1228 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1229 /* Zero out this interval. */ |
| 1211 | 1230 i->total_length -= absorb; |
| 1231 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1232 /* Find the succeeding interval. */ |
| 1211 | 1233 if (! NULL_RIGHT_CHILD (i)) /* It's below us. Add absorb |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1234 as we descend. */ |
| 1211 | 1235 { |
| 1236 successor = i->right; | |
| 1237 while (! NULL_LEFT_CHILD (successor)) | |
| 1238 { | |
| 1239 successor->total_length += absorb; | |
| 1240 successor = successor->left; | |
| 1241 } | |
| 1242 | |
| 1243 successor->total_length += absorb; | |
| 1244 delete_interval (i); | |
| 1245 return successor; | |
| 1246 } | |
| 1247 | |
| 1248 successor = i; | |
| 1249 while (! NULL_PARENT (successor)) /* It's above us. Subtract as | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1250 we ascend. */ |
| 1211 | 1251 { |
| 1252 if (AM_LEFT_CHILD (successor)) | |
| 1253 { | |
| 1254 successor = successor->parent; | |
| 1255 delete_interval (i); | |
| 1256 return successor; | |
| 1257 } | |
| 1258 | |
| 1259 successor = successor->parent; | |
| 1260 successor->total_length -= absorb; | |
| 1261 } | |
| 1262 | |
| 1263 /* This must be the rightmost or last interval and cannot | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1264 be merged right. The caller should have known. */ |
| 1211 | 1265 abort (); |
| 1266 } | |
| 1267 | |
| 1268 /* Merge interval I with its lexicographic predecessor. The resulting | |
| 1269 interval is returned, and has the properties of the original predecessor. | |
| 1270 The properties of I are lost. Interval node I is removed from the tree. | |
| 1271 | |
| 1272 IMPORTANT: | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1273 The caller must verify that this is not the first (leftmost) interval. */ |
| 1211 | 1274 |
| 1275 INTERVAL | |
| 1276 merge_interval_left (i) | |
| 1277 register INTERVAL i; | |
| 1278 { | |
| 1279 register int absorb = LENGTH (i); | |
| 1280 register INTERVAL predecessor; | |
| 1281 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1282 /* Zero out this interval. */ |
| 1211 | 1283 i->total_length -= absorb; |
| 1284 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1285 /* Find the preceding interval. */ |
| 1211 | 1286 if (! NULL_LEFT_CHILD (i)) /* It's below us. Go down, |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1287 adding ABSORB as we go. */ |
| 1211 | 1288 { |
| 1289 predecessor = i->left; | |
| 1290 while (! NULL_RIGHT_CHILD (predecessor)) | |
| 1291 { | |
| 1292 predecessor->total_length += absorb; | |
| 1293 predecessor = predecessor->right; | |
| 1294 } | |
| 1295 | |
| 1296 predecessor->total_length += absorb; | |
| 1297 delete_interval (i); | |
| 1298 return predecessor; | |
| 1299 } | |
| 1300 | |
| 1301 predecessor = i; | |
| 1302 while (! NULL_PARENT (predecessor)) /* It's above us. Go up, | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1303 subtracting ABSORB. */ |
| 1211 | 1304 { |
| 1305 if (AM_RIGHT_CHILD (predecessor)) | |
| 1306 { | |
| 1307 predecessor = predecessor->parent; | |
| 1308 delete_interval (i); | |
| 1309 return predecessor; | |
| 1310 } | |
| 1311 | |
| 1312 predecessor = predecessor->parent; | |
| 1313 predecessor->total_length -= absorb; | |
| 1314 } | |
| 1315 | |
| 1316 /* This must be the leftmost or first interval and cannot | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1317 be merged left. The caller should have known. */ |
| 1211 | 1318 abort (); |
| 1319 } | |
| 1320 | |
| 1189 | 1321 /* Make an exact copy of interval tree SOURCE which descends from |
| 1322 PARENT. This is done by recursing through SOURCE, copying | |
| 1323 the current interval and its properties, and then adjusting | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1324 the pointers of the copy. */ |
| 1189 | 1325 |
| 1157 | 1326 static INTERVAL |
| 1327 reproduce_tree (source, parent) | |
| 1328 INTERVAL source, parent; | |
| 1329 { | |
| 1330 register INTERVAL t = make_interval (); | |
| 1331 | |
| 1332 bcopy (source, t, INTERVAL_SIZE); | |
| 1333 copy_properties (source, t); | |
| 1334 t->parent = parent; | |
| 1335 if (! NULL_LEFT_CHILD (source)) | |
| 1336 t->left = reproduce_tree (source->left, t); | |
| 1337 if (! NULL_RIGHT_CHILD (source)) | |
| 1338 t->right = reproduce_tree (source->right, t); | |
| 1339 | |
| 1340 return t; | |
| 1341 } | |
| 1342 | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1343 #if 0 |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1344 /* Nobody calls this. Perhaps it's a vestige of an earlier design. */ |
|
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1345 |
| 1189 | 1346 /* Make a new interval of length LENGTH starting at START in the |
| 1347 group of intervals INTERVALS, which is actually an interval tree. | |
| 1348 Returns the new interval. | |
| 1349 | |
| 1350 Generate an error if the new positions would overlap an existing | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1351 interval. */ |
| 1189 | 1352 |
| 1157 | 1353 static INTERVAL |
| 1354 make_new_interval (intervals, start, length) | |
| 1355 INTERVAL intervals; | |
| 1356 int start, length; | |
| 1357 { | |
| 1358 INTERVAL slot; | |
| 1359 | |
| 1360 slot = find_interval (intervals, start); | |
| 1361 if (start + length > slot->position + LENGTH (slot)) | |
| 1362 error ("Interval would overlap"); | |
| 1363 | |
| 1364 if (start == slot->position && length == LENGTH (slot)) | |
| 1365 return slot; | |
| 1366 | |
| 1367 if (slot->position == start) | |
| 1368 { | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1369 /* New right node. */ |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
1370 split_interval_right (slot, length); |
| 1157 | 1371 return slot; |
| 1372 } | |
| 1373 | |
| 1374 if (slot->position + LENGTH (slot) == start + length) | |
| 1375 { | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1376 /* New left node. */ |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
1377 split_interval_left (slot, LENGTH (slot) - length); |
| 1157 | 1378 return slot; |
| 1379 } | |
| 1380 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1381 /* Convert interval SLOT into three intervals. */ |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
1382 split_interval_left (slot, start - slot->position); |
|
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
1383 split_interval_right (slot, length); |
| 1157 | 1384 return slot; |
| 1385 } | |
|
4005
da8962f65741
* intervals.c (find_interval): Doc fixes, computation of
Jim Blandy <jimb@redhat.com>
parents:
3998
diff
changeset
|
1386 #endif |
|
2052
48c83a34c005
(verify_interval_modification): Handle insertions
Richard M. Stallman <rms@gnu.org>
parents:
1964
diff
changeset
|
1387 |
| 1211 | 1388 /* Insert the intervals of SOURCE into BUFFER at POSITION. |
|
5169
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1389 LENGTH is the length of the text in SOURCE. |
| 1157 | 1390 |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
1391 This is used in insdel.c when inserting Lisp_Strings into the |
|
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
1392 buffer. The text corresponding to SOURCE is already in the buffer |
|
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
1393 when this is called. The intervals of new tree are a copy of those |
|
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
1394 belonging to the string being inserted; intervals are never |
|
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
1395 shared. |
| 1157 | 1396 |
|
5169
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1397 If the inserted text had no intervals associated, and we don't |
|
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1398 want to inherit the surrounding text's properties, this function |
| 1157 | 1399 simply returns -- offset_intervals should handle placing the |
| 1164 | 1400 text in the correct interval, depending on the sticky bits. |
| 1157 | 1401 |
| 1402 If the inserted text had properties (intervals), then there are two | |
| 1403 cases -- either insertion happened in the middle of some interval, | |
| 1404 or between two intervals. | |
| 1405 | |
| 1406 If the text goes into the middle of an interval, then new | |
| 1407 intervals are created in the middle with only the properties of | |
| 1408 the new text, *unless* the macro MERGE_INSERTIONS is true, in | |
| 1409 which case the new text has the union of its properties and those | |
| 1410 of the text into which it was inserted. | |
| 1411 | |
| 1412 If the text goes between two intervals, then if neither interval | |
| 1164 | 1413 had its appropriate sticky property set (front_sticky, rear_sticky), |
| 1414 the new text has only its properties. If one of the sticky properties | |
| 1157 | 1415 is set, then the new text "sticks" to that region and its properties |
|
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3490
diff
changeset
|
1416 depend on merging as above. If both the preceding and succeeding |
| 1164 | 1417 intervals to the new text are "sticky", then the new text retains |
| 1418 only its properties, as if neither sticky property were set. Perhaps | |
| 1157 | 1419 we should consider merging all three sets of properties onto the new |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1420 text... */ |
| 1157 | 1421 |
| 1422 void | |
|
5169
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1423 graft_intervals_into_buffer (source, position, length, buffer, inherit) |
| 1211 | 1424 INTERVAL source; |
|
5169
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1425 int position, length; |
| 1211 | 1426 struct buffer *buffer; |
|
4718
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1427 int inherit; |
| 1157 | 1428 { |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1429 register INTERVAL under, over, this, prev; |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1430 register INTERVAL tree; |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1431 int middle; |
| 1157 | 1432 |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1433 tree = BUF_INTERVALS (buffer); |
|
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1434 |
| 1157 | 1435 /* If the new text has no properties, it becomes part of whatever |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1436 interval it was inserted into. */ |
| 1211 | 1437 if (NULL_INTERVAL_P (source)) |
|
5169
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1438 { |
|
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1439 Lisp_Object buf; |
|
5250
63a865489a1e
(graft_intervals_into_buffer): If SOURCE is null
Richard M. Stallman <rms@gnu.org>
parents:
5173
diff
changeset
|
1440 if (!inherit && ! NULL_INTERVAL_P (tree)) |
|
5169
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1441 { |
|
9271
1971a6a8cdc0
(graft_intervals_into_buffer): Use new accessor macros instead of calling XSET
Karl Heuer <kwzh@gnu.org>
parents:
9125
diff
changeset
|
1442 XSETBUFFER (buf, buffer); |
|
5169
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1443 Fset_text_properties (make_number (position), |
|
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1444 make_number (position + length), |
|
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1445 Qnil, buf); |
|
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1446 } |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1447 if (! NULL_INTERVAL_P (BUF_INTERVALS (buffer))) |
|
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1448 BUF_INTERVALS (buffer) = balance_an_interval (BUF_INTERVALS (buffer)); |
|
5169
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1449 return; |
|
d040c1a8ccbe
(graft_intervals_into_buffer): New arg LENGTH.
Richard M. Stallman <rms@gnu.org>
parents:
4962
diff
changeset
|
1450 } |
| 1157 | 1451 |
| 1452 if (NULL_INTERVAL_P (tree)) | |
| 1453 { | |
| 1454 /* The inserted text constitutes the whole buffer, so | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1455 simply copy over the interval structure. */ |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
1456 if ((BUF_Z (buffer) - BUF_BEG (buffer)) == TOTAL_LENGTH (source)) |
| 1157 | 1457 { |
|
4223
b044f6d3c4cb
(graft_intervals_into_buffer): When TREE is null,
Richard M. Stallman <rms@gnu.org>
parents:
4135
diff
changeset
|
1458 Lisp_Object buf; |
|
9271
1971a6a8cdc0
(graft_intervals_into_buffer): Use new accessor macros instead of calling XSET
Karl Heuer <kwzh@gnu.org>
parents:
9125
diff
changeset
|
1459 XSETBUFFER (buf, buffer); |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1460 BUF_INTERVALS (buffer) = reproduce_tree (source, buf); |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1461 /* Explicitly free the old tree here. */ |
| 1157 | 1462 |
| 1463 return; | |
| 1464 } | |
| 1465 | |
| 1466 /* Create an interval tree in which to place a copy | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1467 of the intervals of the inserted string. */ |
| 1157 | 1468 { |
| 1307 | 1469 Lisp_Object buf; |
|
9271
1971a6a8cdc0
(graft_intervals_into_buffer): Use new accessor macros instead of calling XSET
Karl Heuer <kwzh@gnu.org>
parents:
9125
diff
changeset
|
1470 XSETBUFFER (buf, buffer); |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1471 tree = create_root_interval (buf); |
| 1157 | 1472 } |
| 1473 } | |
|
4718
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1474 else if (TOTAL_LENGTH (tree) == TOTAL_LENGTH (source)) |
|
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1475 /* If the buffer contains only the new string, but |
|
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1476 there was already some interval tree there, then it may be |
|
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1477 some zero length intervals. Eventually, do something clever |
|
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1478 about inserting properly. For now, just waste the old intervals. */ |
|
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1479 { |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1480 BUF_INTERVALS (buffer) = reproduce_tree (source, tree->parent); |
|
4718
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1481 /* Explicitly free the old tree here. */ |
| 1157 | 1482 |
|
4718
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1483 return; |
|
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1484 } |
|
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1485 /* Paranoia -- the text has already been added, so this buffer |
|
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1486 should be of non-zero length. */ |
|
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1487 else if (TOTAL_LENGTH (tree) == 0) |
|
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1488 abort (); |
| 1157 | 1489 |
| 1490 this = under = find_interval (tree, position); | |
| 1491 if (NULL_INTERVAL_P (under)) /* Paranoia */ | |
| 1492 abort (); | |
| 1211 | 1493 over = find_interval (source, 1); |
| 1157 | 1494 |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1495 /* Here for insertion in the middle of an interval. |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1496 Split off an equivalent interval to the right, |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1497 then don't bother with it any more. */ |
| 1157 | 1498 |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1499 if (position > under->position) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1500 { |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1501 INTERVAL end_unchanged |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
1502 = split_interval_left (this, position - under->position); |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1503 copy_properties (under, end_unchanged); |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1504 under->position = position; |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1505 prev = 0; |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1506 middle = 1; |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1507 } |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1508 else |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1509 { |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1510 prev = previous_interval (under); |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1511 if (prev && !END_NONSTICKY_P (prev)) |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1512 prev = 0; |
| 1157 | 1513 } |
| 1514 | |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1515 /* Insertion is now at beginning of UNDER. */ |
| 1157 | 1516 |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1517 /* The inserted text "sticks" to the interval `under', |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1518 which means it gets those properties. |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1519 The properties of under are the result of |
| 14036 | 1520 adjust_intervals_for_insertion, so stickiness has |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1521 already been taken care of. */ |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1522 |
| 1157 | 1523 while (! NULL_INTERVAL_P (over)) |
| 1524 { | |
|
5666
ceed2e32b303
(graft_intervals_into_buffer): Fix one-off
Richard M. Stallman <rms@gnu.org>
parents:
5415
diff
changeset
|
1525 if (LENGTH (over) < LENGTH (under)) |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1526 { |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1527 this = split_interval_left (under, LENGTH (over)); |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1528 copy_properties (under, this); |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1529 } |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1530 else |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1531 this = under; |
| 1157 | 1532 copy_properties (over, this); |
|
4718
a05b833e61c4
(graft_intervals_into_buffer): New arg INHERIT.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
1533 if (inherit) |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1534 merge_properties (over, this); |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1535 else |
|
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1536 copy_properties (over, this); |
| 1157 | 1537 over = next_interval (over); |
| 1538 } | |
| 1539 | |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1540 if (! NULL_INTERVAL_P (BUF_INTERVALS (buffer))) |
|
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1541 BUF_INTERVALS (buffer) = balance_an_interval (BUF_INTERVALS (buffer)); |
| 1157 | 1542 return; |
| 1543 } | |
| 1544 | |
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1545 /* Get the value of property PROP from PLIST, |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1546 which is the plist of an interval. |
|
10927
7d02d12082ff
(textget): Check default_properties vbl too.
Boris Goldowsky <boris@gnu.org>
parents:
10563
diff
changeset
|
1547 We check for direct properties, for categories with property PROP, |
|
11133
119880025e8f
(Vdefault_text_properties): name changed from Vdefault_properties.
Boris Goldowsky <boris@gnu.org>
parents:
10927
diff
changeset
|
1548 and for PROP appearing on the default-text-properties list. */ |
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1549 |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1550 Lisp_Object |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1551 textget (plist, prop) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1552 Lisp_Object plist; |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1553 register Lisp_Object prop; |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1554 { |
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1555 register Lisp_Object tail, fallback; |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1556 fallback = Qnil; |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1557 |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1558 for (tail = plist; !NILP (tail); tail = Fcdr (Fcdr (tail))) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1559 { |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1560 register Lisp_Object tem; |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1561 tem = Fcar (tail); |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1562 if (EQ (prop, tem)) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1563 return Fcar (Fcdr (tail)); |
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1564 if (EQ (tem, Qcategory)) |
|
8611
65a058371675
(textget): Ignore category prop if not a symbol.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1565 { |
|
65a058371675
(textget): Ignore category prop if not a symbol.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1566 tem = Fcar (Fcdr (tail)); |
|
65a058371675
(textget): Ignore category prop if not a symbol.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1567 if (SYMBOLP (tem)) |
|
65a058371675
(textget): Ignore category prop if not a symbol.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1568 fallback = Fget (tem, prop); |
|
65a058371675
(textget): Ignore category prop if not a symbol.
Richard M. Stallman <rms@gnu.org>
parents:
7307
diff
changeset
|
1569 } |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1570 } |
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1571 |
|
10927
7d02d12082ff
(textget): Check default_properties vbl too.
Boris Goldowsky <boris@gnu.org>
parents:
10563
diff
changeset
|
1572 if (! NILP (fallback)) |
|
7d02d12082ff
(textget): Check default_properties vbl too.
Boris Goldowsky <boris@gnu.org>
parents:
10563
diff
changeset
|
1573 return fallback; |
|
11133
119880025e8f
(Vdefault_text_properties): name changed from Vdefault_properties.
Boris Goldowsky <boris@gnu.org>
parents:
10927
diff
changeset
|
1574 if (CONSP (Vdefault_text_properties)) |
|
119880025e8f
(Vdefault_text_properties): name changed from Vdefault_properties.
Boris Goldowsky <boris@gnu.org>
parents:
10927
diff
changeset
|
1575 return Fplist_get (Vdefault_text_properties, prop); |
|
10927
7d02d12082ff
(textget): Check default_properties vbl too.
Boris Goldowsky <boris@gnu.org>
parents:
10563
diff
changeset
|
1576 return Qnil; |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1577 } |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1578 |
|
2052
48c83a34c005
(verify_interval_modification): Handle insertions
Richard M. Stallman <rms@gnu.org>
parents:
1964
diff
changeset
|
1579 |
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1580 /* Set point in BUFFER to POSITION. If the target position is |
| 7104 | 1581 before an intangible character, move to an ok place. */ |
| 1157 | 1582 |
| 1583 void | |
| 1584 set_point (position, buffer) | |
| 1585 register int position; | |
| 1586 register struct buffer *buffer; | |
| 1587 { | |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1588 register INTERVAL to, from, toprev, fromprev, target; |
| 1157 | 1589 int buffer_point; |
| 1590 register Lisp_Object obj; | |
| 1591 int backwards = (position < BUF_PT (buffer)) ? 1 : 0; | |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1592 int old_position = BUF_PT (buffer); |
| 1157 | 1593 |
|
10563
d35f5eca6dd5
(set_point): Set point_before_scroll to nil.
Richard M. Stallman <rms@gnu.org>
parents:
10313
diff
changeset
|
1594 buffer->point_before_scroll = Qnil; |
|
d35f5eca6dd5
(set_point): Set point_before_scroll to nil.
Richard M. Stallman <rms@gnu.org>
parents:
10313
diff
changeset
|
1595 |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1596 if (position == BUF_PT (buffer)) |
| 1157 | 1597 return; |
| 1598 | |
|
2779
857bb0f59668
* intervals.c (set_point): Check for point out of bounds before
Jim Blandy <jimb@redhat.com>
parents:
2090
diff
changeset
|
1599 /* Check this now, before checking if the buffer has any intervals. |
|
857bb0f59668
* intervals.c (set_point): Check for point out of bounds before
Jim Blandy <jimb@redhat.com>
parents:
2090
diff
changeset
|
1600 That way, we can catch conditions which break this sanity check |
|
857bb0f59668
* intervals.c (set_point): Check for point out of bounds before
Jim Blandy <jimb@redhat.com>
parents:
2090
diff
changeset
|
1601 whether or not there are intervals in the buffer. */ |
|
857bb0f59668
* intervals.c (set_point): Check for point out of bounds before
Jim Blandy <jimb@redhat.com>
parents:
2090
diff
changeset
|
1602 if (position > BUF_Z (buffer) || position < BUF_BEG (buffer)) |
|
857bb0f59668
* intervals.c (set_point): Check for point out of bounds before
Jim Blandy <jimb@redhat.com>
parents:
2090
diff
changeset
|
1603 abort (); |
|
857bb0f59668
* intervals.c (set_point): Check for point out of bounds before
Jim Blandy <jimb@redhat.com>
parents:
2090
diff
changeset
|
1604 |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1605 if (NULL_INTERVAL_P (BUF_INTERVALS (buffer))) |
| 1157 | 1606 { |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1607 |
|
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1608 BUF_PT (buffer) = position; |
| 1157 | 1609 return; |
| 1610 } | |
| 1611 | |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1612 /* Set TO to the interval containing the char after POSITION, |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1613 and TOPREV to the interval containing the char before POSITION. |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1614 Either one may be null. They may be equal. */ |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1615 to = find_interval (BUF_INTERVALS (buffer), position); |
|
2052
48c83a34c005
(verify_interval_modification): Handle insertions
Richard M. Stallman <rms@gnu.org>
parents:
1964
diff
changeset
|
1616 if (position == BUF_BEGV (buffer)) |
|
48c83a34c005
(verify_interval_modification): Handle insertions
Richard M. Stallman <rms@gnu.org>
parents:
1964
diff
changeset
|
1617 toprev = 0; |
|
48c83a34c005
(verify_interval_modification): Handle insertions
Richard M. Stallman <rms@gnu.org>
parents:
1964
diff
changeset
|
1618 else if (to->position == position) |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1619 toprev = previous_interval (to); |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1620 else |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1621 toprev = to; |
| 1211 | 1622 |
|
2052
48c83a34c005
(verify_interval_modification): Handle insertions
Richard M. Stallman <rms@gnu.org>
parents:
1964
diff
changeset
|
1623 buffer_point = (BUF_PT (buffer) == BUF_ZV (buffer) |
|
48c83a34c005
(verify_interval_modification): Handle insertions
Richard M. Stallman <rms@gnu.org>
parents:
1964
diff
changeset
|
1624 ? BUF_ZV (buffer) - 1 |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1625 : BUF_PT (buffer)); |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1626 |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1627 /* Set FROM to the interval containing the char after PT, |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1628 and FROMPREV to the interval containing the char before PT. |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1629 Either one may be null. They may be equal. */ |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1630 /* We could cache this and save time. */ |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1631 from = find_interval (BUF_INTERVALS (buffer), buffer_point); |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1632 if (buffer_point == BUF_BEGV (buffer)) |
|
2052
48c83a34c005
(verify_interval_modification): Handle insertions
Richard M. Stallman <rms@gnu.org>
parents:
1964
diff
changeset
|
1633 fromprev = 0; |
|
48c83a34c005
(verify_interval_modification): Handle insertions
Richard M. Stallman <rms@gnu.org>
parents:
1964
diff
changeset
|
1634 else if (from->position == BUF_PT (buffer)) |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1635 fromprev = previous_interval (from); |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1636 else if (buffer_point != BUF_PT (buffer)) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1637 fromprev = from, from = 0; |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1638 else |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1639 fromprev = from; |
| 1157 | 1640 |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1641 /* Moving within an interval. */ |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1642 if (to == from && toprev == fromprev && INTERVAL_VISIBLE_P (to)) |
| 1157 | 1643 { |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1644 BUF_PT (buffer) = position; |
| 1157 | 1645 return; |
| 1646 } | |
| 1647 | |
|
11327
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1648 /* If the new position is between two intangible characters |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1649 with the same intangible property value, |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1650 move forward or backward until a change in that property. */ |
|
9072
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1651 if (NILP (Vinhibit_point_motion_hooks) && ! NULL_INTERVAL_P (to) |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1652 && ! NULL_INTERVAL_P (toprev)) |
| 1157 | 1653 { |
|
9072
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1654 if (backwards) |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1655 { |
|
11327
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1656 Lisp_Object intangible_propval; |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1657 intangible_propval = textget (to->plist, Qintangible); |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1658 |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1659 /* If following char is intangible, |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1660 skip back over all chars with matching intangible property. */ |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1661 if (! NILP (intangible_propval)) |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1662 while (to == toprev |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1663 || ((! NULL_INTERVAL_P (toprev) |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1664 && EQ (textget (toprev->plist, Qintangible), |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1665 intangible_propval)))) |
|
9072
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1666 { |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1667 to = toprev; |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1668 toprev = previous_interval (toprev); |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1669 if (NULL_INTERVAL_P (toprev)) |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1670 position = BUF_BEGV (buffer); |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1671 else |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1672 /* This is the only line that's not |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1673 dual to the following loop. |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1674 That's because we want the position |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1675 at the end of TOPREV. */ |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1676 position = to->position; |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1677 } |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1678 } |
|
3734
5ada670e1fd8
(set_point): When moving over invis chars,
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
1679 else |
|
9072
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1680 { |
|
11327
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1681 Lisp_Object intangible_propval; |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1682 intangible_propval = textget (toprev->plist, Qintangible); |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1683 |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1684 /* If previous char is intangible, |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1685 skip fwd over all chars with matching intangible property. */ |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1686 if (! NILP (intangible_propval)) |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1687 while (to == toprev |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1688 || ((! NULL_INTERVAL_P (to) |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1689 && EQ (textget (to->plist, Qintangible), |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1690 intangible_propval)))) |
|
9072
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1691 { |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1692 toprev = to; |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1693 to = next_interval (to); |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1694 if (NULL_INTERVAL_P (to)) |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1695 position = BUF_ZV (buffer); |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1696 else |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1697 position = to->position; |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1698 } |
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
parents:
8897
diff
changeset
|
1699 } |
| 1157 | 1700 } |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1701 |
|
11327
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1702 /* Here TO is the interval after the stopping point |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1703 and TOPREV is the interval before the stopping point. |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1704 One or the other may be null. */ |
|
76908dad81a4
(set_point): When skipping intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
1705 |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1706 BUF_PT (buffer) = position; |
| 1157 | 1707 |
| 1288 | 1708 /* We run point-left and point-entered hooks here, iff the |
| 1709 two intervals are not equivalent. These hooks take | |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1710 (old_point, new_point) as arguments. */ |
|
4243
23fe7f6c9ae4
(set_point): Test Vinhibit_point_motion_hooks.
Richard M. Stallman <rms@gnu.org>
parents:
4223
diff
changeset
|
1711 if (NILP (Vinhibit_point_motion_hooks) |
|
23fe7f6c9ae4
(set_point): Test Vinhibit_point_motion_hooks.
Richard M. Stallman <rms@gnu.org>
parents:
4223
diff
changeset
|
1712 && (! intervals_equal (from, to) |
|
23fe7f6c9ae4
(set_point): Test Vinhibit_point_motion_hooks.
Richard M. Stallman <rms@gnu.org>
parents:
4223
diff
changeset
|
1713 || ! intervals_equal (fromprev, toprev))) |
| 1211 | 1714 { |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1715 Lisp_Object leave_after, leave_before, enter_after, enter_before; |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1716 |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1717 if (fromprev) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1718 leave_after = textget (fromprev->plist, Qpoint_left); |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1719 else |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1720 leave_after = Qnil; |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1721 if (from) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1722 leave_before = textget (from->plist, Qpoint_left); |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1723 else |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1724 leave_before = Qnil; |
| 1211 | 1725 |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1726 if (toprev) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1727 enter_after = textget (toprev->plist, Qpoint_entered); |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1728 else |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1729 enter_after = Qnil; |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1730 if (to) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1731 enter_before = textget (to->plist, Qpoint_entered); |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1732 else |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1733 enter_before = Qnil; |
| 1211 | 1734 |
|
1964
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1735 if (! EQ (leave_before, enter_before) && !NILP (leave_before)) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1736 call2 (leave_before, old_position, position); |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1737 if (! EQ (leave_after, enter_after) && !NILP (leave_after)) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1738 call2 (leave_after, old_position, position); |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1739 |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1740 if (! EQ (enter_before, leave_before) && !NILP (enter_before)) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1741 call2 (enter_before, old_position, position); |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1742 if (! EQ (enter_after, leave_after) && !NILP (enter_after)) |
|
e6c49ff3a53c
(intervals_equal): Handle one arg null and other not.
Richard M. Stallman <rms@gnu.org>
parents:
1958
diff
changeset
|
1743 call2 (enter_after, old_position, position); |
| 1211 | 1744 } |
| 1157 | 1745 } |
| 1746 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1747 /* Set point temporarily, without checking any text properties. */ |
| 1157 | 1748 |
| 1211 | 1749 INLINE void |
| 1750 temp_set_point (position, buffer) | |
| 1751 int position; | |
| 1752 struct buffer *buffer; | |
| 1753 { | |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1754 BUF_PT (buffer) = position; |
| 1211 | 1755 } |
|
2052
48c83a34c005
(verify_interval_modification): Handle insertions
Richard M. Stallman <rms@gnu.org>
parents:
1964
diff
changeset
|
1756 |
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1757 /* Return the proper local map for position POSITION in BUFFER. |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1758 Use the map specified by the local-map property, if any. |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1759 Otherwise, use BUFFER's local map. */ |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1760 |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1761 Lisp_Object |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1762 get_local_map (position, buffer) |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1763 register int position; |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1764 register struct buffer *buffer; |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1765 { |
|
11660
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1766 Lisp_Object prop, tem, lispy_position, lispy_buffer; |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1767 int old_begv, old_zv; |
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1768 |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1769 /* Perhaps we should just change `position' to the limit. */ |
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1770 if (position > BUF_Z (buffer) || position < BUF_BEG (buffer)) |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1771 abort (); |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1772 |
|
11660
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1773 /* Ignore narrowing, so that a local map continues to be valid even if |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1774 the visible region contains no characters and hence no properties. */ |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1775 old_begv = BUF_BEGV (buffer); |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1776 old_zv = BUF_ZV (buffer); |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1777 BUF_BEGV (buffer) = BUF_BEG (buffer); |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1778 BUF_ZV (buffer) = BUF_Z (buffer); |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1779 |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1780 /* There are no properties at the end of the buffer, so in that case |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1781 check for a local map on the last character of the buffer instead. */ |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1782 if (position == BUF_Z (buffer) && BUF_Z (buffer) > BUF_BEG (buffer)) |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1783 --position; |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1784 XSETFASTINT (lispy_position, position); |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1785 XSETBUFFER (lispy_buffer, buffer); |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1786 prop = Fget_char_property (lispy_position, Qlocal_map, lispy_buffer); |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1787 |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1788 BUF_BEGV (buffer) = old_begv; |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1789 BUF_ZV (buffer) = old_zv; |
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1790 |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1791 /* Use the local map only if it is valid. */ |
|
11660
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1792 if (!NILP (prop) |
|
7c7519c2a45a
(get_local_map): Use Fget_char_property, so that
Karl Heuer <kwzh@gnu.org>
parents:
11327
diff
changeset
|
1793 && (tem = Fkeymapp (prop), !NILP (tem))) |
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1794 return prop; |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1795 |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1796 return buffer->keymap; |
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1797 } |
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
parents:
2052
diff
changeset
|
1798 |
| 1211 | 1799 /* Produce an interval tree reflecting the intervals in |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1800 TREE from START to START + LENGTH. */ |
| 1157 | 1801 |
|
1316
f09c5c6563b8
* intervals.c: `copy_intervals()' no longer static.
Joseph Arceneaux <jla@gnu.org>
parents:
1307
diff
changeset
|
1802 INTERVAL |
| 1157 | 1803 copy_intervals (tree, start, length) |
| 1804 INTERVAL tree; | |
| 1805 int start, length; | |
| 1806 { | |
| 1807 register INTERVAL i, new, t; | |
|
3490
07b454ddc666
(copy_intervals): Don't adjust total_length at the end.
Richard M. Stallman <rms@gnu.org>
parents:
3333
diff
changeset
|
1808 register int got, prevlen; |
| 1157 | 1809 |
| 1810 if (NULL_INTERVAL_P (tree) || length <= 0) | |
| 1811 return NULL_INTERVAL; | |
| 1812 | |
| 1813 i = find_interval (tree, start); | |
| 1814 if (NULL_INTERVAL_P (i) || LENGTH (i) == 0) | |
| 1815 abort (); | |
| 1816 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1817 /* If there is only one interval and it's the default, return nil. */ |
| 1157 | 1818 if ((start - i->position + 1 + length) < LENGTH (i) |
| 1819 && DEFAULT_INTERVAL_P (i)) | |
| 1820 return NULL_INTERVAL; | |
| 1821 | |
| 1822 new = make_interval (); | |
| 1823 new->position = 1; | |
| 1824 got = (LENGTH (i) - (start - i->position)); | |
| 1211 | 1825 new->total_length = length; |
| 1157 | 1826 copy_properties (i, new); |
| 1827 | |
| 1828 t = new; | |
|
3490
07b454ddc666
(copy_intervals): Don't adjust total_length at the end.
Richard M. Stallman <rms@gnu.org>
parents:
3333
diff
changeset
|
1829 prevlen = got; |
| 1157 | 1830 while (got < length) |
| 1831 { | |
| 1832 i = next_interval (i); | |
|
4135
84ea8ebc9858
* intervals.c (split_interval_left, split_interval_right): Change
Jim Blandy <jimb@redhat.com>
parents:
4080
diff
changeset
|
1833 t = split_interval_right (t, prevlen); |
| 1157 | 1834 copy_properties (i, t); |
|
3490
07b454ddc666
(copy_intervals): Don't adjust total_length at the end.
Richard M. Stallman <rms@gnu.org>
parents:
3333
diff
changeset
|
1835 prevlen = LENGTH (i); |
|
07b454ddc666
(copy_intervals): Don't adjust total_length at the end.
Richard M. Stallman <rms@gnu.org>
parents:
3333
diff
changeset
|
1836 got += prevlen; |
| 1157 | 1837 } |
| 1838 | |
|
5415
95882472f2da
(rotate_right, rotate_left): Simplify
Richard M. Stallman <rms@gnu.org>
parents:
5250
diff
changeset
|
1839 return balance_an_interval (new); |
| 1157 | 1840 } |
| 1841 | |
|
4383
d4a36c1669e6
(adjust_intervals_for_insertion): Handle insertion
Richard M. Stallman <rms@gnu.org>
parents:
4243
diff
changeset
|
1842 /* Give STRING the properties of BUFFER from POSITION to LENGTH. */ |
| 1157 | 1843 |
| 1288 | 1844 INLINE void |
| 1157 | 1845 copy_intervals_to_string (string, buffer, position, length) |
| 1846 Lisp_Object string, buffer; | |
| 1847 int position, length; | |
| 1848 { | |
|
10313
55ce83f36b30
Use BUF_INTERVALS throughout.
Richard M. Stallman <rms@gnu.org>
parents:
10113
diff
changeset
|
1849 INTERVAL interval_copy = copy_intervals (BUF_INTERVALS (XBUFFER (buffer)), |
| 1157 | 1850 position, length); |
| 1851 if (NULL_INTERVAL_P (interval_copy)) | |
| 1852 return; | |
| 1853 | |
| 1854 interval_copy->parent = (INTERVAL) string; | |
| 1855 XSTRING (string)->intervals = interval_copy; | |
| 1856 } | |
|
10113
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1857 |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1858 /* Return 1 if string S1 and S2 have identical properties; 0 otherwise. |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1859 Assume they have identical characters. */ |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1860 |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1861 int |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1862 compare_string_intervals (s1, s2) |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1863 Lisp_Object s1, s2; |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1864 { |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1865 INTERVAL i1, i2; |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1866 int pos = 1; |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1867 int end = XSTRING (s1)->size + 1; |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1868 |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1869 /* We specify 1 as position because the interval functions |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1870 always use positions starting at 1. */ |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1871 i1 = find_interval (XSTRING (s1)->intervals, 1); |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1872 i2 = find_interval (XSTRING (s2)->intervals, 1); |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1873 |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1874 while (pos < end) |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1875 { |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1876 /* Determine how far we can go before we reach the end of I1 or I2. */ |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1877 int len1 = (i1 != 0 ? INTERVAL_LAST_POS (i1) : end) - pos; |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1878 int len2 = (i2 != 0 ? INTERVAL_LAST_POS (i2) : end) - pos; |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1879 int distance = min (len1, len2); |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1880 |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1881 /* If we ever find a mismatch between the strings, |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1882 they differ. */ |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1883 if (! intervals_equal (i1, i2)) |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1884 return 0; |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1885 |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1886 /* Advance POS till the end of the shorter interval, |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1887 and advance one or both interval pointers for the new position. */ |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1888 pos += distance; |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1889 if (len1 == distance) |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1890 i1 = next_interval (i1); |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1891 if (len2 == distance) |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1892 i2 = next_interval (i2); |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1893 } |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1894 return 1; |
|
9d72d79329c3
(compare_string_intervals): New function.
Richard M. Stallman <rms@gnu.org>
parents:
9461
diff
changeset
|
1895 } |
|
1301
5a27062b8b7f
* intervals.c: Conditionalize all functions on
Joseph Arceneaux <jla@gnu.org>
parents:
1288
diff
changeset
|
1896 |
|
5a27062b8b7f
* intervals.c: Conditionalize all functions on
Joseph Arceneaux <jla@gnu.org>
parents:
1288
diff
changeset
|
1897 #endif /* USE_TEXT_PROPERTIES */ |
