1157
|
1 /* Code for doing intervals.
|
64770
|
2 Copyright (C) 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004,
|
68651
|
3 2005, 2006 Free Software Foundation, Inc.
|
1157
|
4
|
|
5 This file is part of GNU Emacs.
|
|
6
|
|
7 GNU Emacs is free software; you can redistribute it and/or modify
|
|
8 it under the terms of the GNU General Public License as published by
|
4383
|
9 the Free Software Foundation; either version 2, or (at your option)
|
1157
|
10 any later version.
|
|
11
|
|
12 GNU Emacs is distributed in the hope that it will be useful,
|
|
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
15 GNU General Public License for more details.
|
|
16
|
|
17 You should have received a copy of the GNU General Public License
|
|
18 along with GNU Emacs; see the file COPYING. If not, write to
|
64084
|
19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
20 Boston, MA 02110-1301, USA. */
|
1157
|
21
|
|
22
|
|
23 /* NOTES:
|
|
24
|
|
25 Have to ensure that we can't put symbol nil on a plist, or some
|
|
26 functions may work incorrectly.
|
|
27
|
|
28 An idea: Have the owner of the tree keep count of splits and/or
|
|
29 insertion lengths (in intervals), and balance after every N.
|
|
30
|
|
31 Need to call *_left_hook when buffer is killed.
|
|
32
|
|
33 Scan for zero-length, or 0-length to see notes about handling
|
|
34 zero length interval-markers.
|
|
35
|
|
36 There are comments around about freeing intervals. It might be
|
|
37 faster to explicitly free them (put them on the free list) than
|
|
38 to GC them.
|
|
39
|
|
40 */
|
|
41
|
|
42
|
4696
|
43 #include <config.h>
|
1157
|
44 #include "lisp.h"
|
|
45 #include "intervals.h"
|
|
46 #include "buffer.h"
|
4962
|
47 #include "puresize.h"
|
8897
|
48 #include "keyboard.h"
|
39697
|
49 #include "keymap.h"
|
1157
|
50
|
5768
|
51 /* Test for membership, allowing for t (actually any non-cons) to mean the
|
|
52 universal set. */
|
|
53
|
|
54 #define TMEM(sym, set) (CONSP (set) ? ! NILP (Fmemq (sym, set)) : ! NILP (set))
|
|
55
|
5173
|
56 Lisp_Object merge_properties_sticky ();
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
57 static INTERVAL reproduce_tree P_ ((INTERVAL, INTERVAL));
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
58 static INTERVAL reproduce_tree_obj P_ ((INTERVAL, Lisp_Object));
|
1157
|
59
|
4383
|
60 /* Utility functions for intervals. */
|
1157
|
61
|
|
62
|
4383
|
63 /* Create the root interval of some object, a buffer or string. */
|
1157
|
64
|
|
65 INTERVAL
|
|
66 create_root_interval (parent)
|
|
67 Lisp_Object parent;
|
|
68 {
|
4962
|
69 INTERVAL new;
|
|
70
|
|
71 CHECK_IMPURE (parent);
|
|
72
|
|
73 new = make_interval ();
|
1157
|
74
|
9125
a78f02f76f03
(create_root_interval, balance_possible_root_interval, delete_interval): Use
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
75 if (BUFFERP (parent))
|
1157
|
76 {
|
4135
|
77 new->total_length = (BUF_Z (XBUFFER (parent))
|
|
78 - BUF_BEG (XBUFFER (parent)));
|
50471
|
79 CHECK_TOTAL_LENGTH (new);
|
10313
|
80 BUF_INTERVALS (XBUFFER (parent)) = new;
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
81 new->position = BEG;
|
1157
|
82 }
|
9125
a78f02f76f03
(create_root_interval, balance_possible_root_interval, delete_interval): Use
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
83 else if (STRINGP (parent))
|
1157
|
84 {
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
85 new->total_length = SCHARS (parent);
|
50471
|
86 CHECK_TOTAL_LENGTH (new);
|
46380
48b292c584a6
* intervals.c (create_root_interval, balance_possible_root_interval,
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
87 STRING_SET_INTERVALS (parent, new);
|
22343
|
88 new->position = 0;
|
1157
|
89 }
|
|
90
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
91 SET_INTERVAL_OBJECT (new, parent);
|
1157
|
92
|
|
93 return new;
|
|
94 }
|
|
95
|
|
96 /* Make the interval TARGET have exactly the properties of SOURCE */
|
|
97
|
|
98 void
|
|
99 copy_properties (source, target)
|
|
100 register INTERVAL source, target;
|
|
101 {
|
|
102 if (DEFAULT_INTERVAL_P (source) && DEFAULT_INTERVAL_P (target))
|
|
103 return;
|
|
104
|
|
105 COPY_INTERVAL_CACHE (source, target);
|
|
106 target->plist = Fcopy_sequence (source->plist);
|
|
107 }
|
|
108
|
|
109 /* Merge the properties of interval SOURCE into the properties
|
1964
|
110 of interval TARGET. That is to say, each property in SOURCE
|
|
111 is added to TARGET if TARGET has no such property as yet. */
|
1157
|
112
|
|
113 static void
|
|
114 merge_properties (source, target)
|
|
115 register INTERVAL source, target;
|
|
116 {
|
|
117 register Lisp_Object o, sym, val;
|
|
118
|
|
119 if (DEFAULT_INTERVAL_P (source) && DEFAULT_INTERVAL_P (target))
|
|
120 return;
|
|
121
|
|
122 MERGE_INTERVAL_CACHE (source, target);
|
|
123
|
|
124 o = source->plist;
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
125 while (CONSP (o))
|
1157
|
126 {
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
127 sym = XCAR (o);
|
1157
|
128 val = Fmemq (sym, target->plist);
|
|
129
|
|
130 if (NILP (val))
|
|
131 {
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
132 o = XCDR (o);
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
133 CHECK_CONS (o);
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
134 val = XCAR (o);
|
1157
|
135 target->plist = Fcons (sym, Fcons (val, target->plist));
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
136 o = XCDR (o);
|
1157
|
137 }
|
|
138 else
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
139 o = Fcdr (XCDR (o));
|
1157
|
140 }
|
|
141 }
|
|
142
|
|
143 /* Return 1 if the two intervals have the same properties,
|
4383
|
144 0 otherwise. */
|
1157
|
145
|
|
146 int
|
|
147 intervals_equal (i0, i1)
|
|
148 INTERVAL i0, i1;
|
|
149 {
|
|
150 register Lisp_Object i0_cdr, i0_sym, i1_val;
|
21514
|
151 register int i1_len;
|
1157
|
152
|
|
153 if (DEFAULT_INTERVAL_P (i0) && DEFAULT_INTERVAL_P (i1))
|
|
154 return 1;
|
|
155
|
1964
|
156 if (DEFAULT_INTERVAL_P (i0) || DEFAULT_INTERVAL_P (i1))
|
|
157 return 0;
|
|
158
|
1157
|
159 i1_len = XFASTINT (Flength (i1->plist));
|
|
160 if (i1_len & 0x1) /* Paranoia -- plists are always even */
|
|
161 abort ();
|
|
162 i1_len /= 2;
|
|
163 i0_cdr = i0->plist;
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
164 while (CONSP (i0_cdr))
|
1157
|
165 {
|
4383
|
166 /* Lengths of the two plists were unequal. */
|
1157
|
167 if (i1_len == 0)
|
|
168 return 0;
|
|
169
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
170 i0_sym = XCAR (i0_cdr);
|
1157
|
171 i1_val = Fmemq (i0_sym, i1->plist);
|
|
172
|
4383
|
173 /* i0 has something i1 doesn't. */
|
1157
|
174 if (EQ (i1_val, Qnil))
|
|
175 return 0;
|
|
176
|
4383
|
177 /* i0 and i1 both have sym, but it has different values in each. */
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
178 i0_cdr = XCDR (i0_cdr);
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
179 CHECK_CONS (i0_cdr);
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
180 if (!EQ (Fcar (Fcdr (i1_val)), XCAR (i0_cdr)))
|
1157
|
181 return 0;
|
|
182
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
183 i0_cdr = XCDR (i0_cdr);
|
1157
|
184 i1_len--;
|
|
185 }
|
|
186
|
4383
|
187 /* Lengths of the two plists were unequal. */
|
1157
|
188 if (i1_len > 0)
|
|
189 return 0;
|
|
190
|
|
191 return 1;
|
|
192 }
|
|
193
|
|
194
|
|
195 /* Traverse an interval tree TREE, performing FUNCTION on each node.
|
39851
|
196 No guarantee is made about the order of traversal.
|
|
197 Pass FUNCTION two args: an interval, and ARG. */
|
|
198
|
|
199 void
|
|
200 traverse_intervals_noorder (tree, function, arg)
|
|
201 INTERVAL tree;
|
|
202 void (* function) P_ ((INTERVAL, Lisp_Object));
|
|
203 Lisp_Object arg;
|
|
204 {
|
|
205 /* Minimize stack usage. */
|
|
206 while (!NULL_INTERVAL_P (tree))
|
|
207 {
|
|
208 (*function) (tree, arg);
|
|
209 if (NULL_INTERVAL_P (tree->right))
|
|
210 tree = tree->left;
|
|
211 else
|
|
212 {
|
|
213 traverse_intervals_noorder (tree->left, function, arg);
|
|
214 tree = tree->right;
|
|
215 }
|
|
216 }
|
|
217 }
|
|
218
|
|
219 /* Traverse an interval tree TREE, performing FUNCTION on each node.
|
1958
|
220 Pass FUNCTION two args: an interval, and ARG. */
|
1157
|
221
|
|
222 void
|
39854
|
223 traverse_intervals (tree, position, function, arg)
|
1157
|
224 INTERVAL tree;
|
39854
|
225 int position;
|
20317
|
226 void (* function) P_ ((INTERVAL, Lisp_Object));
|
1958
|
227 Lisp_Object arg;
|
1157
|
228 {
|
39851
|
229 while (!NULL_INTERVAL_P (tree))
|
|
230 {
|
39854
|
231 traverse_intervals (tree->left, position, function, arg);
|
39851
|
232 position += LEFT_TOTAL_LENGTH (tree);
|
|
233 tree->position = position;
|
|
234 (*function) (tree, arg);
|
39854
|
235 position += LENGTH (tree); tree = tree->right;
|
39851
|
236 }
|
1157
|
237 }
|
|
238
|
|
239 #if 0
|
25747
|
240
|
|
241 static int icount;
|
|
242 static int idepth;
|
|
243 static int zero_length;
|
|
244
|
4383
|
245 /* These functions are temporary, for debugging purposes only. */
|
1157
|
246
|
|
247 INTERVAL search_interval, found_interval;
|
|
248
|
|
249 void
|
|
250 check_for_interval (i)
|
|
251 register INTERVAL i;
|
|
252 {
|
|
253 if (i == search_interval)
|
|
254 {
|
|
255 found_interval = i;
|
|
256 icount++;
|
|
257 }
|
|
258 }
|
|
259
|
|
260 INTERVAL
|
|
261 search_for_interval (i, tree)
|
|
262 register INTERVAL i, tree;
|
|
263 {
|
|
264 icount = 0;
|
|
265 search_interval = i;
|
|
266 found_interval = NULL_INTERVAL;
|
39851
|
267 traverse_intervals_noorder (tree, &check_for_interval, Qnil);
|
1157
|
268 return found_interval;
|
|
269 }
|
|
270
|
|
271 static void
|
|
272 inc_interval_count (i)
|
|
273 INTERVAL i;
|
|
274 {
|
|
275 icount++;
|
|
276 if (LENGTH (i) == 0)
|
|
277 zero_length++;
|
|
278 if (depth > idepth)
|
|
279 idepth = depth;
|
|
280 }
|
|
281
|
|
282 int
|
|
283 count_intervals (i)
|
|
284 register INTERVAL i;
|
|
285 {
|
|
286 icount = 0;
|
|
287 idepth = 0;
|
|
288 zero_length = 0;
|
39851
|
289 traverse_intervals_noorder (i, &inc_interval_count, Qnil);
|
1157
|
290
|
|
291 return icount;
|
|
292 }
|
|
293
|
|
294 static INTERVAL
|
|
295 root_interval (interval)
|
|
296 INTERVAL interval;
|
|
297 {
|
|
298 register INTERVAL i = interval;
|
|
299
|
|
300 while (! ROOT_INTERVAL_P (i))
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
301 i = INTERVAL_PARENT (i);
|
1157
|
302
|
|
303 return i;
|
|
304 }
|
|
305 #endif
|
|
306
|
|
307 /* Assuming that a left child exists, perform the following operation:
|
|
308
|
|
309 A B
|
|
310 / \ / \
|
|
311 B => A
|
|
312 / \ / \
|
|
313 c c
|
|
314 */
|
|
315
|
39851
|
316 static INLINE INTERVAL
|
1157
|
317 rotate_right (interval)
|
|
318 INTERVAL interval;
|
|
319 {
|
|
320 INTERVAL i;
|
|
321 INTERVAL B = interval->left;
|
5415
|
322 int old_total = interval->total_length;
|
1157
|
323
|
4383
|
324 /* Deal with any Parent of A; make it point to B. */
|
1157
|
325 if (! ROOT_INTERVAL_P (interval))
|
25747
|
326 {
|
|
327 if (AM_LEFT_CHILD (interval))
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
328 INTERVAL_PARENT (interval)->left = B;
|
25747
|
329 else
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
330 INTERVAL_PARENT (interval)->right = B;
|
25747
|
331 }
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
332 COPY_INTERVAL_PARENT (B, interval);
|
1157
|
333
|
5415
|
334 /* Make B the parent of A */
|
|
335 i = B->right;
|
|
336 B->right = interval;
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
337 SET_INTERVAL_PARENT (interval, B);
|
1157
|
338
|
5415
|
339 /* Make A point to c */
|
1157
|
340 interval->left = i;
|
|
341 if (! NULL_INTERVAL_P (i))
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
342 SET_INTERVAL_PARENT (i, interval);
|
5415
|
343
|
5760
|
344 /* A's total length is decreased by the length of B and its left child. */
|
5415
|
345 interval->total_length -= B->total_length - LEFT_TOTAL_LENGTH (interval);
|
50471
|
346 CHECK_TOTAL_LENGTH (interval);
|
5415
|
347
|
|
348 /* B must have the same total length of A. */
|
|
349 B->total_length = old_total;
|
50471
|
350 CHECK_TOTAL_LENGTH (B);
|
1157
|
351
|
|
352 return B;
|
|
353 }
|
5415
|
354
|
1157
|
355 /* Assuming that a right child exists, perform the following operation:
|
|
356
|
47942
|
357 A B
|
|
358 / \ / \
|
1157
|
359 B => A
|
47942
|
360 / \ / \
|
1157
|
361 c c
|
|
362 */
|
|
363
|
39851
|
364 static INLINE INTERVAL
|
1157
|
365 rotate_left (interval)
|
|
366 INTERVAL interval;
|
|
367 {
|
|
368 INTERVAL i;
|
|
369 INTERVAL B = interval->right;
|
5415
|
370 int old_total = interval->total_length;
|
1157
|
371
|
5415
|
372 /* Deal with any parent of A; make it point to B. */
|
1157
|
373 if (! ROOT_INTERVAL_P (interval))
|
25747
|
374 {
|
|
375 if (AM_LEFT_CHILD (interval))
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
376 INTERVAL_PARENT (interval)->left = B;
|
25747
|
377 else
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
378 INTERVAL_PARENT (interval)->right = B;
|
25747
|
379 }
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
380 COPY_INTERVAL_PARENT (B, interval);
|
1157
|
381
|
|
382 /* Make B the parent of A */
|
5415
|
383 i = B->left;
|
|
384 B->left = interval;
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
385 SET_INTERVAL_PARENT (interval, B);
|
1157
|
386
|
|
387 /* Make A point to c */
|
|
388 interval->right = i;
|
|
389 if (! NULL_INTERVAL_P (i))
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
390 SET_INTERVAL_PARENT (i, interval);
|
5415
|
391
|
5760
|
392 /* A's total length is decreased by the length of B and its right child. */
|
5415
|
393 interval->total_length -= B->total_length - RIGHT_TOTAL_LENGTH (interval);
|
50471
|
394 CHECK_TOTAL_LENGTH (interval);
|
5415
|
395
|
|
396 /* B must have the same total length of A. */
|
|
397 B->total_length = old_total;
|
50471
|
398 CHECK_TOTAL_LENGTH (B);
|
1157
|
399
|
|
400 return B;
|
|
401 }
|
|
402
|
5415
|
403 /* Balance an interval tree with the assumption that the subtrees
|
|
404 themselves are already balanced. */
|
|
405
|
|
406 static INTERVAL
|
|
407 balance_an_interval (i)
|
|
408 INTERVAL i;
|
|
409 {
|
|
410 register int old_diff, new_diff;
|
|
411
|
|
412 while (1)
|
|
413 {
|
|
414 old_diff = LEFT_TOTAL_LENGTH (i) - RIGHT_TOTAL_LENGTH (i);
|
|
415 if (old_diff > 0)
|
|
416 {
|
50471
|
417 /* Since the left child is longer, there must be one. */
|
5415
|
418 new_diff = i->total_length - i->left->total_length
|
|
419 + RIGHT_TOTAL_LENGTH (i->left) - LEFT_TOTAL_LENGTH (i->left);
|
|
420 if (abs (new_diff) >= old_diff)
|
|
421 break;
|
|
422 i = rotate_right (i);
|
|
423 balance_an_interval (i->right);
|
|
424 }
|
|
425 else if (old_diff < 0)
|
|
426 {
|
50471
|
427 /* Since the right child is longer, there must be one. */
|
5415
|
428 new_diff = i->total_length - i->right->total_length
|
|
429 + LEFT_TOTAL_LENGTH (i->right) - RIGHT_TOTAL_LENGTH (i->right);
|
|
430 if (abs (new_diff) >= -old_diff)
|
|
431 break;
|
|
432 i = rotate_left (i);
|
|
433 balance_an_interval (i->left);
|
|
434 }
|
|
435 else
|
|
436 break;
|
|
437 }
|
|
438 return i;
|
|
439 }
|
|
440
|
|
441 /* Balance INTERVAL, potentially stuffing it back into its parent
|
|
442 Lisp Object. */
|
|
443
|
|
444 static INLINE INTERVAL
|
|
445 balance_possible_root_interval (interval)
|
|
446 register INTERVAL interval;
|
|
447 {
|
|
448 Lisp_Object parent;
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
449 int have_parent = 0;
|
5415
|
450
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
451 if (!INTERVAL_HAS_OBJECT (interval) && !INTERVAL_HAS_PARENT (interval))
|
5415
|
452 return interval;
|
|
453
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
454 if (INTERVAL_HAS_OBJECT (interval))
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
455 {
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
456 have_parent = 1;
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
457 GET_INTERVAL_OBJECT (parent, interval);
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
458 }
|
5415
|
459 interval = balance_an_interval (interval);
|
|
460
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
461 if (have_parent)
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
462 {
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
463 if (BUFFERP (parent))
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
464 BUF_INTERVALS (XBUFFER (parent)) = interval;
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
465 else if (STRINGP (parent))
|
46380
48b292c584a6
* intervals.c (create_root_interval, balance_possible_root_interval,
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
466 STRING_SET_INTERVALS (parent, interval);
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
467 }
|
5415
|
468
|
|
469 return interval;
|
|
470 }
|
|
471
|
|
472 /* Balance the interval tree TREE. Balancing is by weight
|
|
473 (the amount of text). */
|
|
474
|
|
475 static INTERVAL
|
|
476 balance_intervals_internal (tree)
|
|
477 register INTERVAL tree;
|
|
478 {
|
|
479 /* Balance within each side. */
|
|
480 if (tree->left)
|
15734
|
481 balance_intervals_internal (tree->left);
|
5415
|
482 if (tree->right)
|
15734
|
483 balance_intervals_internal (tree->right);
|
5415
|
484 return balance_an_interval (tree);
|
|
485 }
|
|
486
|
|
487 /* Advertised interface to balance intervals. */
|
|
488
|
|
489 INTERVAL
|
|
490 balance_intervals (tree)
|
|
491 INTERVAL tree;
|
|
492 {
|
|
493 if (tree == NULL_INTERVAL)
|
|
494 return NULL_INTERVAL;
|
|
495
|
|
496 return balance_intervals_internal (tree);
|
|
497 }
|
|
498
|
4135
|
499 /* Split INTERVAL into two pieces, starting the second piece at
|
|
500 character position OFFSET (counting from 0), relative to INTERVAL.
|
|
501 INTERVAL becomes the left-hand piece, and the right-hand piece
|
|
502 (second, lexicographically) is returned.
|
1164
|
503
|
|
504 The size and position fields of the two intervals are set based upon
|
|
505 those of the original interval. The property list of the new interval
|
|
506 is reset, thus it is up to the caller to do the right thing with the
|
|
507 result.
|
1157
|
508
|
|
509 Note that this does not change the position of INTERVAL; if it is a root,
|
4383
|
510 it is still a root after this operation. */
|
1157
|
511
|
|
512 INTERVAL
|
1164
|
513 split_interval_right (interval, offset)
|
1157
|
514 INTERVAL interval;
|
1164
|
515 int offset;
|
1157
|
516 {
|
|
517 INTERVAL new = make_interval ();
|
|
518 int position = interval->position;
|
4135
|
519 int new_length = LENGTH (interval) - offset;
|
1157
|
520
|
4135
|
521 new->position = position + offset;
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
522 SET_INTERVAL_PARENT (new, interval);
|
1157
|
523
|
5415
|
524 if (NULL_RIGHT_CHILD (interval))
|
1157
|
525 {
|
|
526 interval->right = new;
|
|
527 new->total_length = new_length;
|
50471
|
528 CHECK_TOTAL_LENGTH (new);
|
1157
|
529 }
|
20908
|
530 else
|
|
531 {
|
|
532 /* Insert the new node between INTERVAL and its right child. */
|
|
533 new->right = interval->right;
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
534 SET_INTERVAL_PARENT (interval->right, new);
|
20908
|
535 interval->right = new;
|
|
536 new->total_length = new_length + new->right->total_length;
|
50471
|
537 CHECK_TOTAL_LENGTH (new);
|
20908
|
538 balance_an_interval (new);
|
|
539 }
|
47942
|
540
|
5415
|
541 balance_possible_root_interval (interval);
|
1157
|
542
|
|
543 return new;
|
|
544 }
|
|
545
|
4135
|
546 /* Split INTERVAL into two pieces, starting the second piece at
|
|
547 character position OFFSET (counting from 0), relative to INTERVAL.
|
|
548 INTERVAL becomes the right-hand piece, and the left-hand piece
|
|
549 (first, lexicographically) is returned.
|
1157
|
550
|
1164
|
551 The size and position fields of the two intervals are set based upon
|
|
552 those of the original interval. The property list of the new interval
|
|
553 is reset, thus it is up to the caller to do the right thing with the
|
|
554 result.
|
|
555
|
|
556 Note that this does not change the position of INTERVAL; if it is a root,
|
4383
|
557 it is still a root after this operation. */
|
1157
|
558
|
|
559 INTERVAL
|
1164
|
560 split_interval_left (interval, offset)
|
1157
|
561 INTERVAL interval;
|
1164
|
562 int offset;
|
1157
|
563 {
|
|
564 INTERVAL new = make_interval ();
|
4135
|
565 int new_length = offset;
|
1157
|
566
|
|
567 new->position = interval->position;
|
4135
|
568 interval->position = interval->position + offset;
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
569 SET_INTERVAL_PARENT (new, interval);
|
1157
|
570
|
|
571 if (NULL_LEFT_CHILD (interval))
|
|
572 {
|
|
573 interval->left = new;
|
|
574 new->total_length = new_length;
|
50471
|
575 CHECK_TOTAL_LENGTH (new);
|
1157
|
576 }
|
20908
|
577 else
|
|
578 {
|
|
579 /* Insert the new node between INTERVAL and its left child. */
|
|
580 new->left = interval->left;
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
581 SET_INTERVAL_PARENT (new->left, new);
|
20908
|
582 interval->left = new;
|
|
583 new->total_length = new_length + new->left->total_length;
|
50471
|
584 CHECK_TOTAL_LENGTH (new);
|
20908
|
585 balance_an_interval (new);
|
|
586 }
|
47942
|
587
|
5415
|
588 balance_possible_root_interval (interval);
|
1157
|
589
|
|
590 return new;
|
|
591 }
|
|
592
|
22343
|
593 /* Return the proper position for the first character
|
|
594 described by the interval tree SOURCE.
|
|
595 This is 1 if the parent is a buffer,
|
|
596 0 if the parent is a string or if there is no parent.
|
|
597
|
|
598 Don't use this function on an interval which is the child
|
|
599 of another interval! */
|
|
600
|
|
601 int
|
|
602 interval_start_pos (source)
|
|
603 INTERVAL source;
|
|
604 {
|
|
605 Lisp_Object parent;
|
|
606
|
|
607 if (NULL_INTERVAL_P (source))
|
|
608 return 0;
|
|
609
|
28406
451721e784a8
Stop assuming interval pointers and lisp objects can be distinguished by
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
610 if (! INTERVAL_HAS_OBJECT (source))
|
451721e784a8
Stop assuming interval pointers and lisp objects can be distinguished by
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
611 return 0;
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
612 GET_INTERVAL_OBJECT (parent, source);
|
22343
|
613 if (BUFFERP (parent))
|
|
614 return BUF_BEG (XBUFFER (parent));
|
|
615 return 0;
|
|
616 }
|
|
617
|
1164
|
618 /* Find the interval containing text position POSITION in the text
|
4005
|
619 represented by the interval tree TREE. POSITION is a buffer
|
22343
|
620 position (starting from 1) or a string index (starting from 0).
|
|
621 If POSITION is at the end of the buffer or string,
|
|
622 return the interval containing the last character.
|
1157
|
623
|
1164
|
624 The `position' field, which is a cache of an interval's position,
|
|
625 is updated in the interval found. Other functions (e.g., next_interval)
|
4383
|
626 will update this cache based on the result of find_interval. */
|
1164
|
627
|
18125
|
628 INTERVAL
|
1157
|
629 find_interval (tree, position)
|
|
630 register INTERVAL tree;
|
|
631 register int position;
|
|
632 {
|
4005
|
633 /* The distance from the left edge of the subtree at TREE
|
|
634 to POSITION. */
|
22343
|
635 register int relative_position;
|
1157
|
636
|
|
637 if (NULL_INTERVAL_P (tree))
|
|
638 return NULL_INTERVAL;
|
|
639
|
22343
|
640 relative_position = position;
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
641 if (INTERVAL_HAS_OBJECT (tree))
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
642 {
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
643 Lisp_Object parent;
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
644 GET_INTERVAL_OBJECT (parent, tree);
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
645 if (BUFFERP (parent))
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
646 relative_position -= BUF_BEG (XBUFFER (parent));
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
647 }
|
22343
|
648
|
4005
|
649 if (relative_position > TOTAL_LENGTH (tree))
|
1157
|
650 abort (); /* Paranoia */
|
|
651
|
37328
9a801971bd7e
(find_interval): Don't rebalance during signal handling.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
652 if (!handling_signal)
|
9a801971bd7e
(find_interval): Don't rebalance during signal handling.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
653 tree = balance_possible_root_interval (tree);
|
5415
|
654
|
1157
|
655 while (1)
|
|
656 {
|
4005
|
657 if (relative_position < LEFT_TOTAL_LENGTH (tree))
|
1157
|
658 {
|
|
659 tree = tree->left;
|
|
660 }
|
4005
|
661 else if (! NULL_RIGHT_CHILD (tree)
|
|
662 && relative_position >= (TOTAL_LENGTH (tree)
|
|
663 - RIGHT_TOTAL_LENGTH (tree)))
|
1157
|
664 {
|
|
665 relative_position -= (TOTAL_LENGTH (tree)
|
|
666 - RIGHT_TOTAL_LENGTH (tree));
|
|
667 tree = tree->right;
|
|
668 }
|
|
669 else
|
|
670 {
|
22343
|
671 tree->position
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
672 = (position - relative_position /* left edge of *tree. */
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
673 + LEFT_TOTAL_LENGTH (tree)); /* left edge of this interval. */
|
4005
|
674
|
1157
|
675 return tree;
|
|
676 }
|
|
677 }
|
|
678 }
|
|
679
|
|
680 /* Find the succeeding interval (lexicographically) to INTERVAL.
|
1164
|
681 Sets the `position' field based on that of INTERVAL (see
|
4383
|
682 find_interval). */
|
1157
|
683
|
|
684 INTERVAL
|
|
685 next_interval (interval)
|
|
686 register INTERVAL interval;
|
|
687 {
|
|
688 register INTERVAL i = interval;
|
|
689 register int next_position;
|
|
690
|
|
691 if (NULL_INTERVAL_P (i))
|
|
692 return NULL_INTERVAL;
|
|
693 next_position = interval->position + LENGTH (interval);
|
|
694
|
|
695 if (! NULL_RIGHT_CHILD (i))
|
|
696 {
|
|
697 i = i->right;
|
|
698 while (! NULL_LEFT_CHILD (i))
|
|
699 i = i->left;
|
|
700
|
|
701 i->position = next_position;
|
|
702 return i;
|
|
703 }
|
|
704
|
|
705 while (! NULL_PARENT (i))
|
|
706 {
|
|
707 if (AM_LEFT_CHILD (i))
|
|
708 {
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
709 i = INTERVAL_PARENT (i);
|
1157
|
710 i->position = next_position;
|
|
711 return i;
|
|
712 }
|
|
713
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
714 i = INTERVAL_PARENT (i);
|
1157
|
715 }
|
|
716
|
|
717 return NULL_INTERVAL;
|
|
718 }
|
|
719
|
|
720 /* Find the preceding interval (lexicographically) to INTERVAL.
|
1164
|
721 Sets the `position' field based on that of INTERVAL (see
|
4383
|
722 find_interval). */
|
1157
|
723
|
|
724 INTERVAL
|
|
725 previous_interval (interval)
|
|
726 register INTERVAL interval;
|
|
727 {
|
|
728 register INTERVAL i;
|
|
729
|
|
730 if (NULL_INTERVAL_P (interval))
|
|
731 return NULL_INTERVAL;
|
|
732
|
|
733 if (! NULL_LEFT_CHILD (interval))
|
|
734 {
|
|
735 i = interval->left;
|
|
736 while (! NULL_RIGHT_CHILD (i))
|
|
737 i = i->right;
|
|
738
|
|
739 i->position = interval->position - LENGTH (i);
|
|
740 return i;
|
|
741 }
|
|
742
|
|
743 i = interval;
|
|
744 while (! NULL_PARENT (i))
|
|
745 {
|
|
746 if (AM_RIGHT_CHILD (i))
|
|
747 {
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
748 i = INTERVAL_PARENT (i);
|
1157
|
749
|
|
750 i->position = interval->position - LENGTH (i);
|
|
751 return i;
|
|
752 }
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
753 i = INTERVAL_PARENT (i);
|
1157
|
754 }
|
|
755
|
|
756 return NULL_INTERVAL;
|
|
757 }
|
17461
|
758
|
|
759 /* Find the interval containing POS given some non-NULL INTERVAL
|
21012
22c48e547cb0
(update_interval): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
760 in the same tree. Note that we need to update interval->position
|
37328
9a801971bd7e
(find_interval): Don't rebalance during signal handling.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
761 if we go down the tree.
|
9a801971bd7e
(find_interval): Don't rebalance during signal handling.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
762 To speed up the process, we assume that the ->position of
|
9a801971bd7e
(find_interval): Don't rebalance during signal handling.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
763 I and all its parents is already uptodate. */
|
17461
|
764 INTERVAL
|
|
765 update_interval (i, pos)
|
|
766 register INTERVAL i;
|
|
767 int pos;
|
|
768 {
|
|
769 if (NULL_INTERVAL_P (i))
|
|
770 return NULL_INTERVAL;
|
|
771
|
47942
|
772 while (1)
|
17461
|
773 {
|
47942
|
774 if (pos < i->position)
|
17461
|
775 {
|
|
776 /* Move left. */
|
47942
|
777 if (pos >= i->position - TOTAL_LENGTH (i->left))
|
21012
22c48e547cb0
(update_interval): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
778 {
|
22c48e547cb0
(update_interval): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
779 i->left->position = i->position - TOTAL_LENGTH (i->left)
|
22c48e547cb0
(update_interval): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
780 + LEFT_TOTAL_LENGTH (i->left);
|
22c48e547cb0
(update_interval): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
781 i = i->left; /* Move to the left child */
|
22c48e547cb0
(update_interval): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
782 }
|
47942
|
783 else if (NULL_PARENT (i))
|
17461
|
784 error ("Point before start of properties");
|
47942
|
785 else
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
786 i = INTERVAL_PARENT (i);
|
17461
|
787 continue;
|
|
788 }
|
|
789 else if (pos >= INTERVAL_LAST_POS (i))
|
|
790 {
|
|
791 /* Move right. */
|
47942
|
792 if (pos < INTERVAL_LAST_POS (i) + TOTAL_LENGTH (i->right))
|
21012
22c48e547cb0
(update_interval): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
793 {
|
65309
f740c5937479
(update_interval): Fix indentation and coding style. Add info in error.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
794 i->right->position = INTERVAL_LAST_POS (i)
|
f740c5937479
(update_interval): Fix indentation and coding style. Add info in error.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
795 + LEFT_TOTAL_LENGTH (i->right);
|
21012
22c48e547cb0
(update_interval): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
796 i = i->right; /* Move to the right child */
|
22c48e547cb0
(update_interval): Properly update `position' field of used intervals.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
797 }
|
47942
|
798 else if (NULL_PARENT (i))
|
65309
f740c5937479
(update_interval): Fix indentation and coding style. Add info in error.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
799 error ("Point %d after end of properties", pos);
|
47942
|
800 else
|
65309
f740c5937479
(update_interval): Fix indentation and coding style. Add info in error.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
801 i = INTERVAL_PARENT (i);
|
17461
|
802 continue;
|
|
803 }
|
47942
|
804 else
|
17461
|
805 return i;
|
|
806 }
|
|
807 }
|
|
808
|
1157
|
809
|
1164
|
810 #if 0
|
1157
|
811 /* Traverse a path down the interval tree TREE to the interval
|
|
812 containing POSITION, adjusting all nodes on the path for
|
|
813 an addition of LENGTH characters. Insertion between two intervals
|
|
814 (i.e., point == i->position, where i is second interval) means
|
|
815 text goes into second interval.
|
|
816
|
|
817 Modifications are needed to handle the hungry bits -- after simply
|
|
818 finding the interval at position (don't add length going down),
|
|
819 if it's the beginning of the interval, get the previous interval
|
14036
|
820 and check the hungry bits of both. Then add the length going back up
|
4383
|
821 to the root. */
|
1157
|
822
|
|
823 static INTERVAL
|
|
824 adjust_intervals_for_insertion (tree, position, length)
|
|
825 INTERVAL tree;
|
|
826 int position, length;
|
|
827 {
|
|
828 register int relative_position;
|
|
829 register INTERVAL this;
|
|
830
|
|
831 if (TOTAL_LENGTH (tree) == 0) /* Paranoia */
|
|
832 abort ();
|
|
833
|
|
834 /* If inserting at point-max of a buffer, that position
|
|
835 will be out of range */
|
|
836 if (position > TOTAL_LENGTH (tree))
|
|
837 position = TOTAL_LENGTH (tree);
|
|
838 relative_position = position;
|
|
839 this = tree;
|
|
840
|
|
841 while (1)
|
|
842 {
|
|
843 if (relative_position <= LEFT_TOTAL_LENGTH (this))
|
|
844 {
|
|
845 this->total_length += length;
|
50471
|
846 CHECK_TOTAL_LENGTH (this);
|
1157
|
847 this = this->left;
|
|
848 }
|
|
849 else if (relative_position > (TOTAL_LENGTH (this)
|
|
850 - RIGHT_TOTAL_LENGTH (this)))
|
|
851 {
|
|
852 relative_position -= (TOTAL_LENGTH (this)
|
|
853 - RIGHT_TOTAL_LENGTH (this));
|
|
854 this->total_length += length;
|
50471
|
855 CHECK_TOTAL_LENGTH (this);
|
1157
|
856 this = this->right;
|
|
857 }
|
|
858 else
|
|
859 {
|
|
860 /* If we are to use zero-length intervals as buffer pointers,
|
4383
|
861 then this code will have to change. */
|
1157
|
862 this->total_length += length;
|
50471
|
863 CHECK_TOTAL_LENGTH (this);
|
1157
|
864 this->position = LEFT_TOTAL_LENGTH (this)
|
|
865 + position - relative_position + 1;
|
|
866 return tree;
|
|
867 }
|
|
868 }
|
|
869 }
|
1164
|
870 #endif
|
|
871
|
|
872 /* Effect an adjustment corresponding to the addition of LENGTH characters
|
|
873 of text. Do this by finding the interval containing POSITION in the
|
5760
|
874 interval tree TREE, and then adjusting all of its ancestors by adding
|
1164
|
875 LENGTH to them.
|
|
876
|
|
877 If POSITION is the first character of an interval, meaning that point
|
|
878 is actually between the two intervals, make the new text belong to
|
|
879 the interval which is "sticky".
|
|
880
|
1189
|
881 If both intervals are "sticky", then make them belong to the left-most
|
1164
|
882 interval. Another possibility would be to create a new interval for
|
4383
|
883 this text, and make it have the merged properties of both ends. */
|
1164
|
884
|
|
885 static INTERVAL
|
|
886 adjust_intervals_for_insertion (tree, position, length)
|
|
887 INTERVAL tree;
|
|
888 int position, length;
|
|
889 {
|
|
890 register INTERVAL i;
|
4383
|
891 register INTERVAL temp;
|
|
892 int eobp = 0;
|
22343
|
893 Lisp_Object parent;
|
|
894 int offset;
|
47942
|
895
|
1164
|
896 if (TOTAL_LENGTH (tree) == 0) /* Paranoia */
|
|
897 abort ();
|
|
898
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
899 GET_INTERVAL_OBJECT (parent, tree);
|
22343
|
900 offset = (BUFFERP (parent) ? BUF_BEG (XBUFFER (parent)) : 0);
|
|
901
|
4005
|
902 /* If inserting at point-max of a buffer, that position will be out
|
|
903 of range. Remember that buffer positions are 1-based. */
|
22343
|
904 if (position >= TOTAL_LENGTH (tree) + offset)
|
|
905 {
|
|
906 position = TOTAL_LENGTH (tree) + offset;
|
|
907 eobp = 1;
|
|
908 }
|
1164
|
909
|
|
910 i = find_interval (tree, position);
|
4383
|
911
|
4638
|
912 /* If in middle of an interval which is not sticky either way,
|
|
913 we must not just give its properties to the insertion.
|
26862
|
914 So split this interval at the insertion point.
|
|
915
|
|
916 Originally, the if condition here was this:
|
|
917 (! (position == i->position || eobp)
|
|
918 && END_NONSTICKY_P (i)
|
|
919 && FRONT_NONSTICKY_P (i))
|
|
920 But, these macros are now unreliable because of introduction of
|
|
921 Vtext_property_default_nonsticky. So, we always check properties
|
|
922 one by one if POSITION is in middle of an interval. */
|
|
923 if (! (position == i->position || eobp))
|
4638
|
924 {
|
16740
|
925 Lisp_Object tail;
|
|
926 Lisp_Object front, rear;
|
|
927
|
26862
|
928 tail = i->plist;
|
16740
|
929
|
26862
|
930 /* Properties font-sticky and rear-nonsticky override
|
|
931 Vtext_property_default_nonsticky. So, if they are t, we can
|
|
932 skip one by one checking of properties. */
|
|
933 rear = textget (i->plist, Qrear_nonsticky);
|
|
934 if (! CONSP (rear) && ! NILP (rear))
|
16740
|
935 {
|
26862
|
936 /* All properties are nonsticky. We split the interval. */
|
|
937 goto check_done;
|
|
938 }
|
|
939 front = textget (i->plist, Qfront_sticky);
|
|
940 if (! CONSP (front) && ! NILP (front))
|
|
941 {
|
|
942 /* All properties are sticky. We don't split the interval. */
|
|
943 tail = Qnil;
|
|
944 goto check_done;
|
|
945 }
|
|
946
|
|
947 /* Does any actual property pose an actual problem? We break
|
|
948 the loop if we find a nonsticky property. */
|
|
949 for (; CONSP (tail); tail = Fcdr (XCDR (tail)))
|
|
950 {
|
|
951 Lisp_Object prop, tmp;
|
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
952 prop = XCAR (tail);
|
16740
|
953
|
26862
|
954 /* Is this particular property front-sticky? */
|
16740
|
955 if (CONSP (front) && ! NILP (Fmemq (prop, front)))
|
|
956 continue;
|
|
957
|
26862
|
958 /* Is this particular property rear-nonsticky? */
|
|
959 if (CONSP (rear) && ! NILP (Fmemq (prop, rear)))
|
|
960 break;
|
|
961
|
|
962 /* Is this particular property recorded as sticky or
|
|
963 nonsticky in Vtext_property_default_nonsticky? */
|
|
964 tmp = Fassq (prop, Vtext_property_default_nonsticky);
|
|
965 if (CONSP (tmp))
|
|
966 {
|
|
967 if (NILP (tmp))
|
|
968 continue;
|
|
969 break;
|
|
970 }
|
|
971
|
|
972 /* By default, a text property is rear-sticky, thus we
|
|
973 continue the loop. */
|
16740
|
974 }
|
|
975
|
26862
|
976 check_done:
|
16740
|
977 /* If any property is a real problem, split the interval. */
|
|
978 if (! NILP (tail))
|
|
979 {
|
|
980 temp = split_interval_right (i, position - i->position);
|
|
981 copy_properties (i, temp);
|
|
982 i = temp;
|
|
983 }
|
4638
|
984 }
|
|
985
|
1164
|
986 /* If we are positioned between intervals, check the stickiness of
|
4383
|
987 both of them. We have to do this too, if we are at BEG or Z. */
|
|
988 if (position == i->position || eobp)
|
1164
|
989 {
|
4383
|
990 register INTERVAL prev;
|
|
991
|
|
992 if (position == BEG)
|
|
993 prev = 0;
|
|
994 else if (eobp)
|
|
995 {
|
|
996 prev = i;
|
|
997 i = 0;
|
|
998 }
|
|
999 else
|
|
1000 prev = previous_interval (i);
|
|
1001
|
|
1002 /* Even if we are positioned between intervals, we default
|
|
1003 to the left one if it exists. We extend it now and split
|
14036
|
1004 off a part later, if stickiness demands it. */
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1005 for (temp = prev ? prev : i; temp; temp = INTERVAL_PARENT_OR_NULL (temp))
|
5415
|
1006 {
|
|
1007 temp->total_length += length;
|
50471
|
1008 CHECK_TOTAL_LENGTH (temp);
|
5415
|
1009 temp = balance_possible_root_interval (temp);
|
|
1010 }
|
47942
|
1011
|
4383
|
1012 /* If at least one interval has sticky properties,
|
26862
|
1013 we check the stickiness property by property.
|
|
1014
|
|
1015 Originally, the if condition here was this:
|
|
1016 (END_NONSTICKY_P (prev) || FRONT_STICKY_P (i))
|
|
1017 But, these macros are now unreliable because of introduction
|
|
1018 of Vtext_property_default_nonsticky. So, we always have to
|
|
1019 check stickiness of properties one by one. If cache of
|
|
1020 stickiness is implemented in the future, we may be able to
|
|
1021 use those macros again. */
|
|
1022 if (1)
|
4383
|
1023 {
|
6501
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1024 Lisp_Object pleft, pright;
|
4383
|
1025 struct interval newi;
|
1164
|
1026
|
6501
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1027 pleft = NULL_INTERVAL_P (prev) ? Qnil : prev->plist;
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1028 pright = NULL_INTERVAL_P (i) ? Qnil : i->plist;
|
4383
|
1029 newi.plist = merge_properties_sticky (pleft, pright);
|
|
1030
|
20557
|
1031 if (! prev) /* i.e. position == BEG */
|
4383
|
1032 {
|
|
1033 if (! intervals_equal (i, &newi))
|
|
1034 {
|
|
1035 i = split_interval_left (i, length);
|
|
1036 i->plist = newi.plist;
|
|
1037 }
|
|
1038 }
|
|
1039 else if (! intervals_equal (prev, &newi))
|
|
1040 {
|
|
1041 prev = split_interval_right (prev,
|
|
1042 position - prev->position);
|
|
1043 prev->plist = newi.plist;
|
|
1044 if (! NULL_INTERVAL_P (i)
|
|
1045 && intervals_equal (prev, i))
|
|
1046 merge_interval_right (prev);
|
|
1047 }
|
|
1048
|
|
1049 /* We will need to update the cache here later. */
|
|
1050 }
|
|
1051 else if (! prev && ! NILP (i->plist))
|
|
1052 {
|
|
1053 /* Just split off a new interval at the left.
|
|
1054 Since I wasn't front-sticky, the empty plist is ok. */
|
|
1055 i = split_interval_left (i, length);
|
|
1056 }
|
1164
|
1057 }
|
|
1058
|
4383
|
1059 /* Otherwise just extend the interval. */
|
|
1060 else
|
1164
|
1061 {
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1062 for (temp = i; temp; temp = INTERVAL_PARENT_OR_NULL (temp))
|
5415
|
1063 {
|
|
1064 temp->total_length += length;
|
50471
|
1065 CHECK_TOTAL_LENGTH (temp);
|
5415
|
1066 temp = balance_possible_root_interval (temp);
|
|
1067 }
|
1164
|
1068 }
|
47942
|
1069
|
1164
|
1070 return tree;
|
|
1071 }
|
4383
|
1072
|
5768
|
1073 /* Any property might be front-sticky on the left, rear-sticky on the left,
|
|
1074 front-sticky on the right, or rear-sticky on the right; the 16 combinations
|
|
1075 can be arranged in a matrix with rows denoting the left conditions and
|
|
1076 columns denoting the right conditions:
|
|
1077 _ __ _
|
|
1078 _ FR FR FR FR
|
|
1079 FR__ 0 1 2 3
|
|
1080 _FR 4 5 6 7
|
|
1081 FR 8 9 A B
|
|
1082 FR C D E F
|
|
1083
|
|
1084 left-props = '(front-sticky (p8 p9 pa pb pc pd pe pf)
|
|
1085 rear-nonsticky (p4 p5 p6 p7 p8 p9 pa pb)
|
|
1086 p0 L p1 L p2 L p3 L p4 L p5 L p6 L p7 L
|
|
1087 p8 L p9 L pa L pb L pc L pd L pe L pf L)
|
|
1088 right-props = '(front-sticky (p2 p3 p6 p7 pa pb pe pf)
|
|
1089 rear-nonsticky (p1 p2 p5 p6 p9 pa pd pe)
|
|
1090 p0 R p1 R p2 R p3 R p4 R p5 R p6 R p7 R
|
|
1091 p8 R p9 R pa R pb R pc R pd R pe R pf R)
|
|
1092
|
|
1093 We inherit from whoever has a sticky side facing us. If both sides
|
|
1094 do (cases 2, 3, E, and F), then we inherit from whichever side has a
|
|
1095 non-nil value for the current property. If both sides do, then we take
|
|
1096 from the left.
|
|
1097
|
|
1098 When we inherit a property, we get its stickiness as well as its value.
|
|
1099 So, when we merge the above two lists, we expect to get this:
|
|
1100
|
|
1101 result = '(front-sticky (p6 p7 pa pb pc pd pe pf)
|
|
1102 rear-nonsticky (p6 pa)
|
|
1103 p0 L p1 L p2 L p3 L p6 R p7 R
|
|
1104 pa R pb R pc L pd L pe L pf L)
|
|
1105
|
|
1106 The optimizable special cases are:
|
|
1107 left rear-nonsticky = nil, right front-sticky = nil (inherit left)
|
|
1108 left rear-nonsticky = t, right front-sticky = t (inherit right)
|
|
1109 left rear-nonsticky = t, right front-sticky = nil (inherit none)
|
|
1110 */
|
|
1111
|
4383
|
1112 Lisp_Object
|
|
1113 merge_properties_sticky (pleft, pright)
|
|
1114 Lisp_Object pleft, pright;
|
|
1115 {
|
6501
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1116 register Lisp_Object props, front, rear;
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1117 Lisp_Object lfront, lrear, rfront, rrear;
|
16708
|
1118 register Lisp_Object tail1, tail2, sym, lval, rval, cat;
|
5768
|
1119 int use_left, use_right;
|
16708
|
1120 int lpresent;
|
4383
|
1121
|
6501
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1122 props = Qnil;
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1123 front = Qnil;
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1124 rear = Qnil;
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1125 lfront = textget (pleft, Qfront_sticky);
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1126 lrear = textget (pleft, Qrear_nonsticky);
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1127 rfront = textget (pright, Qfront_sticky);
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1128 rrear = textget (pright, Qrear_nonsticky);
|
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1129
|
5768
|
1130 /* Go through each element of PRIGHT. */
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1131 for (tail1 = pright; CONSP (tail1); tail1 = Fcdr (XCDR (tail1)))
|
4383
|
1132 {
|
26862
|
1133 Lisp_Object tmp;
|
|
1134
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1135 sym = XCAR (tail1);
|
4383
|
1136
|
|
1137 /* Sticky properties get special treatment. */
|
|
1138 if (EQ (sym, Qrear_nonsticky) || EQ (sym, Qfront_sticky))
|
|
1139 continue;
|
5768
|
1140
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1141 rval = Fcar (XCDR (tail1));
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1142 for (tail2 = pleft; CONSP (tail2); tail2 = Fcdr (XCDR (tail2)))
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1143 if (EQ (sym, XCAR (tail2)))
|
5768
|
1144 break;
|
|
1145
|
16708
|
1146 /* Indicate whether the property is explicitly defined on the left.
|
|
1147 (We know it is defined explicitly on the right
|
|
1148 because otherwise we don't get here.) */
|
|
1149 lpresent = ! NILP (tail2);
|
|
1150 lval = (NILP (tail2) ? Qnil : Fcar (Fcdr (tail2)));
|
|
1151
|
26862
|
1152 /* Even if lrear or rfront say nothing about the stickiness of
|
|
1153 SYM, Vtext_property_default_nonsticky may give default
|
|
1154 stickiness to SYM. */
|
|
1155 tmp = Fassq (sym, Vtext_property_default_nonsticky);
|
|
1156 use_left = (lpresent
|
|
1157 && ! (TMEM (sym, lrear)
|
41901
|
1158 || (CONSP (tmp) && ! NILP (XCDR (tmp)))));
|
26862
|
1159 use_right = (TMEM (sym, rfront)
|
|
1160 || (CONSP (tmp) && NILP (XCDR (tmp))));
|
5768
|
1161 if (use_left && use_right)
|
4383
|
1162 {
|
16708
|
1163 if (NILP (lval))
|
|
1164 use_left = 0;
|
|
1165 else if (NILP (rval))
|
|
1166 use_right = 0;
|
4383
|
1167 }
|
5768
|
1168 if (use_left)
|
4383
|
1169 {
|
5768
|
1170 /* We build props as (value sym ...) rather than (sym value ...)
|
|
1171 because we plan to nreverse it when we're done. */
|
16708
|
1172 props = Fcons (lval, Fcons (sym, props));
|
5768
|
1173 if (TMEM (sym, lfront))
|
|
1174 front = Fcons (sym, front);
|
|
1175 if (TMEM (sym, lrear))
|
|
1176 rear = Fcons (sym, rear);
|
|
1177 }
|
|
1178 else if (use_right)
|
|
1179 {
|
16708
|
1180 props = Fcons (rval, Fcons (sym, props));
|
5768
|
1181 if (TMEM (sym, rfront))
|
|
1182 front = Fcons (sym, front);
|
|
1183 if (TMEM (sym, rrear))
|
|
1184 rear = Fcons (sym, rear);
|
4383
|
1185 }
|
|
1186 }
|
5768
|
1187
|
|
1188 /* Now go through each element of PLEFT. */
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1189 for (tail2 = pleft; CONSP (tail2); tail2 = Fcdr (XCDR (tail2)))
|
4383
|
1190 {
|
26862
|
1191 Lisp_Object tmp;
|
|
1192
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1193 sym = XCAR (tail2);
|
4383
|
1194
|
|
1195 /* Sticky properties get special treatment. */
|
|
1196 if (EQ (sym, Qrear_nonsticky) || EQ (sym, Qfront_sticky))
|
|
1197 continue;
|
|
1198
|
5768
|
1199 /* If sym is in PRIGHT, we've already considered it. */
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1200 for (tail1 = pright; CONSP (tail1); tail1 = Fcdr (XCDR (tail1)))
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1201 if (EQ (sym, XCAR (tail1)))
|
4383
|
1202 break;
|
5768
|
1203 if (! NILP (tail1))
|
|
1204 continue;
|
|
1205
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1206 lval = Fcar (XCDR (tail2));
|
5768
|
1207
|
26862
|
1208 /* Even if lrear or rfront say nothing about the stickiness of
|
|
1209 SYM, Vtext_property_default_nonsticky may give default
|
|
1210 stickiness to SYM. */
|
|
1211 tmp = Fassq (sym, Vtext_property_default_nonsticky);
|
|
1212
|
5768
|
1213 /* Since rval is known to be nil in this loop, the test simplifies. */
|
26862
|
1214 if (! (TMEM (sym, lrear) || (CONSP (tmp) && ! NILP (XCDR (tmp)))))
|
4383
|
1215 {
|
16708
|
1216 props = Fcons (lval, Fcons (sym, props));
|
5768
|
1217 if (TMEM (sym, lfront))
|
|
1218 front = Fcons (sym, front);
|
|
1219 }
|
26862
|
1220 else if (TMEM (sym, rfront) || (CONSP (tmp) && NILP (XCDR (tmp))))
|
5768
|
1221 {
|
|
1222 /* The value is nil, but we still inherit the stickiness
|
|
1223 from the right. */
|
4383
|
1224 front = Fcons (sym, front);
|
5768
|
1225 if (TMEM (sym, rrear))
|
4383
|
1226 rear = Fcons (sym, rear);
|
|
1227 }
|
|
1228 }
|
5760
|
1229 props = Fnreverse (props);
|
5768
|
1230 if (! NILP (rear))
|
|
1231 props = Fcons (Qrear_nonsticky, Fcons (Fnreverse (rear), props));
|
16708
|
1232
|
|
1233 cat = textget (props, Qcategory);
|
|
1234 if (! NILP (front)
|
47942
|
1235 &&
|
16708
|
1236 /* If we have inherited a front-stick category property that is t,
|
|
1237 we don't need to set up a detailed one. */
|
|
1238 ! (! NILP (cat) && SYMBOLP (cat)
|
|
1239 && EQ (Fget (cat, Qfront_sticky), Qt)))
|
5760
|
1240 props = Fcons (Qfront_sticky, Fcons (Fnreverse (front), props));
|
4383
|
1241 return props;
|
|
1242 }
|
|
1243
|
1157
|
1244
|
47942
|
1245 /* Delete a node I from its interval tree by merging its subtrees
|
1164
|
1246 into one subtree which is then returned. Caller is responsible for
|
4383
|
1247 storing the resulting subtree into its parent. */
|
1157
|
1248
|
|
1249 static INTERVAL
|
|
1250 delete_node (i)
|
|
1251 register INTERVAL i;
|
|
1252 {
|
|
1253 register INTERVAL migrate, this;
|
|
1254 register int migrate_amt;
|
|
1255
|
|
1256 if (NULL_INTERVAL_P (i->left))
|
|
1257 return i->right;
|
|
1258 if (NULL_INTERVAL_P (i->right))
|
|
1259 return i->left;
|
|
1260
|
|
1261 migrate = i->left;
|
|
1262 migrate_amt = i->left->total_length;
|
|
1263 this = i->right;
|
|
1264 this->total_length += migrate_amt;
|
|
1265 while (! NULL_INTERVAL_P (this->left))
|
|
1266 {
|
|
1267 this = this->left;
|
|
1268 this->total_length += migrate_amt;
|
|
1269 }
|
50471
|
1270 CHECK_TOTAL_LENGTH (this);
|
1157
|
1271 this->left = migrate;
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1272 SET_INTERVAL_PARENT (migrate, this);
|
1157
|
1273
|
|
1274 return i->right;
|
|
1275 }
|
|
1276
|
|
1277 /* Delete interval I from its tree by calling `delete_node'
|
|
1278 and properly connecting the resultant subtree.
|
|
1279
|
|
1280 I is presumed to be empty; that is, no adjustments are made
|
4383
|
1281 for the length of I. */
|
1157
|
1282
|
|
1283 void
|
|
1284 delete_interval (i)
|
|
1285 register INTERVAL i;
|
|
1286 {
|
|
1287 register INTERVAL parent;
|
|
1288 int amt = LENGTH (i);
|
|
1289
|
4383
|
1290 if (amt > 0) /* Only used on zero-length intervals now. */
|
1157
|
1291 abort ();
|
|
1292
|
|
1293 if (ROOT_INTERVAL_P (i))
|
|
1294 {
|
6501
d7ac9a417f87
(adjust_intervals_for_insertion, merge_properties_sticky, delete_interval):
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1295 Lisp_Object owner;
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1296 GET_INTERVAL_OBJECT (owner, i);
|
1157
|
1297 parent = delete_node (i);
|
|
1298 if (! NULL_INTERVAL_P (parent))
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1299 SET_INTERVAL_OBJECT (parent, owner);
|
1157
|
1300
|
9125
a78f02f76f03
(create_root_interval, balance_possible_root_interval, delete_interval): Use
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1301 if (BUFFERP (owner))
|
10313
|
1302 BUF_INTERVALS (XBUFFER (owner)) = parent;
|
9125
a78f02f76f03
(create_root_interval, balance_possible_root_interval, delete_interval): Use
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1303 else if (STRINGP (owner))
|
46380
48b292c584a6
* intervals.c (create_root_interval, balance_possible_root_interval,
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1304 STRING_SET_INTERVALS (owner, parent);
|
1157
|
1305 else
|
|
1306 abort ();
|
|
1307
|
|
1308 return;
|
|
1309 }
|
|
1310
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1311 parent = INTERVAL_PARENT (i);
|
1157
|
1312 if (AM_LEFT_CHILD (i))
|
|
1313 {
|
|
1314 parent->left = delete_node (i);
|
|
1315 if (! NULL_INTERVAL_P (parent->left))
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1316 SET_INTERVAL_PARENT (parent->left, parent);
|
1157
|
1317 }
|
|
1318 else
|
|
1319 {
|
|
1320 parent->right = delete_node (i);
|
|
1321 if (! NULL_INTERVAL_P (parent->right))
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1322 SET_INTERVAL_PARENT (parent->right, parent);
|
1157
|
1323 }
|
|
1324 }
|
|
1325
|
4005
|
1326 /* Find the interval in TREE corresponding to the relative position
|
|
1327 FROM and delete as much as possible of AMOUNT from that interval.
|
|
1328 Return the amount actually deleted, and if the interval was
|
|
1329 zeroed-out, delete that interval node from the tree.
|
|
1330
|
|
1331 Note that FROM is actually origin zero, aka relative to the
|
|
1332 leftmost edge of tree. This is appropriate since we call ourselves
|
|
1333 recursively on subtrees.
|
1157
|
1334
|
1189
|
1335 Do this by recursing down TREE to the interval in question, and
|
4383
|
1336 deleting the appropriate amount of text. */
|
1157
|
1337
|
|
1338 static int
|
|
1339 interval_deletion_adjustment (tree, from, amount)
|
|
1340 register INTERVAL tree;
|
|
1341 register int from, amount;
|
|
1342 {
|
|
1343 register int relative_position = from;
|
|
1344
|
|
1345 if (NULL_INTERVAL_P (tree))
|
|
1346 return 0;
|
|
1347
|
|
1348 /* Left branch */
|
4005
|
1349 if (relative_position < LEFT_TOTAL_LENGTH (tree))
|
1157
|
1350 {
|
|
1351 int subtract = interval_deletion_adjustment (tree->left,
|
|
1352 relative_position,
|
|
1353 amount);
|
|
1354 tree->total_length -= subtract;
|
50471
|
1355 CHECK_TOTAL_LENGTH (tree);
|
1157
|
1356 return subtract;
|
|
1357 }
|
|
1358 /* Right branch */
|
4005
|
1359 else if (relative_position >= (TOTAL_LENGTH (tree)
|
|
1360 - RIGHT_TOTAL_LENGTH (tree)))
|
1157
|
1361 {
|
|
1362 int subtract;
|
|
1363
|
|
1364 relative_position -= (tree->total_length
|
|
1365 - RIGHT_TOTAL_LENGTH (tree));
|
|
1366 subtract = interval_deletion_adjustment (tree->right,
|
|
1367 relative_position,
|
|
1368 amount);
|
|
1369 tree->total_length -= subtract;
|
50471
|
1370 CHECK_TOTAL_LENGTH (tree);
|
1157
|
1371 return subtract;
|
|
1372 }
|
4383
|
1373 /* Here -- this node. */
|
1157
|
1374 else
|
|
1375 {
|
4005
|
1376 /* How much can we delete from this interval? */
|
47942
|
1377 int my_amount = ((tree->total_length
|
4005
|
1378 - RIGHT_TOTAL_LENGTH (tree))
|
|
1379 - relative_position);
|
1157
|
1380
|
4005
|
1381 if (amount > my_amount)
|
|
1382 amount = my_amount;
|
1157
|
1383
|
4005
|
1384 tree->total_length -= amount;
|
50471
|
1385 CHECK_TOTAL_LENGTH (tree);
|
4005
|
1386 if (LENGTH (tree) == 0)
|
|
1387 delete_interval (tree);
|
47942
|
1388
|
4005
|
1389 return amount;
|
1157
|
1390 }
|
|
1391
|
4383
|
1392 /* Never reach here. */
|
1157
|
1393 }
|
|
1394
|
4005
|
1395 /* Effect the adjustments necessary to the interval tree of BUFFER to
|
|
1396 correspond to the deletion of LENGTH characters from that buffer
|
|
1397 text. The deletion is effected at position START (which is a
|
4383
|
1398 buffer position, i.e. origin 1). */
|
1189
|
1399
|
1157
|
1400 static void
|
|
1401 adjust_intervals_for_deletion (buffer, start, length)
|
|
1402 struct buffer *buffer;
|
|
1403 int start, length;
|
|
1404 {
|
|
1405 register int left_to_delete = length;
|
10313
|
1406 register INTERVAL tree = BUF_INTERVALS (buffer);
|
22343
|
1407 Lisp_Object parent;
|
|
1408 int offset;
|
|
1409
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1410 GET_INTERVAL_OBJECT (parent, tree);
|
22343
|
1411 offset = (BUFFERP (parent) ? BUF_BEG (XBUFFER (parent)) : 0);
|
1157
|
1412
|
|
1413 if (NULL_INTERVAL_P (tree))
|
|
1414 return;
|
|
1415
|
22343
|
1416 if (start > offset + TOTAL_LENGTH (tree)
|
|
1417 || start + length > offset + TOTAL_LENGTH (tree))
|
4005
|
1418 abort ();
|
|
1419
|
1157
|
1420 if (length == TOTAL_LENGTH (tree))
|
|
1421 {
|
10313
|
1422 BUF_INTERVALS (buffer) = NULL_INTERVAL;
|
1157
|
1423 return;
|
|
1424 }
|
|
1425
|
|
1426 if (ONLY_INTERVAL_P (tree))
|
|
1427 {
|
|
1428 tree->total_length -= length;
|
50471
|
1429 CHECK_TOTAL_LENGTH (tree);
|
1157
|
1430 return;
|
|
1431 }
|
|
1432
|
22343
|
1433 if (start > offset + TOTAL_LENGTH (tree))
|
|
1434 start = offset + TOTAL_LENGTH (tree);
|
1157
|
1435 while (left_to_delete > 0)
|
|
1436 {
|
22343
|
1437 left_to_delete -= interval_deletion_adjustment (tree, start - offset,
|
1157
|
1438 left_to_delete);
|
10313
|
1439 tree = BUF_INTERVALS (buffer);
|
1157
|
1440 if (left_to_delete == tree->total_length)
|
|
1441 {
|
10313
|
1442 BUF_INTERVALS (buffer) = NULL_INTERVAL;
|
1157
|
1443 return;
|
|
1444 }
|
|
1445 }
|
|
1446 }
|
|
1447
|
3591
|
1448 /* Make the adjustments necessary to the interval tree of BUFFER to
|
1189
|
1449 represent an addition or deletion of LENGTH characters starting
|
|
1450 at position START. Addition or deletion is indicated by the sign
|
4383
|
1451 of LENGTH. */
|
1157
|
1452
|
|
1453 INLINE void
|
|
1454 offset_intervals (buffer, start, length)
|
|
1455 struct buffer *buffer;
|
|
1456 int start, length;
|
|
1457 {
|
10313
|
1458 if (NULL_INTERVAL_P (BUF_INTERVALS (buffer)) || length == 0)
|
1157
|
1459 return;
|
|
1460
|
|
1461 if (length > 0)
|
10313
|
1462 adjust_intervals_for_insertion (BUF_INTERVALS (buffer), start, length);
|
1157
|
1463 else
|
|
1464 adjust_intervals_for_deletion (buffer, start, -length);
|
|
1465 }
|
1211
|
1466
|
|
1467 /* Merge interval I with its lexicographic successor. The resulting
|
|
1468 interval is returned, and has the properties of the original
|
|
1469 successor. The properties of I are lost. I is removed from the
|
|
1470 interval tree.
|
1157
|
1471
|
1211
|
1472 IMPORTANT:
|
|
1473 The caller must verify that this is not the last (rightmost)
|
4383
|
1474 interval. */
|
1211
|
1475
|
|
1476 INTERVAL
|
|
1477 merge_interval_right (i)
|
|
1478 register INTERVAL i;
|
|
1479 {
|
|
1480 register int absorb = LENGTH (i);
|
|
1481 register INTERVAL successor;
|
|
1482
|
4383
|
1483 /* Zero out this interval. */
|
1211
|
1484 i->total_length -= absorb;
|
50471
|
1485 CHECK_TOTAL_LENGTH (i);
|
1211
|
1486
|
4383
|
1487 /* Find the succeeding interval. */
|
1211
|
1488 if (! NULL_RIGHT_CHILD (i)) /* It's below us. Add absorb
|
4383
|
1489 as we descend. */
|
1211
|
1490 {
|
|
1491 successor = i->right;
|
|
1492 while (! NULL_LEFT_CHILD (successor))
|
|
1493 {
|
|
1494 successor->total_length += absorb;
|
50471
|
1495 CHECK_TOTAL_LENGTH (successor);
|
1211
|
1496 successor = successor->left;
|
|
1497 }
|
|
1498
|
|
1499 successor->total_length += absorb;
|
50471
|
1500 CHECK_TOTAL_LENGTH (successor);
|
1211
|
1501 delete_interval (i);
|
|
1502 return successor;
|
|
1503 }
|
|
1504
|
|
1505 successor = i;
|
|
1506 while (! NULL_PARENT (successor)) /* It's above us. Subtract as
|
4383
|
1507 we ascend. */
|
1211
|
1508 {
|
|
1509 if (AM_LEFT_CHILD (successor))
|
|
1510 {
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1511 successor = INTERVAL_PARENT (successor);
|
1211
|
1512 delete_interval (i);
|
|
1513 return successor;
|
|
1514 }
|
|
1515
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1516 successor = INTERVAL_PARENT (successor);
|
1211
|
1517 successor->total_length -= absorb;
|
50471
|
1518 CHECK_TOTAL_LENGTH (successor);
|
1211
|
1519 }
|
|
1520
|
|
1521 /* This must be the rightmost or last interval and cannot
|
4383
|
1522 be merged right. The caller should have known. */
|
1211
|
1523 abort ();
|
|
1524 }
|
|
1525
|
|
1526 /* Merge interval I with its lexicographic predecessor. The resulting
|
|
1527 interval is returned, and has the properties of the original predecessor.
|
|
1528 The properties of I are lost. Interval node I is removed from the tree.
|
|
1529
|
|
1530 IMPORTANT:
|
4383
|
1531 The caller must verify that this is not the first (leftmost) interval. */
|
1211
|
1532
|
|
1533 INTERVAL
|
|
1534 merge_interval_left (i)
|
|
1535 register INTERVAL i;
|
|
1536 {
|
|
1537 register int absorb = LENGTH (i);
|
|
1538 register INTERVAL predecessor;
|
|
1539
|
4383
|
1540 /* Zero out this interval. */
|
1211
|
1541 i->total_length -= absorb;
|
50471
|
1542 CHECK_TOTAL_LENGTH (i);
|
1211
|
1543
|
4383
|
1544 /* Find the preceding interval. */
|
1211
|
1545 if (! NULL_LEFT_CHILD (i)) /* It's below us. Go down,
|
4383
|
1546 adding ABSORB as we go. */
|
1211
|
1547 {
|
|
1548 predecessor = i->left;
|
|
1549 while (! NULL_RIGHT_CHILD (predecessor))
|
|
1550 {
|
|
1551 predecessor->total_length += absorb;
|
50471
|
1552 CHECK_TOTAL_LENGTH (predecessor);
|
1211
|
1553 predecessor = predecessor->right;
|
|
1554 }
|
|
1555
|
|
1556 predecessor->total_length += absorb;
|
50471
|
1557 CHECK_TOTAL_LENGTH (predecessor);
|
1211
|
1558 delete_interval (i);
|
|
1559 return predecessor;
|
|
1560 }
|
|
1561
|
|
1562 predecessor = i;
|
|
1563 while (! NULL_PARENT (predecessor)) /* It's above us. Go up,
|
4383
|
1564 subtracting ABSORB. */
|
1211
|
1565 {
|
|
1566 if (AM_RIGHT_CHILD (predecessor))
|
|
1567 {
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1568 predecessor = INTERVAL_PARENT (predecessor);
|
1211
|
1569 delete_interval (i);
|
|
1570 return predecessor;
|
|
1571 }
|
|
1572
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1573 predecessor = INTERVAL_PARENT (predecessor);
|
1211
|
1574 predecessor->total_length -= absorb;
|
50471
|
1575 CHECK_TOTAL_LENGTH (predecessor);
|
1211
|
1576 }
|
|
1577
|
|
1578 /* This must be the leftmost or first interval and cannot
|
4383
|
1579 be merged left. The caller should have known. */
|
1211
|
1580 abort ();
|
|
1581 }
|
|
1582
|
1189
|
1583 /* Make an exact copy of interval tree SOURCE which descends from
|
|
1584 PARENT. This is done by recursing through SOURCE, copying
|
|
1585 the current interval and its properties, and then adjusting
|
4383
|
1586 the pointers of the copy. */
|
1189
|
1587
|
1157
|
1588 static INTERVAL
|
|
1589 reproduce_tree (source, parent)
|
|
1590 INTERVAL source, parent;
|
|
1591 {
|
|
1592 register INTERVAL t = make_interval ();
|
|
1593
|
|
1594 bcopy (source, t, INTERVAL_SIZE);
|
|
1595 copy_properties (source, t);
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1596 SET_INTERVAL_PARENT (t, parent);
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1597 if (! NULL_LEFT_CHILD (source))
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1598 t->left = reproduce_tree (source->left, t);
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1599 if (! NULL_RIGHT_CHILD (source))
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1600 t->right = reproduce_tree (source->right, t);
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1601
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1602 return t;
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1603 }
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1604
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1605 static INTERVAL
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1606 reproduce_tree_obj (source, parent)
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1607 INTERVAL source;
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1608 Lisp_Object parent;
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1609 {
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1610 register INTERVAL t = make_interval ();
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1611
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1612 bcopy (source, t, INTERVAL_SIZE);
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1613 copy_properties (source, t);
|
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1614 SET_INTERVAL_OBJECT (t, parent);
|
1157
|
1615 if (! NULL_LEFT_CHILD (source))
|
|
1616 t->left = reproduce_tree (source->left, t);
|
|
1617 if (! NULL_RIGHT_CHILD (source))
|
|
1618 t->right = reproduce_tree (source->right, t);
|
|
1619
|
|
1620 return t;
|
|
1621 }
|
|
1622
|
4005
|
1623 #if 0
|
|
1624 /* Nobody calls this. Perhaps it's a vestige of an earlier design. */
|
|
1625
|
1189
|
1626 /* Make a new interval of length LENGTH starting at START in the
|
|
1627 group of intervals INTERVALS, which is actually an interval tree.
|
|
1628 Returns the new interval.
|
|
1629
|
|
1630 Generate an error if the new positions would overlap an existing
|
4383
|
1631 interval. */
|
1189
|
1632
|
1157
|
1633 static INTERVAL
|
|
1634 make_new_interval (intervals, start, length)
|
|
1635 INTERVAL intervals;
|
|
1636 int start, length;
|
|
1637 {
|
|
1638 INTERVAL slot;
|
|
1639
|
|
1640 slot = find_interval (intervals, start);
|
|
1641 if (start + length > slot->position + LENGTH (slot))
|
|
1642 error ("Interval would overlap");
|
|
1643
|
|
1644 if (start == slot->position && length == LENGTH (slot))
|
|
1645 return slot;
|
|
1646
|
|
1647 if (slot->position == start)
|
|
1648 {
|
4383
|
1649 /* New right node. */
|
4135
|
1650 split_interval_right (slot, length);
|
1157
|
1651 return slot;
|
|
1652 }
|
|
1653
|
|
1654 if (slot->position + LENGTH (slot) == start + length)
|
|
1655 {
|
4383
|
1656 /* New left node. */
|
4135
|
1657 split_interval_left (slot, LENGTH (slot) - length);
|
1157
|
1658 return slot;
|
|
1659 }
|
|
1660
|
4383
|
1661 /* Convert interval SLOT into three intervals. */
|
4135
|
1662 split_interval_left (slot, start - slot->position);
|
|
1663 split_interval_right (slot, length);
|
1157
|
1664 return slot;
|
|
1665 }
|
4005
|
1666 #endif
|
2052
|
1667
|
1211
|
1668 /* Insert the intervals of SOURCE into BUFFER at POSITION.
|
5169
|
1669 LENGTH is the length of the text in SOURCE.
|
1157
|
1670
|
22343
|
1671 The `position' field of the SOURCE intervals is assumed to be
|
|
1672 consistent with its parent; therefore, SOURCE must be an
|
|
1673 interval tree made with copy_interval or must be the whole
|
|
1674 tree of a buffer or a string.
|
|
1675
|
4135
|
1676 This is used in insdel.c when inserting Lisp_Strings into the
|
|
1677 buffer. The text corresponding to SOURCE is already in the buffer
|
|
1678 when this is called. The intervals of new tree are a copy of those
|
|
1679 belonging to the string being inserted; intervals are never
|
|
1680 shared.
|
1157
|
1681
|
5169
|
1682 If the inserted text had no intervals associated, and we don't
|
|
1683 want to inherit the surrounding text's properties, this function
|
1157
|
1684 simply returns -- offset_intervals should handle placing the
|
1164
|
1685 text in the correct interval, depending on the sticky bits.
|
1157
|
1686
|
|
1687 If the inserted text had properties (intervals), then there are two
|
|
1688 cases -- either insertion happened in the middle of some interval,
|
|
1689 or between two intervals.
|
|
1690
|
|
1691 If the text goes into the middle of an interval, then new
|
|
1692 intervals are created in the middle with only the properties of
|
|
1693 the new text, *unless* the macro MERGE_INSERTIONS is true, in
|
|
1694 which case the new text has the union of its properties and those
|
|
1695 of the text into which it was inserted.
|
|
1696
|
|
1697 If the text goes between two intervals, then if neither interval
|
1164
|
1698 had its appropriate sticky property set (front_sticky, rear_sticky),
|
|
1699 the new text has only its properties. If one of the sticky properties
|
1157
|
1700 is set, then the new text "sticks" to that region and its properties
|
3591
|
1701 depend on merging as above. If both the preceding and succeeding
|
1164
|
1702 intervals to the new text are "sticky", then the new text retains
|
|
1703 only its properties, as if neither sticky property were set. Perhaps
|
1157
|
1704 we should consider merging all three sets of properties onto the new
|
4383
|
1705 text... */
|
1157
|
1706
|
|
1707 void
|
5169
|
1708 graft_intervals_into_buffer (source, position, length, buffer, inherit)
|
1211
|
1709 INTERVAL source;
|
5169
|
1710 int position, length;
|
1211
|
1711 struct buffer *buffer;
|
4718
|
1712 int inherit;
|
1157
|
1713 {
|
1964
|
1714 register INTERVAL under, over, this, prev;
|
10313
|
1715 register INTERVAL tree;
|
52577
|
1716 int over_used;
|
1157
|
1717
|
10313
|
1718 tree = BUF_INTERVALS (buffer);
|
|
1719
|
40920
|
1720 /* If the new text has no properties, then with inheritance it
|
|
1721 becomes part of whatever interval it was inserted into.
|
|
1722 To prevent inheritance, we must clear out the properties
|
|
1723 of the newly inserted text. */
|
1211
|
1724 if (NULL_INTERVAL_P (source))
|
5169
|
1725 {
|
|
1726 Lisp_Object buf;
|
41531
|
1727 if (!inherit && !NULL_INTERVAL_P (tree) && length > 0)
|
5169
|
1728 {
|
9271
1971a6a8cdc0
(graft_intervals_into_buffer): Use new accessor macros instead of calling XSET
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1729 XSETBUFFER (buf, buffer);
|
40920
|
1730 set_text_properties_1 (make_number (position),
|
|
1731 make_number (position + length),
|
|
1732 Qnil, buf, 0);
|
5169
|
1733 }
|
10313
|
1734 if (! NULL_INTERVAL_P (BUF_INTERVALS (buffer)))
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1735 /* Shouldn't be necessary. -stef */
|
10313
|
1736 BUF_INTERVALS (buffer) = balance_an_interval (BUF_INTERVALS (buffer));
|
5169
|
1737 return;
|
|
1738 }
|
1157
|
1739
|
|
1740 if (NULL_INTERVAL_P (tree))
|
|
1741 {
|
|
1742 /* The inserted text constitutes the whole buffer, so
|
4383
|
1743 simply copy over the interval structure. */
|
4135
|
1744 if ((BUF_Z (buffer) - BUF_BEG (buffer)) == TOTAL_LENGTH (source))
|
1157
|
1745 {
|
4223
|
1746 Lisp_Object buf;
|
9271
1971a6a8cdc0
(graft_intervals_into_buffer): Use new accessor macros instead of calling XSET
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1747 XSETBUFFER (buf, buffer);
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1748 BUF_INTERVALS (buffer) = reproduce_tree_obj (source, buf);
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1749 BUF_INTERVALS (buffer)->position = BEG;
|
52679
32ebe48159a6
(graft_intervals_into_buffer): Handle over_used when splitting UNDER.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1750 BUF_INTERVALS (buffer)->up_obj = 1;
|
22343
|
1751
|
|
1752 /* Explicitly free the old tree here? */
|
1157
|
1753
|
|
1754 return;
|
|
1755 }
|
|
1756
|
|
1757 /* Create an interval tree in which to place a copy
|
4383
|
1758 of the intervals of the inserted string. */
|
1157
|
1759 {
|
1307
|
1760 Lisp_Object buf;
|
9271
1971a6a8cdc0
(graft_intervals_into_buffer): Use new accessor macros instead of calling XSET
Karl Heuer <kwzh@gnu.org>
diff
changeset
|
1761 XSETBUFFER (buf, buffer);
|
1964
|
1762 tree = create_root_interval (buf);
|
1157
|
1763 }
|
|
1764 }
|
4718
|
1765 else if (TOTAL_LENGTH (tree) == TOTAL_LENGTH (source))
|
|
1766 /* If the buffer contains only the new string, but
|
|
1767 there was already some interval tree there, then it may be
|
|
1768 some zero length intervals. Eventually, do something clever
|
|
1769 about inserting properly. For now, just waste the old intervals. */
|
|
1770 {
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
1771 BUF_INTERVALS (buffer) = reproduce_tree (source, INTERVAL_PARENT (tree));
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1772 BUF_INTERVALS (buffer)->position = BEG;
|
52679
32ebe48159a6
(graft_intervals_into_buffer): Handle over_used when splitting UNDER.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1773 BUF_INTERVALS (buffer)->up_obj = 1;
|
4718
|
1774 /* Explicitly free the old tree here. */
|
1157
|
1775
|
4718
|
1776 return;
|
|
1777 }
|
|
1778 /* Paranoia -- the text has already been added, so this buffer
|
|
1779 should be of non-zero length. */
|
|
1780 else if (TOTAL_LENGTH (tree) == 0)
|
|
1781 abort ();
|
1157
|
1782
|
|
1783 this = under = find_interval (tree, position);
|
|
1784 if (NULL_INTERVAL_P (under)) /* Paranoia */
|
|
1785 abort ();
|
22343
|
1786 over = find_interval (source, interval_start_pos (source));
|
1157
|
1787
|
1964
|
1788 /* Here for insertion in the middle of an interval.
|
|
1789 Split off an equivalent interval to the right,
|
|
1790 then don't bother with it any more. */
|
1157
|
1791
|
1964
|
1792 if (position > under->position)
|
|
1793 {
|
|
1794 INTERVAL end_unchanged
|
4135
|
1795 = split_interval_left (this, position - under->position);
|
1964
|
1796 copy_properties (under, end_unchanged);
|
|
1797 under->position = position;
|
|
1798 }
|
|
1799 else
|
|
1800 {
|
26862
|
1801 /* This call may have some effect because previous_interval may
|
|
1802 update `position' fields of intervals. Thus, don't ignore it
|
|
1803 for the moment. Someone please tell me the truth (K.Handa). */
|
1964
|
1804 prev = previous_interval (under);
|
26862
|
1805 #if 0
|
|
1806 /* But, this code surely has no effect. And, anyway,
|
|
1807 END_NONSTICKY_P is unreliable now. */
|
4383
|
1808 if (prev && !END_NONSTICKY_P (prev))
|
1964
|
1809 prev = 0;
|
26862
|
1810 #endif /* 0 */
|
1157
|
1811 }
|
|
1812
|
1964
|
1813 /* Insertion is now at beginning of UNDER. */
|
1157
|
1814
|
1964
|
1815 /* The inserted text "sticks" to the interval `under',
|
4383
|
1816 which means it gets those properties.
|
|
1817 The properties of under are the result of
|
14036
|
1818 adjust_intervals_for_insertion, so stickiness has
|
4383
|
1819 already been taken care of. */
|
47942
|
1820
|
52577
|
1821 /* OVER is the interval we are copying from next.
|
|
1822 OVER_USED says how many characters' worth of OVER
|
|
1823 have already been copied into target intervals.
|
|
1824 UNDER is the next interval in the target. */
|
|
1825 over_used = 0;
|
1157
|
1826 while (! NULL_INTERVAL_P (over))
|
|
1827 {
|
52577
|
1828 /* If UNDER is longer than OVER, split it. */
|
52679
32ebe48159a6
(graft_intervals_into_buffer): Handle over_used when splitting UNDER.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1829 if (LENGTH (over) - over_used < LENGTH (under))
|
4383
|
1830 {
|
52679
32ebe48159a6
(graft_intervals_into_buffer): Handle over_used when splitting UNDER.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1831 this = split_interval_left (under, LENGTH (over) - over_used);
|
4383
|
1832 copy_properties (under, this);
|
|
1833 }
|
1964
|
1834 else
|
|
1835 this = under;
|
52577
|
1836
|
|
1837 /* THIS is now the interval to copy or merge into.
|
|
1838 OVER covers all of it. */
|
4718
|
1839 if (inherit)
|
4383
|
1840 merge_properties (over, this);
|
|
1841 else
|
|
1842 copy_properties (over, this);
|
52577
|
1843
|
|
1844 /* If THIS and OVER end at the same place,
|
|
1845 advance OVER to a new source interval. */
|
|
1846 if (LENGTH (this) == LENGTH (over) - over_used)
|
|
1847 {
|
|
1848 over = next_interval (over);
|
|
1849 over_used = 0;
|
|
1850 }
|
|
1851 else
|
|
1852 /* Otherwise just record that more of OVER has been used. */
|
|
1853 over_used += LENGTH (this);
|
|
1854
|
|
1855 /* Always advance to a new target interval. */
|
|
1856 under = next_interval (this);
|
1157
|
1857 }
|
|
1858
|
10313
|
1859 if (! NULL_INTERVAL_P (BUF_INTERVALS (buffer)))
|
|
1860 BUF_INTERVALS (buffer) = balance_an_interval (BUF_INTERVALS (buffer));
|
1157
|
1861 return;
|
|
1862 }
|
|
1863
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1864 /* 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>
diff
changeset
|
1865 which is the plist of an interval.
|
47942
|
1866 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>
diff
changeset
|
1867 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>
diff
changeset
|
1868
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1869 Lisp_Object
|
1964
|
1870 textget (plist, prop)
|
|
1871 Lisp_Object plist;
|
|
1872 register Lisp_Object prop;
|
|
1873 {
|
45781
|
1874 return lookup_char_property (plist, prop, 1);
|
45682
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1875 }
|
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1876
|
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1877 Lisp_Object
|
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1878 lookup_char_property (plist, prop, textprop)
|
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1879 Lisp_Object plist;
|
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1880 register Lisp_Object prop;
|
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1881 int textprop;
|
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1882 {
|
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1883 register Lisp_Object tail, fallback = Qnil;
|
1964
|
1884
|
45781
|
1885 for (tail = plist; CONSP (tail); tail = Fcdr (XCDR (tail)))
|
1964
|
1886 {
|
|
1887 register Lisp_Object tem;
|
45781
|
1888 tem = XCAR (tail);
|
1964
|
1889 if (EQ (prop, tem))
|
45781
|
1890 return Fcar (XCDR (tail));
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1891 if (EQ (tem, Qcategory))
|
8611
|
1892 {
|
45781
|
1893 tem = Fcar (XCDR (tail));
|
8611
|
1894 if (SYMBOLP (tem))
|
|
1895 fallback = Fget (tem, prop);
|
|
1896 }
|
1964
|
1897 }
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
1898
|
10927
|
1899 if (! NILP (fallback))
|
|
1900 return fallback;
|
45682
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1901 /* Check for alternative properties */
|
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1902 tail = Fassq (prop, Vchar_property_alias_alist);
|
55707
|
1903 if (! NILP (tail))
|
|
1904 {
|
|
1905 tail = XCDR (tail);
|
|
1906 for (; NILP (fallback) && CONSP (tail); tail = XCDR (tail))
|
|
1907 fallback = Fplist_get (plist, XCAR (tail));
|
|
1908 }
|
|
1909
|
45682
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1910 if (textprop && NILP (fallback) && CONSP (Vdefault_text_properties))
|
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1911 fallback = Fplist_get (Vdefault_text_properties, prop);
|
b9f2c8b7c60e
(lookup_char_property): New function for looking up overlay and text
Colin Walters <walters@gnu.org>
diff
changeset
|
1912 return fallback;
|
1964
|
1913 }
|
4383
|
1914
|
2052
|
1915
|
20557
|
1916 /* Set point "temporarily", without checking any text properties. */
|
|
1917
|
|
1918 INLINE void
|
|
1919 temp_set_point (buffer, charpos)
|
|
1920 struct buffer *buffer;
|
|
1921 int charpos;
|
|
1922 {
|
|
1923 temp_set_point_both (buffer, charpos,
|
|
1924 buf_charpos_to_bytepos (buffer, charpos));
|
|
1925 }
|
|
1926
|
|
1927 /* Set point in BUFFER "temporarily" to CHARPOS, which corresponds to
|
|
1928 byte position BYTEPOS. */
|
|
1929
|
|
1930 INLINE void
|
|
1931 temp_set_point_both (buffer, charpos, bytepos)
|
20936
|
1932 int charpos, bytepos;
|
20557
|
1933 struct buffer *buffer;
|
|
1934 {
|
|
1935 /* In a single-byte buffer, the two positions must be equal. */
|
|
1936 if (BUF_ZV (buffer) == BUF_ZV_BYTE (buffer)
|
|
1937 && charpos != bytepos)
|
|
1938 abort ();
|
|
1939
|
|
1940 if (charpos > bytepos)
|
|
1941 abort ();
|
|
1942
|
|
1943 if (charpos > BUF_ZV (buffer) || charpos < BUF_BEGV (buffer))
|
|
1944 abort ();
|
|
1945
|
|
1946 BUF_PT_BYTE (buffer) = bytepos;
|
|
1947 BUF_PT (buffer) = charpos;
|
|
1948 }
|
|
1949
|
47942
|
1950 /* Set point in BUFFER to CHARPOS. If the target position is
|
7104
|
1951 before an intangible character, move to an ok place. */
|
1157
|
1952
|
|
1953 void
|
20557
|
1954 set_point (buffer, charpos)
|
1157
|
1955 register struct buffer *buffer;
|
20557
|
1956 register int charpos;
|
|
1957 {
|
|
1958 set_point_both (buffer, charpos, buf_charpos_to_bytepos (buffer, charpos));
|
|
1959 }
|
|
1960
|
43898
|
1961 /* If there's an invisible character at position POS + TEST_OFFS in the
|
|
1962 current buffer, and the invisible property has a `stickiness' such that
|
|
1963 inserting a character at position POS would inherit the property it,
|
|
1964 return POS + ADJ, otherwise return POS. If TEST_INTANG is non-zero,
|
|
1965 then intangibility is required as well as invisibleness.
|
|
1966
|
|
1967 TEST_OFFS should be either 0 or -1, and ADJ should be either 1 or -1.
|
|
1968
|
|
1969 Note that `stickiness' is determined by overlay marker insertion types,
|
47942
|
1970 if the invisible property comes from an overlay. */
|
43898
|
1971
|
|
1972 static int
|
|
1973 adjust_for_invis_intang (pos, test_offs, adj, test_intang)
|
|
1974 int pos, test_offs, adj, test_intang;
|
|
1975 {
|
|
1976 Lisp_Object invis_propval, invis_overlay;
|
|
1977 Lisp_Object test_pos;
|
|
1978
|
|
1979 if ((adj < 0 && pos + adj < BEGV) || (adj > 0 && pos + adj > ZV))
|
|
1980 /* POS + ADJ would be beyond the buffer bounds, so do no adjustment. */
|
|
1981 return pos;
|
|
1982
|
|
1983 test_pos = make_number (pos + test_offs);
|
|
1984
|
|
1985 invis_propval
|
|
1986 = get_char_property_and_overlay (test_pos, Qinvisible, Qnil,
|
|
1987 &invis_overlay);
|
|
1988
|
|
1989 if ((!test_intang
|
|
1990 || ! NILP (Fget_char_property (test_pos, Qintangible, Qnil)))
|
|
1991 && TEXT_PROP_MEANS_INVISIBLE (invis_propval)
|
|
1992 /* This next test is true if the invisible property has a stickiness
|
|
1993 such that an insertion at POS would inherit it. */
|
|
1994 && (NILP (invis_overlay)
|
|
1995 /* Invisible property is from a text-property. */
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
1996 ? (text_property_stickiness (Qinvisible, make_number (pos), Qnil)
|
43898
|
1997 == (test_offs == 0 ? 1 : -1))
|
|
1998 /* Invisible property is from an overlay. */
|
|
1999 : (test_offs == 0
|
|
2000 ? XMARKER (OVERLAY_START (invis_overlay))->insertion_type == 0
|
|
2001 : XMARKER (OVERLAY_END (invis_overlay))->insertion_type == 1)))
|
|
2002 pos += adj;
|
|
2003
|
|
2004 return pos;
|
|
2005 }
|
|
2006
|
20557
|
2007 /* Set point in BUFFER to CHARPOS, which corresponds to byte
|
47942
|
2008 position BYTEPOS. If the target position is
|
20557
|
2009 before an intangible character, move to an ok place. */
|
|
2010
|
|
2011 void
|
|
2012 set_point_both (buffer, charpos, bytepos)
|
|
2013 register struct buffer *buffer;
|
20936
|
2014 register int charpos, bytepos;
|
1157
|
2015 {
|
25747
|
2016 register INTERVAL to, from, toprev, fromprev;
|
1157
|
2017 int buffer_point;
|
10313
|
2018 int old_position = BUF_PT (buffer);
|
20557
|
2019 int backwards = (charpos < old_position ? 1 : 0);
|
16680
|
2020 int have_overlays;
|
|
2021 int original_position;
|
1157
|
2022
|
10563
|
2023 buffer->point_before_scroll = Qnil;
|
|
2024
|
20557
|
2025 if (charpos == BUF_PT (buffer))
|
1157
|
2026 return;
|
|
2027
|
20557
|
2028 /* In a single-byte buffer, the two positions must be equal. */
|
|
2029 if (BUF_ZV (buffer) == BUF_ZV_BYTE (buffer)
|
|
2030 && charpos != bytepos)
|
|
2031 abort ();
|
|
2032
|
2779
|
2033 /* Check this now, before checking if the buffer has any intervals.
|
|
2034 That way, we can catch conditions which break this sanity check
|
|
2035 whether or not there are intervals in the buffer. */
|
20557
|
2036 if (charpos > BUF_ZV (buffer) || charpos < BUF_BEGV (buffer))
|
2779
|
2037 abort ();
|
|
2038
|
51836
483cd3e6154f
(set_point_both): Use new type for overlays_(before|after).
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
2039 have_overlays = (buffer->overlays_before || buffer->overlays_after);
|
16680
|
2040
|
|
2041 /* If we have no text properties and overlays,
|
|
2042 then we can do it quickly. */
|
|
2043 if (NULL_INTERVAL_P (BUF_INTERVALS (buffer)) && ! have_overlays)
|
1157
|
2044 {
|
20557
|
2045 temp_set_point_both (buffer, charpos, bytepos);
|
1157
|
2046 return;
|
|
2047 }
|
|
2048
|
20557
|
2049 /* Set TO to the interval containing the char after CHARPOS,
|
|
2050 and TOPREV to the interval containing the char before CHARPOS.
|
1964
|
2051 Either one may be null. They may be equal. */
|
20557
|
2052 to = find_interval (BUF_INTERVALS (buffer), charpos);
|
|
2053 if (charpos == BUF_BEGV (buffer))
|
2052
|
2054 toprev = 0;
|
20557
|
2055 else if (to && to->position == charpos)
|
1964
|
2056 toprev = previous_interval (to);
|
|
2057 else
|
|
2058 toprev = to;
|
1211
|
2059
|
2052
|
2060 buffer_point = (BUF_PT (buffer) == BUF_ZV (buffer)
|
|
2061 ? BUF_ZV (buffer) - 1
|
1964
|
2062 : BUF_PT (buffer));
|
|
2063
|
|
2064 /* Set FROM to the interval containing the char after PT,
|
|
2065 and FROMPREV to the interval containing the char before PT.
|
|
2066 Either one may be null. They may be equal. */
|
4383
|
2067 /* We could cache this and save time. */
|
10313
|
2068 from = find_interval (BUF_INTERVALS (buffer), buffer_point);
|
4383
|
2069 if (buffer_point == BUF_BEGV (buffer))
|
2052
|
2070 fromprev = 0;
|
16680
|
2071 else if (from && from->position == BUF_PT (buffer))
|
1964
|
2072 fromprev = previous_interval (from);
|
|
2073 else if (buffer_point != BUF_PT (buffer))
|
|
2074 fromprev = from, from = 0;
|
|
2075 else
|
|
2076 fromprev = from;
|
1157
|
2077
|
4383
|
2078 /* Moving within an interval. */
|
16680
|
2079 if (to == from && toprev == fromprev && INTERVAL_VISIBLE_P (to)
|
|
2080 && ! have_overlays)
|
1157
|
2081 {
|
20557
|
2082 temp_set_point_both (buffer, charpos, bytepos);
|
1157
|
2083 return;
|
|
2084 }
|
|
2085
|
20557
|
2086 original_position = charpos;
|
16680
|
2087
|
11327
|
2088 /* If the new position is between two intangible characters
|
|
2089 with the same intangible property value,
|
|
2090 move forward or backward until a change in that property. */
|
16680
|
2091 if (NILP (Vinhibit_point_motion_hooks)
|
|
2092 && ((! NULL_INTERVAL_P (to) && ! NULL_INTERVAL_P (toprev))
|
16716
|
2093 || have_overlays)
|
|
2094 /* Intangibility never stops us from positioning at the beginning
|
|
2095 or end of the buffer, so don't bother checking in that case. */
|
20557
|
2096 && charpos != BEGV && charpos != ZV)
|
1157
|
2097 {
|
16680
|
2098 Lisp_Object pos;
|
43898
|
2099 Lisp_Object intangible_propval;
|
16680
|
2100
|
9072
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2101 if (backwards)
|
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2102 {
|
50656
|
2103 /* If the preceding character is both intangible and invisible,
|
43898
|
2104 and the invisible property is `rear-sticky', perturb it so
|
|
2105 that the search starts one character earlier -- this ensures
|
|
2106 that point can never move to the end of an invisible/
|
|
2107 intangible/rear-sticky region. */
|
|
2108 charpos = adjust_for_invis_intang (charpos, -1, -1, 1);
|
42365
|
2109
|
43898
|
2110 XSETINT (pos, charpos);
|
11327
|
2111
|
|
2112 /* If following char is intangible,
|
|
2113 skip back over all chars with matching intangible property. */
|
42365
|
2114
|
|
2115 intangible_propval = Fget_char_property (pos, Qintangible, Qnil);
|
|
2116
|
11327
|
2117 if (! NILP (intangible_propval))
|
42365
|
2118 {
|
|
2119 while (XINT (pos) > BUF_BEGV (buffer)
|
|
2120 && EQ (Fget_char_property (make_number (XINT (pos) - 1),
|
|
2121 Qintangible, Qnil),
|
|
2122 intangible_propval))
|
|
2123 pos = Fprevious_char_property_change (pos, Qnil);
|
43898
|
2124
|
|
2125 /* Set CHARPOS from POS, and if the final intangible character
|
|
2126 that we skipped over is also invisible, and the invisible
|
|
2127 property is `front-sticky', perturb it to be one character
|
|
2128 earlier -- this ensures that point can never move to the
|
|
2129 beginning of an invisible/intangible/front-sticky region. */
|
|
2130 charpos = adjust_for_invis_intang (XINT (pos), 0, -1, 0);
|
42365
|
2131 }
|
9072
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2132 }
|
3734
|
2133 else
|
9072
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2134 {
|
43898
|
2135 /* If the following character is both intangible and invisible,
|
|
2136 and the invisible property is `front-sticky', perturb it so
|
|
2137 that the search starts one character later -- this ensures
|
|
2138 that point can never move to the beginning of an
|
|
2139 invisible/intangible/front-sticky region. */
|
|
2140 charpos = adjust_for_invis_intang (charpos, 0, 1, 1);
|
|
2141
|
|
2142 XSETINT (pos, charpos);
|
|
2143
|
42365
|
2144 /* If preceding char is intangible,
|
|
2145 skip forward over all chars with matching intangible property. */
|
|
2146
|
20557
|
2147 intangible_propval = Fget_char_property (make_number (charpos - 1),
|
16680
|
2148 Qintangible, Qnil);
|
11327
|
2149
|
|
2150 if (! NILP (intangible_propval))
|
42365
|
2151 {
|
|
2152 while (XINT (pos) < BUF_ZV (buffer)
|
|
2153 && EQ (Fget_char_property (pos, Qintangible, Qnil),
|
|
2154 intangible_propval))
|
|
2155 pos = Fnext_char_property_change (pos, Qnil);
|
|
2156
|
43898
|
2157 /* Set CHARPOS from POS, and if the final intangible character
|
|
2158 that we skipped over is also invisible, and the invisible
|
|
2159 property is `rear-sticky', perturb it to be one character
|
|
2160 later -- this ensures that point can never move to the
|
|
2161 end of an invisible/intangible/rear-sticky region. */
|
|
2162 charpos = adjust_for_invis_intang (XINT (pos), -1, 1, 0);
|
42365
|
2163 }
|
9072
21517199cfae
(set_point): If Vinhibit_point_motion_hooks, ignore intangible properties.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2164 }
|
16680
|
2165
|
20557
|
2166 bytepos = buf_charpos_to_bytepos (buffer, charpos);
|
16680
|
2167 }
|
|
2168
|
20557
|
2169 if (charpos != original_position)
|
16680
|
2170 {
|
20557
|
2171 /* Set TO to the interval containing the char after CHARPOS,
|
|
2172 and TOPREV to the interval containing the char before CHARPOS.
|
16680
|
2173 Either one may be null. They may be equal. */
|
20557
|
2174 to = find_interval (BUF_INTERVALS (buffer), charpos);
|
|
2175 if (charpos == BUF_BEGV (buffer))
|
16680
|
2176 toprev = 0;
|
20557
|
2177 else if (to && to->position == charpos)
|
16680
|
2178 toprev = previous_interval (to);
|
|
2179 else
|
|
2180 toprev = to;
|
1157
|
2181 }
|
1964
|
2182
|
11327
|
2183 /* Here TO is the interval after the stopping point
|
|
2184 and TOPREV is the interval before the stopping point.
|
|
2185 One or the other may be null. */
|
|
2186
|
20557
|
2187 temp_set_point_both (buffer, charpos, bytepos);
|
1157
|
2188
|
1288
|
2189 /* We run point-left and point-entered hooks here, iff the
|
|
2190 two intervals are not equivalent. These hooks take
|
1964
|
2191 (old_point, new_point) as arguments. */
|
4243
|
2192 if (NILP (Vinhibit_point_motion_hooks)
|
|
2193 && (! intervals_equal (from, to)
|
|
2194 || ! intervals_equal (fromprev, toprev)))
|
1211
|
2195 {
|
1964
|
2196 Lisp_Object leave_after, leave_before, enter_after, enter_before;
|
|
2197
|
|
2198 if (fromprev)
|
|
2199 leave_after = textget (fromprev->plist, Qpoint_left);
|
|
2200 else
|
|
2201 leave_after = Qnil;
|
|
2202 if (from)
|
|
2203 leave_before = textget (from->plist, Qpoint_left);
|
|
2204 else
|
|
2205 leave_before = Qnil;
|
1211
|
2206
|
1964
|
2207 if (toprev)
|
|
2208 enter_after = textget (toprev->plist, Qpoint_entered);
|
|
2209 else
|
|
2210 enter_after = Qnil;
|
|
2211 if (to)
|
|
2212 enter_before = textget (to->plist, Qpoint_entered);
|
|
2213 else
|
|
2214 enter_before = Qnil;
|
1211
|
2215
|
1964
|
2216 if (! EQ (leave_before, enter_before) && !NILP (leave_before))
|
18743
|
2217 call2 (leave_before, make_number (old_position),
|
20557
|
2218 make_number (charpos));
|
1964
|
2219 if (! EQ (leave_after, enter_after) && !NILP (leave_after))
|
18743
|
2220 call2 (leave_after, make_number (old_position),
|
20557
|
2221 make_number (charpos));
|
1964
|
2222
|
|
2223 if (! EQ (enter_before, leave_before) && !NILP (enter_before))
|
18743
|
2224 call2 (enter_before, make_number (old_position),
|
20557
|
2225 make_number (charpos));
|
1964
|
2226 if (! EQ (enter_after, leave_after) && !NILP (enter_after))
|
18743
|
2227 call2 (enter_after, make_number (old_position),
|
20557
|
2228 make_number (charpos));
|
1211
|
2229 }
|
1157
|
2230 }
|
2052
|
2231
|
18076
|
2232 /* Move point to POSITION, unless POSITION is inside an intangible
|
|
2233 segment that reaches all the way to point. */
|
|
2234
|
|
2235 void
|
|
2236 move_if_not_intangible (position)
|
|
2237 int position;
|
|
2238 {
|
|
2239 Lisp_Object pos;
|
|
2240 Lisp_Object intangible_propval;
|
|
2241
|
|
2242 XSETINT (pos, position);
|
|
2243
|
|
2244 if (! NILP (Vinhibit_point_motion_hooks))
|
|
2245 /* If intangible is inhibited, always move point to POSITION. */
|
|
2246 ;
|
18613
|
2247 else if (PT < position && XINT (pos) < ZV)
|
18076
|
2248 {
|
|
2249 /* We want to move forward, so check the text before POSITION. */
|
|
2250
|
|
2251 intangible_propval = Fget_char_property (pos,
|
|
2252 Qintangible, Qnil);
|
|
2253
|
|
2254 /* If following char is intangible,
|
|
2255 skip back over all chars with matching intangible property. */
|
|
2256 if (! NILP (intangible_propval))
|
|
2257 while (XINT (pos) > BEGV
|
|
2258 && EQ (Fget_char_property (make_number (XINT (pos) - 1),
|
|
2259 Qintangible, Qnil),
|
|
2260 intangible_propval))
|
|
2261 pos = Fprevious_char_property_change (pos, Qnil);
|
|
2262 }
|
18613
|
2263 else if (XINT (pos) > BEGV)
|
18076
|
2264 {
|
|
2265 /* We want to move backward, so check the text after POSITION. */
|
|
2266
|
|
2267 intangible_propval = Fget_char_property (make_number (XINT (pos) - 1),
|
|
2268 Qintangible, Qnil);
|
|
2269
|
|
2270 /* If following char is intangible,
|
24910
|
2271 skip forward over all chars with matching intangible property. */
|
18076
|
2272 if (! NILP (intangible_propval))
|
|
2273 while (XINT (pos) < ZV
|
|
2274 && EQ (Fget_char_property (pos, Qintangible, Qnil),
|
|
2275 intangible_propval))
|
|
2276 pos = Fnext_char_property_change (pos, Qnil);
|
|
2277
|
|
2278 }
|
56693
d66d7e7354e3
(move_if_not_intangible): Force POSITION to be between BEGV and ZV.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2279 else if (position < BEGV)
|
d66d7e7354e3
(move_if_not_intangible): Force POSITION to be between BEGV and ZV.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2280 position = BEGV;
|
d66d7e7354e3
(move_if_not_intangible): Force POSITION to be between BEGV and ZV.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2281 else if (position > ZV)
|
d66d7e7354e3
(move_if_not_intangible): Force POSITION to be between BEGV and ZV.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2282 position = ZV;
|
18076
|
2283
|
47942
|
2284 /* If the whole stretch between PT and POSITION isn't intangible,
|
18076
|
2285 try moving to POSITION (which means we actually move farther
|
|
2286 if POSITION is inside of intangible text). */
|
|
2287
|
|
2288 if (XINT (pos) != PT)
|
|
2289 SET_PT (position);
|
|
2290 }
|
|
2291
|
26862
|
2292 /* If text at position POS has property PROP, set *VAL to the property
|
|
2293 value, *START and *END to the beginning and end of a region that
|
|
2294 has the same property, and return 1. Otherwise return 0.
|
|
2295
|
|
2296 OBJECT is the string or buffer to look for the property in;
|
|
2297 nil means the current buffer. */
|
|
2298
|
|
2299 int
|
|
2300 get_property_and_range (pos, prop, val, start, end, object)
|
|
2301 int pos;
|
|
2302 Lisp_Object prop, *val;
|
|
2303 int *start, *end;
|
|
2304 Lisp_Object object;
|
|
2305 {
|
|
2306 INTERVAL i, prev, next;
|
|
2307
|
|
2308 if (NILP (object))
|
|
2309 i = find_interval (BUF_INTERVALS (current_buffer), pos);
|
|
2310 else if (BUFFERP (object))
|
|
2311 i = find_interval (BUF_INTERVALS (XBUFFER (object)), pos);
|
|
2312 else if (STRINGP (object))
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
2313 i = find_interval (STRING_INTERVALS (object), pos);
|
26862
|
2314 else
|
|
2315 abort ();
|
|
2316
|
|
2317 if (NULL_INTERVAL_P (i) || (i->position + LENGTH (i) <= pos))
|
|
2318 return 0;
|
|
2319 *val = textget (i->plist, prop);
|
|
2320 if (NILP (*val))
|
|
2321 return 0;
|
|
2322
|
|
2323 next = i; /* remember it in advance */
|
|
2324 prev = previous_interval (i);
|
|
2325 while (! NULL_INTERVAL_P (prev)
|
|
2326 && EQ (*val, textget (prev->plist, prop)))
|
|
2327 i = prev, prev = previous_interval (prev);
|
|
2328 *start = i->position;
|
|
2329
|
|
2330 next = next_interval (i);
|
47942
|
2331 while (! NULL_INTERVAL_P (next)
|
26862
|
2332 && EQ (*val, textget (next->plist, prop)))
|
|
2333 i = next, next = next_interval (next);
|
|
2334 *end = i->position + LENGTH (i);
|
|
2335
|
|
2336 return 1;
|
|
2337 }
|
|
2338
|
35256
|
2339 /* Return the proper local keymap TYPE for position POSITION in
|
|
2340 BUFFER; TYPE should be one of `keymap' or `local-map'. Use the map
|
|
2341 specified by the PROP property, if any. Otherwise, if TYPE is
|
|
2342 `local-map' use BUFFER's local map. */
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2343
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2344 Lisp_Object
|
29278
|
2345 get_local_map (position, buffer, type)
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2346 register int position;
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2347 register struct buffer *buffer;
|
35256
|
2348 Lisp_Object type;
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2349 {
|
34959
|
2350 Lisp_Object prop, lispy_position, lispy_buffer;
|
20557
|
2351 int old_begv, old_zv, old_begv_byte, old_zv_byte;
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2352
|
4383
|
2353 /* 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>
diff
changeset
|
2354 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>
diff
changeset
|
2355 abort ();
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2356
|
11660
|
2357 /* Ignore narrowing, so that a local map continues to be valid even if
|
|
2358 the visible region contains no characters and hence no properties. */
|
|
2359 old_begv = BUF_BEGV (buffer);
|
|
2360 old_zv = BUF_ZV (buffer);
|
20557
|
2361 old_begv_byte = BUF_BEGV_BYTE (buffer);
|
|
2362 old_zv_byte = BUF_ZV_BYTE (buffer);
|
11660
|
2363 BUF_BEGV (buffer) = BUF_BEG (buffer);
|
|
2364 BUF_ZV (buffer) = BUF_Z (buffer);
|
20557
|
2365 BUF_BEGV_BYTE (buffer) = BUF_BEG_BYTE (buffer);
|
|
2366 BUF_ZV_BYTE (buffer) = BUF_Z_BYTE (buffer);
|
11660
|
2367
|
|
2368 XSETFASTINT (lispy_position, position);
|
|
2369 XSETBUFFER (lispy_buffer, buffer);
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
2370 /* First check if the CHAR has any property. This is because when
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
2371 we click with the mouse, the mouse pointer is really pointing
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
2372 to the CHAR after POS. */
|
35256
|
2373 prop = Fget_char_property (lispy_position, type, lispy_buffer);
|
51043
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
2374 /* If not, look at the POS's properties. This is necessary because when
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
2375 editing a field with a `local-map' property, we want insertion at the end
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
2376 to obey the `local-map' property. */
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
2377 if (NILP (prop))
|
ba92da4f009a
(create_root_interval, graft_intervals_into_buffer): Use BEG.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
2378 prop = get_pos_property (lispy_position, type, lispy_buffer);
|
11660
|
2379
|
|
2380 BUF_BEGV (buffer) = old_begv;
|
|
2381 BUF_ZV (buffer) = old_zv;
|
20557
|
2382 BUF_BEGV_BYTE (buffer) = old_begv_byte;
|
|
2383 BUF_ZV_BYTE (buffer) = old_zv_byte;
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2384
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2385 /* Use the local map only if it is valid. */
|
32988
|
2386 prop = get_keymap (prop, 0, 0);
|
|
2387 if (CONSP (prop))
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2388 return prop;
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2389
|
35256
|
2390 if (EQ (type, Qkeymap))
|
29278
|
2391 return Qnil;
|
|
2392 else
|
|
2393 return buffer->keymap;
|
2090
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2394 }
|
c7e1308a7184
(set_point): Check invisibility of following character, not previous character.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2395
|
1211
|
2396 /* Produce an interval tree reflecting the intervals in
|
22343
|
2397 TREE from START to START + LENGTH.
|
|
2398 The new interval tree has no parent and has a starting-position of 0. */
|
1157
|
2399
|
1316
|
2400 INTERVAL
|
1157
|
2401 copy_intervals (tree, start, length)
|
|
2402 INTERVAL tree;
|
|
2403 int start, length;
|
|
2404 {
|
|
2405 register INTERVAL i, new, t;
|
3490
|
2406 register int got, prevlen;
|
1157
|
2407
|
|
2408 if (NULL_INTERVAL_P (tree) || length <= 0)
|
|
2409 return NULL_INTERVAL;
|
|
2410
|
|
2411 i = find_interval (tree, start);
|
|
2412 if (NULL_INTERVAL_P (i) || LENGTH (i) == 0)
|
|
2413 abort ();
|
|
2414
|
4383
|
2415 /* If there is only one interval and it's the default, return nil. */
|
1157
|
2416 if ((start - i->position + 1 + length) < LENGTH (i)
|
|
2417 && DEFAULT_INTERVAL_P (i))
|
|
2418 return NULL_INTERVAL;
|
|
2419
|
|
2420 new = make_interval ();
|
22343
|
2421 new->position = 0;
|
1157
|
2422 got = (LENGTH (i) - (start - i->position));
|
1211
|
2423 new->total_length = length;
|
50471
|
2424 CHECK_TOTAL_LENGTH (new);
|
1157
|
2425 copy_properties (i, new);
|
|
2426
|
|
2427 t = new;
|
3490
|
2428 prevlen = got;
|
1157
|
2429 while (got < length)
|
|
2430 {
|
|
2431 i = next_interval (i);
|
4135
|
2432 t = split_interval_right (t, prevlen);
|
1157
|
2433 copy_properties (i, t);
|
3490
|
2434 prevlen = LENGTH (i);
|
|
2435 got += prevlen;
|
1157
|
2436 }
|
|
2437
|
5415
|
2438 return balance_an_interval (new);
|
1157
|
2439 }
|
|
2440
|
4383
|
2441 /* Give STRING the properties of BUFFER from POSITION to LENGTH. */
|
1157
|
2442
|
1288
|
2443 INLINE void
|
1157
|
2444 copy_intervals_to_string (string, buffer, position, length)
|
16110
|
2445 Lisp_Object string;
|
|
2446 struct buffer *buffer;
|
1157
|
2447 int position, length;
|
|
2448 {
|
16110
|
2449 INTERVAL interval_copy = copy_intervals (BUF_INTERVALS (buffer),
|
1157
|
2450 position, length);
|
|
2451 if (NULL_INTERVAL_P (interval_copy))
|
|
2452 return;
|
|
2453
|
28269
fd13be8ae190
Changes towards better type safety regarding intervals, primarily
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
2454 SET_INTERVAL_OBJECT (interval_copy, string);
|
46380
48b292c584a6
* intervals.c (create_root_interval, balance_possible_root_interval,
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
2455 STRING_SET_INTERVALS (string, interval_copy);
|
1157
|
2456 }
|
10113
|
2457
|
22343
|
2458 /* Return 1 if strings S1 and S2 have identical properties; 0 otherwise.
|
10113
|
2459 Assume they have identical characters. */
|
|
2460
|
|
2461 int
|
|
2462 compare_string_intervals (s1, s2)
|
|
2463 Lisp_Object s1, s2;
|
|
2464 {
|
|
2465 INTERVAL i1, i2;
|
22343
|
2466 int pos = 0;
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
2467 int end = SCHARS (s1);
|
10113
|
2468
|
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
2469 i1 = find_interval (STRING_INTERVALS (s1), 0);
|
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
diff
changeset
|
2470 i2 = find_interval (STRING_INTERVALS (s2), 0);
|
10113
|
2471
|
|
2472 while (pos < end)
|
|
2473 {
|
|
2474 /* Determine how far we can go before we reach the end of I1 or I2. */
|
|
2475 int len1 = (i1 != 0 ? INTERVAL_LAST_POS (i1) : end) - pos;
|
|
2476 int len2 = (i2 != 0 ? INTERVAL_LAST_POS (i2) : end) - pos;
|
|
2477 int distance = min (len1, len2);
|
|
2478
|
|
2479 /* If we ever find a mismatch between the strings,
|
|
2480 they differ. */
|
|
2481 if (! intervals_equal (i1, i2))
|
|
2482 return 0;
|
|
2483
|
|
2484 /* Advance POS till the end of the shorter interval,
|
|
2485 and advance one or both interval pointers for the new position. */
|
|
2486 pos += distance;
|
|
2487 if (len1 == distance)
|
|
2488 i1 = next_interval (i1);
|
|
2489 if (len2 == distance)
|
|
2490 i2 = next_interval (i2);
|
|
2491 }
|
|
2492 return 1;
|
|
2493 }
|
20677
|
2494
|
|
2495 /* Recursively adjust interval I in the current buffer
|
|
2496 for setting enable_multibyte_characters to MULTI_FLAG.
|
|
2497 The range of interval I is START ... END in characters,
|
|
2498 START_BYTE ... END_BYTE in bytes. */
|
|
2499
|
|
2500 static void
|
|
2501 set_intervals_multibyte_1 (i, multi_flag, start, start_byte, end, end_byte)
|
|
2502 INTERVAL i;
|
|
2503 int multi_flag;
|
|
2504 int start, start_byte, end, end_byte;
|
|
2505 {
|
|
2506 /* Fix the length of this interval. */
|
|
2507 if (multi_flag)
|
|
2508 i->total_length = end - start;
|
|
2509 else
|
|
2510 i->total_length = end_byte - start_byte;
|
50471
|
2511 CHECK_TOTAL_LENGTH (i);
|
|
2512
|
|
2513 if (TOTAL_LENGTH (i) == 0)
|
|
2514 {
|
|
2515 delete_interval (i);
|
|
2516 return;
|
|
2517 }
|
20677
|
2518
|
|
2519 /* Recursively fix the length of the subintervals. */
|
|
2520 if (i->left)
|
|
2521 {
|
|
2522 int left_end, left_end_byte;
|
|
2523
|
|
2524 if (multi_flag)
|
|
2525 {
|
50471
|
2526 int temp;
|
20677
|
2527 left_end_byte = start_byte + LEFT_TOTAL_LENGTH (i);
|
|
2528 left_end = BYTE_TO_CHAR (left_end_byte);
|
50471
|
2529
|
|
2530 temp = CHAR_TO_BYTE (left_end);
|
|
2531
|
|
2532 /* If LEFT_END_BYTE is in the middle of a character,
|
|
2533 adjust it and LEFT_END to a char boundary. */
|
|
2534 if (left_end_byte > temp)
|
|
2535 {
|
|
2536 left_end_byte = temp;
|
|
2537 }
|
|
2538 if (left_end_byte < temp)
|
|
2539 {
|
|
2540 left_end--;
|
|
2541 left_end_byte = CHAR_TO_BYTE (left_end);
|
|
2542 }
|
20677
|
2543 }
|
|
2544 else
|
|
2545 {
|
|
2546 left_end = start + LEFT_TOTAL_LENGTH (i);
|
|
2547 left_end_byte = CHAR_TO_BYTE (left_end);
|
|
2548 }
|
|
2549
|
|
2550 set_intervals_multibyte_1 (i->left, multi_flag, start, start_byte,
|
|
2551 left_end, left_end_byte);
|
|
2552 }
|
|
2553 if (i->right)
|
|
2554 {
|
|
2555 int right_start_byte, right_start;
|
|
2556
|
|
2557 if (multi_flag)
|
|
2558 {
|
50471
|
2559 int temp;
|
|
2560
|
20677
|
2561 right_start_byte = end_byte - RIGHT_TOTAL_LENGTH (i);
|
|
2562 right_start = BYTE_TO_CHAR (right_start_byte);
|
50471
|
2563
|
|
2564 /* If RIGHT_START_BYTE is in the middle of a character,
|
|
2565 adjust it and RIGHT_START to a char boundary. */
|
|
2566 temp = CHAR_TO_BYTE (right_start);
|
|
2567
|
|
2568 if (right_start_byte < temp)
|
|
2569 {
|
|
2570 right_start_byte = temp;
|
|
2571 }
|
|
2572 if (right_start_byte > temp)
|
|
2573 {
|
|
2574 right_start++;
|
|
2575 right_start_byte = CHAR_TO_BYTE (right_start);
|
|
2576 }
|
20677
|
2577 }
|
|
2578 else
|
|
2579 {
|
|
2580 right_start = end - RIGHT_TOTAL_LENGTH (i);
|
|
2581 right_start_byte = CHAR_TO_BYTE (right_start);
|
|
2582 }
|
|
2583
|
|
2584 set_intervals_multibyte_1 (i->right, multi_flag,
|
|
2585 right_start, right_start_byte,
|
|
2586 end, end_byte);
|
|
2587 }
|
50471
|
2588
|
|
2589 /* Rounding to char boundaries can theoretically ake this interval
|
|
2590 spurious. If so, delete one child, and copy its property list
|
|
2591 to this interval. */
|
|
2592 if (LEFT_TOTAL_LENGTH (i) + RIGHT_TOTAL_LENGTH (i) >= TOTAL_LENGTH (i))
|
|
2593 {
|
|
2594 if ((i)->left)
|
|
2595 {
|
|
2596 (i)->plist = (i)->left->plist;
|
|
2597 (i)->left->total_length = 0;
|
|
2598 delete_interval ((i)->left);
|
|
2599 }
|
|
2600 else
|
|
2601 {
|
|
2602 (i)->plist = (i)->right->plist;
|
|
2603 (i)->right->total_length = 0;
|
|
2604 delete_interval ((i)->right);
|
|
2605 }
|
|
2606 }
|
20677
|
2607 }
|
1301
|
2608
|
21351
78203467fc7d
(set_intervals_multibyte): Function moved after set_intervals_multibyte_1.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2609 /* Update the intervals of the current buffer
|
78203467fc7d
(set_intervals_multibyte): Function moved after set_intervals_multibyte_1.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2610 to fit the contents as multibyte (if MULTI_FLAG is 1)
|
78203467fc7d
(set_intervals_multibyte): Function moved after set_intervals_multibyte_1.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2611 or to fit them as non-multibyte (if MULTI_FLAG is 0). */
|
78203467fc7d
(set_intervals_multibyte): Function moved after set_intervals_multibyte_1.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2612
|
78203467fc7d
(set_intervals_multibyte): Function moved after set_intervals_multibyte_1.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2613 void
|
78203467fc7d
(set_intervals_multibyte): Function moved after set_intervals_multibyte_1.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2614 set_intervals_multibyte (multi_flag)
|
78203467fc7d
(set_intervals_multibyte): Function moved after set_intervals_multibyte_1.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2615 int multi_flag;
|
78203467fc7d
(set_intervals_multibyte): Function moved after set_intervals_multibyte_1.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2616 {
|
78203467fc7d
(set_intervals_multibyte): Function moved after set_intervals_multibyte_1.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2617 if (BUF_INTERVALS (current_buffer))
|
78203467fc7d
(set_intervals_multibyte): Function moved after set_intervals_multibyte_1.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2618 set_intervals_multibyte_1 (BUF_INTERVALS (current_buffer), multi_flag,
|
78203467fc7d
(set_intervals_multibyte): Function moved after set_intervals_multibyte_1.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2619 BEG, BEG_BYTE, Z, Z_BYTE);
|
78203467fc7d
(set_intervals_multibyte): Function moved after set_intervals_multibyte_1.
Richard M. Stallman <rms@gnu.org>
diff
changeset
|
2620 }
|
52401
|
2621
|
|
2622 /* arch-tag: 3d402b60-083c-4271-b4a3-ebd9a74bfe27
|
|
2623 (do not change this comment) */
|