annotate src/intervals.c @ 21979:ce6e1fa2fefc

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