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