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