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