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