Mercurial > hg > xemacs-beta
annotate src/fns.c @ 5306:cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* fns.c (bignum_butlast): New.
(Fnbutlast, Fbutlast): Use it.
In #'butlast and #'nbutlast, if N is a bignum, we should always
return nil. Bug revealed by Paul Dietz' test suite, thank you
Paul.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 17 Nov 2010 14:37:26 +0000 |
| parents | 4c4085177ca5 |
| children | c096d8051f89 |
| rev | line source |
|---|---|
| 428 | 1 /* Random utility Lisp functions. |
| 2 Copyright (C) 1985, 86, 87, 93, 94, 95 Free Software Foundation, Inc. | |
|
5000
44d7bde26046
fix compile errors, fix revert-buffer bug on binary/Latin 1 files, Mule-ize some files
Ben Wing <ben@xemacs.org>
parents:
4966
diff
changeset
|
3 Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003, 2010 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Mule 2.0, FSF 19.30. */ | |
| 23 | |
| 24 /* This file has been Mule-ized. */ | |
| 25 | |
| 26 /* Note: FSF 19.30 has bool vectors. We have bit vectors. */ | |
| 27 | |
| 28 /* Hacked on for Mule by Ben Wing, December 1994, January 1995. */ | |
| 29 | |
| 30 #include <config.h> | |
| 31 | |
| 32 /* Note on some machines this defines `vector' as a typedef, | |
| 33 so make sure we don't use that name in this file. */ | |
| 34 #undef vector | |
| 35 #define vector ***** | |
| 36 | |
| 37 #include "lisp.h" | |
| 38 | |
| 442 | 39 #include "sysfile.h" |
| 771 | 40 #include "sysproc.h" /* for qxe_getpid() */ |
| 428 | 41 |
| 42 #include "buffer.h" | |
| 43 #include "bytecode.h" | |
| 44 #include "device.h" | |
| 45 #include "events.h" | |
| 46 #include "extents.h" | |
| 47 #include "frame.h" | |
| 872 | 48 #include "process.h" |
| 428 | 49 #include "systime.h" |
| 50 #include "insdel.h" | |
| 51 #include "lstream.h" | |
| 52 #include "opaque.h" | |
| 53 | |
| 54 /* NOTE: This symbol is also used in lread.c */ | |
| 55 #define FEATUREP_SYNTAX | |
| 56 | |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
57 Lisp_Object Qstring_lessp, Qsort, Qmerge, Qfill, Qreplace; |
| 428 | 58 Lisp_Object Qidentity; |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
59 Lisp_Object Qvector, Qarray, Qbit_vector, QsortX, Q_from_end, Q_initial_value; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
60 Lisp_Object Qmapconcat, QmapcarX, Qmapvector, Qmapcan, Qmapc, Qmap, Qmap_into; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
61 Lisp_Object Qsome, Qevery, Qmaplist, Qmapl, Qmapcon, Qreduce; |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
62 Lisp_Object Q_start1, Q_start2, Q_end1, Q_end2; |
| 428 | 63 |
| 563 | 64 Lisp_Object Qbase64_conversion_error; |
| 65 | |
| 771 | 66 Lisp_Object Vpath_separator; |
| 67 | |
| 428 | 68 static int internal_old_equal (Lisp_Object, Lisp_Object, int); |
| 454 | 69 Lisp_Object safe_copy_tree (Lisp_Object arg, Lisp_Object vecp, int depth); |
| 428 | 70 |
|
5241
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
71 static DOESNT_RETURN |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
72 mapping_interaction_error (Lisp_Object func, Lisp_Object object) |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
73 { |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
74 invalid_state_2 ("object modified while traversing it", func, object); |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
75 } |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
76 |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
77 static void |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
78 check_sequence_range (Lisp_Object sequence, Lisp_Object start, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
79 Lisp_Object end, Lisp_Object length) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
80 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
81 Elemcount starting = XINT (start), ending, len = XINT (length); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
82 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
83 ending = NILP (end) ? XINT (length) : XINT (end); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
84 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
85 if (!(0 <= starting && starting <= ending && ending <= len)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
86 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
87 args_out_of_range_3 (sequence, start, make_int (ending)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
88 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
89 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
90 |
| 428 | 91 static Lisp_Object |
| 2286 | 92 mark_bit_vector (Lisp_Object UNUSED (obj)) |
| 428 | 93 { |
| 94 return Qnil; | |
| 95 } | |
| 96 | |
| 97 static void | |
| 2286 | 98 print_bit_vector (Lisp_Object obj, Lisp_Object printcharfun, |
| 99 int UNUSED (escapeflag)) | |
| 428 | 100 { |
| 665 | 101 Elemcount i; |
| 440 | 102 Lisp_Bit_Vector *v = XBIT_VECTOR (obj); |
| 665 | 103 Elemcount len = bit_vector_length (v); |
| 104 Elemcount last = len; | |
| 428 | 105 |
| 106 if (INTP (Vprint_length)) | |
| 107 last = min (len, XINT (Vprint_length)); | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
108 write_ascstring (printcharfun, "#*"); |
| 428 | 109 for (i = 0; i < last; i++) |
| 110 { | |
| 111 if (bit_vector_bit (v, i)) | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
112 write_ascstring (printcharfun, "1"); |
| 428 | 113 else |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
114 write_ascstring (printcharfun, "0"); |
| 428 | 115 } |
| 116 | |
| 117 if (last != len) | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
118 write_ascstring (printcharfun, "..."); |
| 428 | 119 } |
| 120 | |
| 121 static int | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
122 bit_vector_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth), |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
123 int UNUSED (foldcase)) |
| 428 | 124 { |
| 440 | 125 Lisp_Bit_Vector *v1 = XBIT_VECTOR (obj1); |
| 126 Lisp_Bit_Vector *v2 = XBIT_VECTOR (obj2); | |
| 428 | 127 |
| 128 return ((bit_vector_length (v1) == bit_vector_length (v2)) && | |
| 129 !memcmp (v1->bits, v2->bits, | |
| 130 BIT_VECTOR_LONG_STORAGE (bit_vector_length (v1)) * | |
| 131 sizeof (long))); | |
| 132 } | |
| 133 | |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
134 /* This needs to be algorithmically identical to internal_array_hash in |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
135 elhash.c when equalp is one, so arrays and bit vectors with the same |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
136 contents hash the same. It would be possible to enforce this by giving |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
137 internal_ARRAYLIKE_hash its own file and including it twice, but right |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
138 now that doesn't seem worth it. */ |
| 665 | 139 static Hashcode |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
140 internal_bit_vector_equalp_hash (Lisp_Bit_Vector *v) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
141 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
142 int ii, size = bit_vector_length (v); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
143 Hashcode hash = 0; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
144 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
145 if (size <= 5) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
146 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
147 for (ii = 0; ii < size; ii++) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
148 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
149 hash = HASH2 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
150 (hash, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
151 FLOAT_HASHCODE_FROM_DOUBLE ((double) (bit_vector_bit (v, ii)))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
152 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
153 return hash; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
154 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
155 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
156 /* just pick five elements scattered throughout the array. |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
157 A slightly better approach would be to offset by some |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
158 noise factor from the points chosen below. */ |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
159 for (ii = 0; ii < 5; ii++) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
160 hash = HASH2 (hash, |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
161 FLOAT_HASHCODE_FROM_DOUBLE |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
162 ((double) (bit_vector_bit (v, ii * size / 5)))); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
163 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
164 return hash; |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
165 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
166 |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
167 static Hashcode |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
168 bit_vector_hash (Lisp_Object obj, int UNUSED (depth), Boolint equalp) |
| 428 | 169 { |
| 440 | 170 Lisp_Bit_Vector *v = XBIT_VECTOR (obj); |
|
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
171 if (equalp) |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
172 { |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
173 return HASH2 (bit_vector_length (v), |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
174 internal_bit_vector_equalp_hash (v)); |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
175 } |
|
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5187
diff
changeset
|
176 |
| 428 | 177 return HASH2 (bit_vector_length (v), |
| 178 memory_hash (v->bits, | |
| 179 BIT_VECTOR_LONG_STORAGE (bit_vector_length (v)) * | |
| 180 sizeof (long))); | |
| 181 } | |
| 182 | |
| 665 | 183 static Bytecount |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
184 size_bit_vector (Lisp_Object obj) |
| 442 | 185 { |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
186 Lisp_Bit_Vector *v = XBIT_VECTOR (obj); |
| 456 | 187 return FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_Bit_Vector, unsigned long, bits, |
| 442 | 188 BIT_VECTOR_LONG_STORAGE (bit_vector_length (v))); |
| 189 } | |
| 190 | |
| 1204 | 191 static const struct memory_description bit_vector_description[] = { |
| 428 | 192 { XD_END } |
| 193 }; | |
| 194 | |
| 195 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
196 DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT ("bit-vector", bit_vector, |
|
5124
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
197 mark_bit_vector, |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
198 print_bit_vector, 0, |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
199 bit_vector_equal, |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
200 bit_vector_hash, |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
201 bit_vector_description, |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
202 size_bit_vector, |
|
623d57b7fbe8
separate regular and disksave finalization, print method fixes.
Ben Wing <ben@xemacs.org>
parents:
5118
diff
changeset
|
203 Lisp_Bit_Vector); |
| 934 | 204 |
| 428 | 205 |
| 206 DEFUN ("identity", Fidentity, 1, 1, 0, /* | |
| 207 Return the argument unchanged. | |
| 208 */ | |
| 209 (arg)) | |
| 210 { | |
| 211 return arg; | |
| 212 } | |
| 213 | |
| 214 DEFUN ("random", Frandom, 0, 1, 0, /* | |
| 215 Return a pseudo-random number. | |
| 1983 | 216 All fixnums are equally likely. On most systems, this is 31 bits' worth. |
|
5302
6468cf6f0b9d
Correct argument name in docstring, #'random.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5300
diff
changeset
|
217 With positive integer argument LIMIT, return random number in interval [0, |
|
6468cf6f0b9d
Correct argument name in docstring, #'random.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5300
diff
changeset
|
218 LIMIT). LIMIT can be a bignum, in which case the range of possible values |
|
6468cf6f0b9d
Correct argument name in docstring, #'random.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5300
diff
changeset
|
219 is extended. With argument t, set the random number seed from the current |
|
6468cf6f0b9d
Correct argument name in docstring, #'random.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5300
diff
changeset
|
220 time and pid. |
| 428 | 221 */ |
| 222 (limit)) | |
| 223 { | |
| 224 EMACS_INT val; | |
| 225 unsigned long denominator; | |
| 226 | |
| 227 if (EQ (limit, Qt)) | |
| 771 | 228 seed_random (qxe_getpid () + time (NULL)); |
| 428 | 229 if (NATNUMP (limit) && !ZEROP (limit)) |
| 230 { | |
| 231 /* Try to take our random number from the higher bits of VAL, | |
| 232 not the lower, since (says Gentzel) the low bits of `random' | |
| 233 are less random than the higher ones. We do this by using the | |
| 234 quotient rather than the remainder. At the high end of the RNG | |
| 235 it's possible to get a quotient larger than limit; discarding | |
| 236 these values eliminates the bias that would otherwise appear | |
| 237 when using a large limit. */ | |
| 2039 | 238 denominator = ((unsigned long)1 << INT_VALBITS) / XINT (limit); |
| 428 | 239 do |
| 240 val = get_random () / denominator; | |
| 241 while (val >= XINT (limit)); | |
| 242 } | |
| 1983 | 243 #ifdef HAVE_BIGNUM |
| 244 else if (BIGNUMP (limit)) | |
| 245 { | |
| 246 bignum_random (scratch_bignum, XBIGNUM_DATA (limit)); | |
| 247 return Fcanonicalize_number (make_bignum_bg (scratch_bignum)); | |
| 248 } | |
| 249 #endif | |
| 428 | 250 else |
| 251 val = get_random (); | |
| 252 | |
| 253 return make_int (val); | |
| 254 } | |
| 255 | |
| 256 /* Random data-structure functions */ | |
| 257 | |
| 258 #ifdef LOSING_BYTECODE | |
| 259 | |
| 260 /* #### Delete this shit */ | |
| 261 | |
| 262 /* Charcount is a misnomer here as we might be dealing with the | |
| 263 length of a vector or list, but emphasizes that we're not dealing | |
| 264 with Bytecounts in strings */ | |
| 265 static Charcount | |
| 266 length_with_bytecode_hack (Lisp_Object seq) | |
| 267 { | |
| 268 if (!COMPILED_FUNCTIONP (seq)) | |
| 269 return XINT (Flength (seq)); | |
| 270 else | |
| 271 { | |
| 440 | 272 Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (seq); |
| 428 | 273 |
| 274 return (f->flags.interactivep ? COMPILED_INTERACTIVE : | |
| 275 f->flags.domainp ? COMPILED_DOMAIN : | |
| 276 COMPILED_DOC_STRING) | |
| 277 + 1; | |
| 278 } | |
| 279 } | |
| 280 | |
| 281 #endif /* LOSING_BYTECODE */ | |
| 282 | |
| 283 void | |
|
5000
44d7bde26046
fix compile errors, fix revert-buffer bug on binary/Latin 1 files, Mule-ize some files
Ben Wing <ben@xemacs.org>
parents:
4966
diff
changeset
|
284 check_losing_bytecode (const Ascbyte *function, Lisp_Object seq) |
| 428 | 285 { |
| 286 if (COMPILED_FUNCTIONP (seq)) | |
| 563 | 287 signal_ferror_with_frob |
| 288 (Qinvalid_argument, seq, | |
| 428 | 289 "As of 20.3, `%s' no longer works with compiled-function objects", |
| 290 function); | |
| 291 } | |
| 292 | |
| 293 DEFUN ("length", Flength, 1, 1, 0, /* | |
| 294 Return the length of vector, bit vector, list or string SEQUENCE. | |
| 295 */ | |
| 296 (sequence)) | |
| 297 { | |
| 298 retry: | |
| 299 if (STRINGP (sequence)) | |
| 826 | 300 return make_int (string_char_length (sequence)); |
| 428 | 301 else if (CONSP (sequence)) |
| 302 { | |
| 665 | 303 Elemcount len; |
| 428 | 304 GET_EXTERNAL_LIST_LENGTH (sequence, len); |
| 305 return make_int (len); | |
| 306 } | |
| 307 else if (VECTORP (sequence)) | |
| 308 return make_int (XVECTOR_LENGTH (sequence)); | |
| 309 else if (NILP (sequence)) | |
| 310 return Qzero; | |
| 311 else if (BIT_VECTORP (sequence)) | |
| 312 return make_int (bit_vector_length (XBIT_VECTOR (sequence))); | |
| 313 else | |
| 314 { | |
| 315 check_losing_bytecode ("length", sequence); | |
| 316 sequence = wrong_type_argument (Qsequencep, sequence); | |
| 317 goto retry; | |
| 318 } | |
| 319 } | |
| 320 | |
| 321 DEFUN ("safe-length", Fsafe_length, 1, 1, 0, /* | |
| 322 Return the length of a list, but avoid error or infinite loop. | |
| 323 This function never gets an error. If LIST is not really a list, | |
| 324 it returns 0. If LIST is circular, it returns a finite value | |
| 325 which is at least the number of distinct elements. | |
| 326 */ | |
| 327 (list)) | |
| 328 { | |
| 329 Lisp_Object hare, tortoise; | |
| 665 | 330 Elemcount len; |
| 428 | 331 |
| 332 for (hare = tortoise = list, len = 0; | |
| 333 CONSP (hare) && (! EQ (hare, tortoise) || len == 0); | |
| 334 hare = XCDR (hare), len++) | |
| 335 { | |
| 336 if (len & 1) | |
| 337 tortoise = XCDR (tortoise); | |
| 338 } | |
| 339 | |
| 340 return make_int (len); | |
| 341 } | |
| 342 | |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
343 /* This is almost the above, but is defined by Common Lisp. We need it in C |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
344 for shortest_length_among_sequences(), below, for the various sequence |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
345 functions that can usefully operate on circular lists. */ |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
346 |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
347 DEFUN ("list-length", Flist_length, 1, 1, 0, /* |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
348 Return the length of LIST. Return nil if LIST is circular. |
|
5299
28651c24b3f8
Error in #'list-length if LIST is dotted; check for this error with #'mapcar
Aidan Kehoe <kehoea@parhasard.net>
parents:
5285
diff
changeset
|
349 Error if LIST is dotted. |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
350 */ |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
351 (list)) |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
352 { |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
353 Lisp_Object hare, tortoise; |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
354 Elemcount len; |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
355 |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
356 for (hare = tortoise = list, len = 0; |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
357 CONSP (hare) && (! EQ (hare, tortoise) || len == 0); |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
358 hare = XCDR (hare), len++) |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
359 { |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
360 if (len & 1) |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
361 tortoise = XCDR (tortoise); |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
362 } |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
363 |
|
5299
28651c24b3f8
Error in #'list-length if LIST is dotted; check for this error with #'mapcar
Aidan Kehoe <kehoea@parhasard.net>
parents:
5285
diff
changeset
|
364 if (!LISTP (hare)) |
|
28651c24b3f8
Error in #'list-length if LIST is dotted; check for this error with #'mapcar
Aidan Kehoe <kehoea@parhasard.net>
parents:
5285
diff
changeset
|
365 { |
|
28651c24b3f8
Error in #'list-length if LIST is dotted; check for this error with #'mapcar
Aidan Kehoe <kehoea@parhasard.net>
parents:
5285
diff
changeset
|
366 signal_malformed_list_error (list); |
|
28651c24b3f8
Error in #'list-length if LIST is dotted; check for this error with #'mapcar
Aidan Kehoe <kehoea@parhasard.net>
parents:
5285
diff
changeset
|
367 } |
|
28651c24b3f8
Error in #'list-length if LIST is dotted; check for this error with #'mapcar
Aidan Kehoe <kehoea@parhasard.net>
parents:
5285
diff
changeset
|
368 |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
369 return EQ (hare, tortoise) && len != 0 ? Qnil : make_int (len); |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
370 } |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
371 |
| 428 | 372 /*** string functions. ***/ |
| 373 | |
| 374 DEFUN ("string-equal", Fstring_equal, 2, 2, 0, /* | |
| 375 Return t if two strings have identical contents. | |
| 376 Case is significant. Text properties are ignored. | |
| 377 \(Under XEmacs, `equal' also ignores text properties and extents in | |
| 378 strings, but this is not the case under FSF Emacs 19. In FSF Emacs 20 | |
| 379 `equal' is the same as in XEmacs, in that respect.) | |
| 380 Symbols are also allowed; their print names are used instead. | |
| 381 */ | |
| 444 | 382 (string1, string2)) |
| 428 | 383 { |
| 384 Bytecount len; | |
| 793 | 385 Lisp_Object p1, p2; |
| 428 | 386 |
| 444 | 387 if (SYMBOLP (string1)) |
| 388 p1 = XSYMBOL (string1)->name; | |
| 428 | 389 else |
| 390 { | |
| 444 | 391 CHECK_STRING (string1); |
| 793 | 392 p1 = string1; |
| 428 | 393 } |
| 394 | |
| 444 | 395 if (SYMBOLP (string2)) |
| 396 p2 = XSYMBOL (string2)->name; | |
| 428 | 397 else |
| 398 { | |
| 444 | 399 CHECK_STRING (string2); |
| 793 | 400 p2 = string2; |
| 428 | 401 } |
| 402 | |
| 793 | 403 return (((len = XSTRING_LENGTH (p1)) == XSTRING_LENGTH (p2)) && |
| 404 !memcmp (XSTRING_DATA (p1), XSTRING_DATA (p2), len)) ? Qt : Qnil; | |
| 428 | 405 } |
| 406 | |
| 801 | 407 DEFUN ("compare-strings", Fcompare_strings, 6, 7, 0, /* |
| 408 Compare the contents of two strings, maybe ignoring case. | |
| 409 In string STR1, skip the first START1 characters and stop at END1. | |
| 410 In string STR2, skip the first START2 characters and stop at END2. | |
|
4796
c45fdd4e1858
Don't args-out-of-range in compare-strings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4693
diff
changeset
|
411 END1 and END2 default to the full lengths of the respective strings, |
|
4797
a5eca70cf401
Fix typo in last patch.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4796
diff
changeset
|
412 and arguments that are outside the string (negative STARTi or ENDi |
|
4796
c45fdd4e1858
Don't args-out-of-range in compare-strings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4693
diff
changeset
|
413 greater than length) are coerced to 0 or string length as appropriate. |
|
c45fdd4e1858
Don't args-out-of-range in compare-strings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4693
diff
changeset
|
414 |
|
c45fdd4e1858
Don't args-out-of-range in compare-strings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4693
diff
changeset
|
415 Optional IGNORE-CASE non-nil means use case-insensitive comparison. |
|
c45fdd4e1858
Don't args-out-of-range in compare-strings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4693
diff
changeset
|
416 Case is significant by default. |
| 801 | 417 |
| 418 The value is t if the strings (or specified portions) match. | |
| 419 If string STR1 is less, the value is a negative number N; | |
| 420 - 1 - N is the number of characters that match at the beginning. | |
| 421 If string STR1 is greater, the value is a positive number N; | |
| 422 N - 1 is the number of characters that match at the beginning. | |
| 423 */ | |
| 424 (str1, start1, end1, str2, start2, end2, ignore_case)) | |
| 425 { | |
| 426 Charcount ccstart1, ccend1, ccstart2, ccend2; | |
| 427 Bytecount bstart1, blen1, bstart2, blen2; | |
| 428 Charcount matching; | |
| 429 int res; | |
| 430 | |
| 431 CHECK_STRING (str1); | |
| 432 CHECK_STRING (str2); | |
| 433 get_string_range_char (str1, start1, end1, &ccstart1, &ccend1, | |
|
4796
c45fdd4e1858
Don't args-out-of-range in compare-strings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4693
diff
changeset
|
434 GB_HISTORICAL_STRING_BEHAVIOR|GB_COERCE_RANGE); |
| 801 | 435 get_string_range_char (str2, start2, end2, &ccstart2, &ccend2, |
|
4796
c45fdd4e1858
Don't args-out-of-range in compare-strings.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4693
diff
changeset
|
436 GB_HISTORICAL_STRING_BEHAVIOR|GB_COERCE_RANGE); |
| 801 | 437 |
| 438 bstart1 = string_index_char_to_byte (str1, ccstart1); | |
| 439 blen1 = string_offset_char_to_byte_len (str1, bstart1, ccend1 - ccstart1); | |
| 440 bstart2 = string_index_char_to_byte (str2, ccstart2); | |
| 441 blen2 = string_offset_char_to_byte_len (str2, bstart2, ccend2 - ccstart2); | |
| 442 | |
| 443 res = ((NILP (ignore_case) ? qxetextcmp_matching : qxetextcasecmp_matching) | |
| 444 (XSTRING_DATA (str1) + bstart1, blen1, | |
| 445 XSTRING_DATA (str2) + bstart2, blen2, | |
| 446 &matching)); | |
| 447 | |
| 448 if (!res) | |
| 449 return Qt; | |
| 450 else if (res > 0) | |
| 451 return make_int (1 + matching); | |
| 452 else | |
| 453 return make_int (-1 - matching); | |
| 454 } | |
| 455 | |
| 428 | 456 DEFUN ("string-lessp", Fstring_lessp, 2, 2, 0, /* |
| 457 Return t if first arg string is less than second in lexicographic order. | |
| 771 | 458 Comparison is simply done on a character-by-character basis using the |
| 459 numeric value of a character. (Note that this may not produce | |
| 460 particularly meaningful results under Mule if characters from | |
| 461 different charsets are being compared.) | |
| 428 | 462 |
| 463 Symbols are also allowed; their print names are used instead. | |
| 464 | |
| 771 | 465 Currently we don't do proper language-specific collation or handle |
| 466 multiple character sets. This may be changed when Unicode support | |
| 467 is implemented. | |
| 428 | 468 */ |
| 444 | 469 (string1, string2)) |
| 428 | 470 { |
| 793 | 471 Lisp_Object p1, p2; |
| 428 | 472 Charcount end, len2; |
| 473 int i; | |
| 474 | |
| 444 | 475 if (SYMBOLP (string1)) |
| 476 p1 = XSYMBOL (string1)->name; | |
| 793 | 477 else |
| 478 { | |
| 444 | 479 CHECK_STRING (string1); |
| 793 | 480 p1 = string1; |
| 428 | 481 } |
| 482 | |
| 444 | 483 if (SYMBOLP (string2)) |
| 484 p2 = XSYMBOL (string2)->name; | |
| 428 | 485 else |
| 486 { | |
| 444 | 487 CHECK_STRING (string2); |
| 793 | 488 p2 = string2; |
| 428 | 489 } |
| 490 | |
| 826 | 491 end = string_char_length (p1); |
| 492 len2 = string_char_length (p2); | |
| 428 | 493 if (end > len2) |
| 494 end = len2; | |
| 495 | |
| 496 { | |
| 867 | 497 Ibyte *ptr1 = XSTRING_DATA (p1); |
| 498 Ibyte *ptr2 = XSTRING_DATA (p2); | |
| 428 | 499 |
| 500 /* #### It is not really necessary to do this: We could compare | |
| 501 byte-by-byte and still get a reasonable comparison, since this | |
| 502 would compare characters with a charset in the same way. With | |
| 503 a little rearrangement of the leading bytes, we could make most | |
| 504 inter-charset comparisons work out the same, too; even if some | |
| 505 don't, this is not a big deal because inter-charset comparisons | |
| 506 aren't really well-defined anyway. */ | |
| 507 for (i = 0; i < end; i++) | |
| 508 { | |
| 867 | 509 if (itext_ichar (ptr1) != itext_ichar (ptr2)) |
| 510 return itext_ichar (ptr1) < itext_ichar (ptr2) ? Qt : Qnil; | |
| 511 INC_IBYTEPTR (ptr1); | |
| 512 INC_IBYTEPTR (ptr2); | |
| 428 | 513 } |
| 514 } | |
| 515 /* Can't do i < len2 because then comparison between "foo" and "foo^@" | |
| 516 won't work right in I18N2 case */ | |
| 517 return end < len2 ? Qt : Qnil; | |
| 518 } | |
| 519 | |
| 520 DEFUN ("string-modified-tick", Fstring_modified_tick, 1, 1, 0, /* | |
| 521 Return STRING's tick counter, incremented for each change to the string. | |
| 522 Each string has a tick counter which is incremented each time the contents | |
| 523 of the string are changed (e.g. with `aset'). It wraps around occasionally. | |
| 524 */ | |
| 525 (string)) | |
| 526 { | |
| 527 CHECK_STRING (string); | |
| 793 | 528 if (CONSP (XSTRING_PLIST (string)) && INTP (XCAR (XSTRING_PLIST (string)))) |
| 529 return XCAR (XSTRING_PLIST (string)); | |
| 428 | 530 else |
| 531 return Qzero; | |
| 532 } | |
| 533 | |
| 534 void | |
| 535 bump_string_modiff (Lisp_Object str) | |
| 536 { | |
| 793 | 537 Lisp_Object *ptr = &XSTRING_PLIST (str); |
| 428 | 538 |
| 539 #ifdef I18N3 | |
| 540 /* #### remove the `string-translatable' property from the string, | |
| 541 if there is one. */ | |
| 542 #endif | |
| 543 /* skip over extent info if it's there */ | |
| 544 if (CONSP (*ptr) && EXTENT_INFOP (XCAR (*ptr))) | |
| 545 ptr = &XCDR (*ptr); | |
| 546 if (CONSP (*ptr) && INTP (XCAR (*ptr))) | |
| 793 | 547 XCAR (*ptr) = make_int (1+XINT (XCAR (*ptr))); |
| 428 | 548 else |
| 549 *ptr = Fcons (make_int (1), *ptr); | |
| 550 } | |
| 551 | |
| 552 | |
| 553 enum concat_target_type { c_cons, c_string, c_vector, c_bit_vector }; | |
| 554 static Lisp_Object concat (int nargs, Lisp_Object *args, | |
| 555 enum concat_target_type target_type, | |
| 556 int last_special); | |
| 557 | |
| 558 Lisp_Object | |
| 444 | 559 concat2 (Lisp_Object string1, Lisp_Object string2) |
| 428 | 560 { |
| 561 Lisp_Object args[2]; | |
| 444 | 562 args[0] = string1; |
| 563 args[1] = string2; | |
| 428 | 564 return concat (2, args, c_string, 0); |
| 565 } | |
| 566 | |
| 567 Lisp_Object | |
| 444 | 568 concat3 (Lisp_Object string1, Lisp_Object string2, Lisp_Object string3) |
| 428 | 569 { |
| 570 Lisp_Object args[3]; | |
| 444 | 571 args[0] = string1; |
| 572 args[1] = string2; | |
| 573 args[2] = string3; | |
| 428 | 574 return concat (3, args, c_string, 0); |
| 575 } | |
| 576 | |
| 577 Lisp_Object | |
| 444 | 578 vconcat2 (Lisp_Object vec1, Lisp_Object vec2) |
| 428 | 579 { |
| 580 Lisp_Object args[2]; | |
| 444 | 581 args[0] = vec1; |
| 582 args[1] = vec2; | |
| 428 | 583 return concat (2, args, c_vector, 0); |
| 584 } | |
| 585 | |
| 586 Lisp_Object | |
| 444 | 587 vconcat3 (Lisp_Object vec1, Lisp_Object vec2, Lisp_Object vec3) |
| 428 | 588 { |
| 589 Lisp_Object args[3]; | |
| 444 | 590 args[0] = vec1; |
| 591 args[1] = vec2; | |
| 592 args[2] = vec3; | |
| 428 | 593 return concat (3, args, c_vector, 0); |
| 594 } | |
| 595 | |
| 596 DEFUN ("append", Fappend, 0, MANY, 0, /* | |
| 597 Concatenate all the arguments and make the result a list. | |
| 598 The result is a list whose elements are the elements of all the arguments. | |
| 599 Each argument may be a list, vector, bit vector, or string. | |
| 600 The last argument is not copied, just used as the tail of the new list. | |
| 601 Also see: `nconc'. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3842
diff
changeset
|
602 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3842
diff
changeset
|
603 arguments: (&rest ARGS) |
| 428 | 604 */ |
| 605 (int nargs, Lisp_Object *args)) | |
| 606 { | |
| 607 return concat (nargs, args, c_cons, 1); | |
| 608 } | |
| 609 | |
| 610 DEFUN ("concat", Fconcat, 0, MANY, 0, /* | |
| 611 Concatenate all the arguments and make the result a string. | |
| 612 The result is a string whose elements are the elements of all the arguments. | |
| 613 Each argument may be a string or a list or vector of characters. | |
| 614 | |
| 615 As of XEmacs 21.0, this function does NOT accept individual integers | |
| 616 as arguments. Old code that relies on, for example, (concat "foo" 50) | |
| 617 returning "foo50" will fail. To fix such code, either apply | |
| 618 `int-to-string' to the integer argument, or use `format'. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3842
diff
changeset
|
619 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3842
diff
changeset
|
620 arguments: (&rest ARGS) |
| 428 | 621 */ |
| 622 (int nargs, Lisp_Object *args)) | |
| 623 { | |
| 624 return concat (nargs, args, c_string, 0); | |
| 625 } | |
| 626 | |
| 627 DEFUN ("vconcat", Fvconcat, 0, MANY, 0, /* | |
| 628 Concatenate all the arguments and make the result a vector. | |
| 629 The result is a vector whose elements are the elements of all the arguments. | |
| 630 Each argument may be a list, vector, bit vector, or string. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3842
diff
changeset
|
631 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3842
diff
changeset
|
632 arguments: (&rest ARGS) |
| 428 | 633 */ |
| 634 (int nargs, Lisp_Object *args)) | |
| 635 { | |
| 636 return concat (nargs, args, c_vector, 0); | |
| 637 } | |
| 638 | |
| 639 DEFUN ("bvconcat", Fbvconcat, 0, MANY, 0, /* | |
| 640 Concatenate all the arguments and make the result a bit vector. | |
| 641 The result is a bit vector whose elements are the elements of all the | |
| 642 arguments. Each argument may be a list, vector, bit vector, or string. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3842
diff
changeset
|
643 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3842
diff
changeset
|
644 arguments: (&rest ARGS) |
| 428 | 645 */ |
| 646 (int nargs, Lisp_Object *args)) | |
| 647 { | |
| 648 return concat (nargs, args, c_bit_vector, 0); | |
| 649 } | |
| 650 | |
| 651 /* Copy a (possibly dotted) list. LIST must be a cons. | |
| 652 Can't use concat (1, &alist, c_cons, 0) - doesn't handle dotted lists. */ | |
| 653 static Lisp_Object | |
| 654 copy_list (Lisp_Object list) | |
| 655 { | |
| 656 Lisp_Object list_copy = Fcons (XCAR (list), XCDR (list)); | |
| 657 Lisp_Object last = list_copy; | |
| 658 Lisp_Object hare, tortoise; | |
| 665 | 659 Elemcount len; |
| 428 | 660 |
| 661 for (tortoise = hare = XCDR (list), len = 1; | |
| 662 CONSP (hare); | |
| 663 hare = XCDR (hare), len++) | |
| 664 { | |
| 665 XCDR (last) = Fcons (XCAR (hare), XCDR (hare)); | |
| 666 last = XCDR (last); | |
| 667 | |
| 668 if (len < CIRCULAR_LIST_SUSPICION_LENGTH) | |
| 669 continue; | |
| 670 if (len & 1) | |
| 671 tortoise = XCDR (tortoise); | |
| 672 if (EQ (tortoise, hare)) | |
| 673 signal_circular_list_error (list); | |
| 674 } | |
| 675 | |
| 676 return list_copy; | |
| 677 } | |
| 678 | |
| 679 DEFUN ("copy-list", Fcopy_list, 1, 1, 0, /* | |
| 680 Return a copy of list LIST, which may be a dotted list. | |
| 681 The elements of LIST are not copied; they are shared | |
| 682 with the original. | |
| 683 */ | |
| 684 (list)) | |
| 685 { | |
| 686 again: | |
| 687 if (NILP (list)) return list; | |
| 688 if (CONSP (list)) return copy_list (list); | |
| 689 | |
| 690 list = wrong_type_argument (Qlistp, list); | |
| 691 goto again; | |
| 692 } | |
| 693 | |
| 694 DEFUN ("copy-sequence", Fcopy_sequence, 1, 1, 0, /* | |
| 695 Return a copy of list, vector, bit vector or string SEQUENCE. | |
| 696 The elements of a list or vector are not copied; they are shared | |
| 697 with the original. SEQUENCE may be a dotted list. | |
| 698 */ | |
| 699 (sequence)) | |
| 700 { | |
| 701 again: | |
| 702 if (NILP (sequence)) return sequence; | |
| 703 if (CONSP (sequence)) return copy_list (sequence); | |
| 704 if (STRINGP (sequence)) return concat (1, &sequence, c_string, 0); | |
| 705 if (VECTORP (sequence)) return concat (1, &sequence, c_vector, 0); | |
| 706 if (BIT_VECTORP (sequence)) return concat (1, &sequence, c_bit_vector, 0); | |
| 707 | |
| 708 check_losing_bytecode ("copy-sequence", sequence); | |
| 709 sequence = wrong_type_argument (Qsequencep, sequence); | |
| 710 goto again; | |
| 711 } | |
| 712 | |
| 713 struct merge_string_extents_struct | |
| 714 { | |
| 715 Lisp_Object string; | |
| 716 Bytecount entry_offset; | |
| 717 Bytecount entry_length; | |
| 718 }; | |
| 719 | |
| 720 static Lisp_Object | |
| 721 concat (int nargs, Lisp_Object *args, | |
| 722 enum concat_target_type target_type, | |
| 723 int last_special) | |
| 724 { | |
| 725 Lisp_Object val; | |
| 726 Lisp_Object tail = Qnil; | |
| 727 int toindex; | |
| 728 int argnum; | |
| 729 Lisp_Object last_tail; | |
| 730 Lisp_Object prev; | |
| 731 struct merge_string_extents_struct *args_mse = 0; | |
| 867 | 732 Ibyte *string_result = 0; |
| 733 Ibyte *string_result_ptr = 0; | |
| 428 | 734 struct gcpro gcpro1; |
| 851 | 735 int sdep = specpdl_depth (); |
| 428 | 736 |
| 737 /* The modus operandi in Emacs is "caller gc-protects args". | |
| 738 However, concat is called many times in Emacs on freshly | |
| 739 created stuff. So we help those callers out by protecting | |
| 740 the args ourselves to save them a lot of temporary-variable | |
| 741 grief. */ | |
| 742 | |
| 743 GCPRO1 (args[0]); | |
| 744 gcpro1.nvars = nargs; | |
| 745 | |
| 746 #ifdef I18N3 | |
| 747 /* #### if the result is a string and any of the strings have a string | |
| 748 for the `string-translatable' property, then concat should also | |
| 749 concat the args but use the `string-translatable' strings, and store | |
| 750 the result in the returned string's `string-translatable' property. */ | |
| 751 #endif | |
| 752 if (target_type == c_string) | |
| 753 args_mse = alloca_array (struct merge_string_extents_struct, nargs); | |
| 754 | |
| 755 /* In append, the last arg isn't treated like the others */ | |
| 756 if (last_special && nargs > 0) | |
| 757 { | |
| 758 nargs--; | |
| 759 last_tail = args[nargs]; | |
| 760 } | |
| 761 else | |
| 762 last_tail = Qnil; | |
| 763 | |
| 764 /* Check and coerce the arguments. */ | |
| 765 for (argnum = 0; argnum < nargs; argnum++) | |
| 766 { | |
| 767 Lisp_Object seq = args[argnum]; | |
| 768 if (LISTP (seq)) | |
| 769 ; | |
| 770 else if (VECTORP (seq) || STRINGP (seq) || BIT_VECTORP (seq)) | |
| 771 ; | |
| 772 #ifdef LOSING_BYTECODE | |
| 773 else if (COMPILED_FUNCTIONP (seq)) | |
| 774 /* Urk! We allow this, for "compatibility"... */ | |
| 775 ; | |
| 776 #endif | |
| 777 #if 0 /* removed for XEmacs 21 */ | |
| 778 else if (INTP (seq)) | |
| 779 /* This is too revolting to think about but maintains | |
| 780 compatibility with FSF (and lots and lots of old code). */ | |
| 781 args[argnum] = Fnumber_to_string (seq); | |
| 782 #endif | |
| 783 else | |
| 784 { | |
| 785 check_losing_bytecode ("concat", seq); | |
| 786 args[argnum] = wrong_type_argument (Qsequencep, seq); | |
| 787 } | |
| 788 | |
| 789 if (args_mse) | |
| 790 { | |
| 791 if (STRINGP (seq)) | |
| 792 args_mse[argnum].string = seq; | |
| 793 else | |
| 794 args_mse[argnum].string = Qnil; | |
| 795 } | |
| 796 } | |
| 797 | |
| 798 { | |
| 799 /* Charcount is a misnomer here as we might be dealing with the | |
| 800 length of a vector or list, but emphasizes that we're not dealing | |
| 801 with Bytecounts in strings */ | |
| 802 Charcount total_length; | |
| 803 | |
| 804 for (argnum = 0, total_length = 0; argnum < nargs; argnum++) | |
| 805 { | |
| 806 #ifdef LOSING_BYTECODE | |
| 807 Charcount thislen = length_with_bytecode_hack (args[argnum]); | |
| 808 #else | |
| 809 Charcount thislen = XINT (Flength (args[argnum])); | |
| 810 #endif | |
| 811 total_length += thislen; | |
| 812 } | |
| 813 | |
| 814 switch (target_type) | |
| 815 { | |
| 816 case c_cons: | |
| 817 if (total_length == 0) | |
| 851 | 818 { |
| 819 unbind_to (sdep); | |
| 820 /* In append, if all but last arg are nil, return last arg */ | |
| 821 RETURN_UNGCPRO (last_tail); | |
| 822 } | |
| 428 | 823 val = Fmake_list (make_int (total_length), Qnil); |
| 824 break; | |
| 825 case c_vector: | |
| 826 val = make_vector (total_length, Qnil); | |
| 827 break; | |
| 828 case c_bit_vector: | |
| 829 val = make_bit_vector (total_length, Qzero); | |
| 830 break; | |
| 831 case c_string: | |
| 832 /* We don't make the string yet because we don't know the | |
| 833 actual number of bytes. This loop was formerly written | |
| 834 to call Fmake_string() here and then call set_string_char() | |
| 835 for each char. This seems logical enough but is waaaaaaaay | |
| 836 slow -- set_string_char() has to scan the whole string up | |
| 837 to the place where the substitution is called for in order | |
| 838 to find the place to change, and may have to do some | |
| 839 realloc()ing in order to make the char fit properly. | |
| 840 O(N^2) yuckage. */ | |
| 841 val = Qnil; | |
| 851 | 842 string_result = |
| 867 | 843 (Ibyte *) MALLOC_OR_ALLOCA (total_length * MAX_ICHAR_LEN); |
| 428 | 844 string_result_ptr = string_result; |
| 845 break; | |
| 846 default: | |
| 442 | 847 val = Qnil; |
| 2500 | 848 ABORT (); |
| 428 | 849 } |
| 850 } | |
| 851 | |
| 852 | |
| 853 if (CONSP (val)) | |
| 854 tail = val, toindex = -1; /* -1 in toindex is flag we are | |
| 855 making a list */ | |
| 856 else | |
| 857 toindex = 0; | |
| 858 | |
| 859 prev = Qnil; | |
| 860 | |
| 861 for (argnum = 0; argnum < nargs; argnum++) | |
| 862 { | |
| 863 Charcount thisleni = 0; | |
| 864 Charcount thisindex = 0; | |
| 865 Lisp_Object seq = args[argnum]; | |
| 867 | 866 Ibyte *string_source_ptr = 0; |
| 867 Ibyte *string_prev_result_ptr = string_result_ptr; | |
| 428 | 868 |
| 869 if (!CONSP (seq)) | |
| 870 { | |
| 871 #ifdef LOSING_BYTECODE | |
| 872 thisleni = length_with_bytecode_hack (seq); | |
| 873 #else | |
| 874 thisleni = XINT (Flength (seq)); | |
| 875 #endif | |
| 876 } | |
| 877 if (STRINGP (seq)) | |
| 878 string_source_ptr = XSTRING_DATA (seq); | |
| 879 | |
| 880 while (1) | |
| 881 { | |
| 882 Lisp_Object elt; | |
| 883 | |
| 884 /* We've come to the end of this arg, so exit. */ | |
| 885 if (NILP (seq)) | |
| 886 break; | |
| 887 | |
| 888 /* Fetch next element of `seq' arg into `elt' */ | |
| 889 if (CONSP (seq)) | |
| 890 { | |
| 891 elt = XCAR (seq); | |
| 892 seq = XCDR (seq); | |
| 893 } | |
| 894 else | |
| 895 { | |
| 896 if (thisindex >= thisleni) | |
| 897 break; | |
| 898 | |
| 899 if (STRINGP (seq)) | |
| 900 { | |
| 867 | 901 elt = make_char (itext_ichar (string_source_ptr)); |
| 902 INC_IBYTEPTR (string_source_ptr); | |
| 428 | 903 } |
| 904 else if (VECTORP (seq)) | |
| 905 elt = XVECTOR_DATA (seq)[thisindex]; | |
| 906 else if (BIT_VECTORP (seq)) | |
| 907 elt = make_int (bit_vector_bit (XBIT_VECTOR (seq), | |
| 908 thisindex)); | |
| 909 else | |
| 910 elt = Felt (seq, make_int (thisindex)); | |
| 911 thisindex++; | |
| 912 } | |
| 913 | |
| 914 /* Store into result */ | |
| 915 if (toindex < 0) | |
| 916 { | |
| 917 /* toindex negative means we are making a list */ | |
| 918 XCAR (tail) = elt; | |
| 919 prev = tail; | |
| 920 tail = XCDR (tail); | |
| 921 } | |
| 922 else if (VECTORP (val)) | |
| 923 XVECTOR_DATA (val)[toindex++] = elt; | |
| 924 else if (BIT_VECTORP (val)) | |
| 925 { | |
| 926 CHECK_BIT (elt); | |
| 927 set_bit_vector_bit (XBIT_VECTOR (val), toindex++, XINT (elt)); | |
| 928 } | |
| 929 else | |
| 930 { | |
| 931 CHECK_CHAR_COERCE_INT (elt); | |
| 867 | 932 string_result_ptr += set_itext_ichar (string_result_ptr, |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
933 XCHAR (elt)); |
| 428 | 934 } |
| 935 } | |
| 936 if (args_mse) | |
| 937 { | |
| 938 args_mse[argnum].entry_offset = | |
| 939 string_prev_result_ptr - string_result; | |
| 940 args_mse[argnum].entry_length = | |
| 941 string_result_ptr - string_prev_result_ptr; | |
| 942 } | |
| 943 } | |
| 944 | |
| 945 /* Now we finally make the string. */ | |
| 946 if (target_type == c_string) | |
| 947 { | |
| 948 val = make_string (string_result, string_result_ptr - string_result); | |
| 949 for (argnum = 0; argnum < nargs; argnum++) | |
| 950 { | |
| 951 if (STRINGP (args_mse[argnum].string)) | |
| 952 copy_string_extents (val, args_mse[argnum].string, | |
| 953 args_mse[argnum].entry_offset, 0, | |
| 954 args_mse[argnum].entry_length); | |
| 955 } | |
| 956 } | |
| 957 | |
| 958 if (!NILP (prev)) | |
| 959 XCDR (prev) = last_tail; | |
| 960 | |
| 851 | 961 unbind_to (sdep); |
| 428 | 962 RETURN_UNGCPRO (val); |
| 963 } | |
| 964 | |
| 965 DEFUN ("copy-alist", Fcopy_alist, 1, 1, 0, /* | |
| 966 Return a copy of ALIST. | |
| 967 This is an alist which represents the same mapping from objects to objects, | |
| 968 but does not share the alist structure with ALIST. | |
| 969 The objects mapped (cars and cdrs of elements of the alist) | |
| 970 are shared, however. | |
| 971 Elements of ALIST that are not conses are also shared. | |
| 972 */ | |
| 973 (alist)) | |
| 974 { | |
| 975 Lisp_Object tail; | |
| 976 | |
| 977 if (NILP (alist)) | |
| 978 return alist; | |
| 979 CHECK_CONS (alist); | |
| 980 | |
| 981 alist = concat (1, &alist, c_cons, 0); | |
| 982 for (tail = alist; CONSP (tail); tail = XCDR (tail)) | |
| 983 { | |
| 984 Lisp_Object car = XCAR (tail); | |
| 985 | |
| 986 if (CONSP (car)) | |
| 987 XCAR (tail) = Fcons (XCAR (car), XCDR (car)); | |
| 988 } | |
| 989 return alist; | |
| 990 } | |
| 991 | |
| 992 DEFUN ("copy-tree", Fcopy_tree, 1, 2, 0, /* | |
| 993 Return a copy of a list and substructures. | |
| 994 The argument is copied, and any lists contained within it are copied | |
| 995 recursively. Circularities and shared substructures are not preserved. | |
| 996 Second arg VECP causes vectors to be copied, too. Strings and bit vectors | |
| 997 are not copied. | |
| 998 */ | |
| 999 (arg, vecp)) | |
| 1000 { | |
| 454 | 1001 return safe_copy_tree (arg, vecp, 0); |
| 1002 } | |
| 1003 | |
| 1004 Lisp_Object | |
| 1005 safe_copy_tree (Lisp_Object arg, Lisp_Object vecp, int depth) | |
| 1006 { | |
| 1007 if (depth > 200) | |
| 563 | 1008 stack_overflow ("Stack overflow in copy-tree", arg); |
| 454 | 1009 |
| 428 | 1010 if (CONSP (arg)) |
| 1011 { | |
| 1012 Lisp_Object rest; | |
| 1013 rest = arg = Fcopy_sequence (arg); | |
| 1014 while (CONSP (rest)) | |
| 1015 { | |
| 1016 Lisp_Object elt = XCAR (rest); | |
| 1017 QUIT; | |
| 1018 if (CONSP (elt) || VECTORP (elt)) | |
| 454 | 1019 XCAR (rest) = safe_copy_tree (elt, vecp, depth + 1); |
| 428 | 1020 if (VECTORP (XCDR (rest))) /* hack for (a b . [c d]) */ |
| 454 | 1021 XCDR (rest) = safe_copy_tree (XCDR (rest), vecp, depth +1); |
| 428 | 1022 rest = XCDR (rest); |
| 1023 } | |
| 1024 } | |
| 1025 else if (VECTORP (arg) && ! NILP (vecp)) | |
| 1026 { | |
| 1027 int i = XVECTOR_LENGTH (arg); | |
| 1028 int j; | |
| 1029 arg = Fcopy_sequence (arg); | |
| 1030 for (j = 0; j < i; j++) | |
| 1031 { | |
| 1032 Lisp_Object elt = XVECTOR_DATA (arg) [j]; | |
| 1033 QUIT; | |
| 1034 if (CONSP (elt) || VECTORP (elt)) | |
| 454 | 1035 XVECTOR_DATA (arg) [j] = safe_copy_tree (elt, vecp, depth + 1); |
| 428 | 1036 } |
| 1037 } | |
| 1038 return arg; | |
| 1039 } | |
| 1040 | |
| 1041 DEFUN ("subseq", Fsubseq, 2, 3, 0, /* | |
| 442 | 1042 Return the subsequence of SEQUENCE starting at START and ending before END. |
| 1043 END may be omitted; then the subsequence runs to the end of SEQUENCE. | |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1044 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1045 If START or END is negative, it counts from the end, in contravention of |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1046 Common Lisp. |
| 442 | 1047 The returned subsequence is always of the same type as SEQUENCE. |
| 1048 If SEQUENCE is a string, relevant parts of the string-extent-data | |
| 1049 are copied to the new string. | |
|
5224
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1050 |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1051 See also `substring-no-properties', which only operates on strings, and does |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1052 not copy extent data. |
| 428 | 1053 */ |
| 442 | 1054 (sequence, start, end)) |
| 428 | 1055 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1056 Elemcount len, ss, ee = EMACS_INT_MAX, ii; |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1057 Lisp_Object result = Qnil; |
|
5089
99f8ebc082d9
Make #'substring an alias of #'subseq; give the latter the byte code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5051
diff
changeset
|
1058 |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
1059 CHECK_SEQUENCE (sequence); |
| 442 | 1060 CHECK_INT (start); |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1061 ss = XINT (start); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1062 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1063 if (!NILP (end)) |
| 428 | 1064 { |
| 442 | 1065 CHECK_INT (end); |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1066 ee = XINT (end); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1067 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1068 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1069 if (STRINGP (sequence)) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1070 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1071 Bytecount bstart, blen; |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1072 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1073 get_string_range_char (sequence, start, end, &ss, &ee, |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1074 GB_HISTORICAL_STRING_BEHAVIOR); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1075 bstart = string_index_char_to_byte (sequence, ss); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1076 blen = string_offset_char_to_byte_len (sequence, bstart, ee - ss); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1077 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1078 result = make_string (XSTRING_DATA (sequence) + bstart, blen); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1079 /* Copy any applicable extent information into the new string. */ |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1080 copy_string_extents (result, sequence, 0, bstart, blen); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1081 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1082 else if (CONSP (sequence)) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1083 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1084 Lisp_Object result_tail, saved = sequence; |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1085 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1086 if (ss < 0 || ee < 0) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1087 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1088 len = XINT (Flength (sequence)); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1089 if (ss < 0) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1090 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1091 ss = len + ss; |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1092 start = make_integer (ss); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1093 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1094 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1095 if (ee < 0) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1096 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1097 ee = len + ee; |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1098 end = make_integer (ee); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1099 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1100 else |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1101 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1102 ee = min (ee, len); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1103 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1104 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1105 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1106 if (0 != ss) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1107 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1108 sequence = Fnthcdr (make_int (ss), sequence); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1109 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1110 |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
1111 ii = ss + 1; |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
1112 |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1113 if (ss < ee && !NILP (sequence)) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1114 { |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
1115 result = result_tail = Fcons (Fcar (sequence), Qnil); |
| 442 | 1116 sequence = Fcdr (sequence); |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1117 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1118 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1119 EXTERNAL_LIST_LOOP_2 (elt, sequence) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1120 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1121 if (!(ii < ee)) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1122 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1123 break; |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1124 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1125 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1126 XSETCDR (result_tail, Fcons (elt, Qnil)); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1127 result_tail = XCDR (result_tail); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1128 ii++; |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1129 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1130 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1131 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1132 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1133 if (NILP (result) || (ii < ee && !NILP (end))) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1134 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1135 /* We were handed a cons, which definitely has elements. nil |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1136 result means either ss >= ee or SEQUENCE was nil after the |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1137 nthcdr; in both cases that means START and END were incorrectly |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1138 specified for this sequence. ii < ee with a non-nil end means |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1139 the user handed us a bogus end value. */ |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1140 check_sequence_range (saved, start, end, Flength (saved)); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1141 } |
| 442 | 1142 } |
| 1143 else | |
| 1144 { | |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1145 len = XINT (Flength (sequence)); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1146 if (ss < 0) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1147 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1148 ss = len + ss; |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1149 start = make_integer (ss); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1150 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1151 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1152 if (ee < 0) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1153 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1154 ee = len + ee; |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1155 end = make_integer (ee); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1156 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1157 else |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1158 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1159 ee = min (len, ee); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1160 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1161 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1162 check_sequence_range (sequence, start, end, make_int (len)); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1163 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1164 if (VECTORP (sequence)) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1165 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1166 result = Fvector (ee - ss, XVECTOR_DATA (sequence) + ss); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1167 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1168 else if (BIT_VECTORP (sequence)) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1169 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1170 result = make_bit_vector (ee - ss, Qzero); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1171 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1172 for (ii = ss; ii < ee; ii++) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1173 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1174 set_bit_vector_bit (XBIT_VECTOR (result), ii - ss, |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1175 bit_vector_bit (XBIT_VECTOR (sequence), ii)); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1176 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1177 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1178 else if (NILP (sequence)) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1179 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1180 DO_NOTHING; |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1181 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1182 else |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1183 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1184 /* Won't happen, since CHECK_SEQUENCE didn't error. */ |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1185 ABORT (); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1186 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1187 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1188 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
1189 return result; |
| 428 | 1190 } |
| 1191 | |
|
5224
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1192 DEFUN ("substring-no-properties", Fsubstring_no_properties, 1, 3, 0, /* |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1193 Return a substring of STRING, without copying the extents. |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1194 END may be nil or omitted; then the substring runs to the end of STRING. |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1195 If START or END is negative, it counts from the end. |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1196 |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1197 With one argument, copy STRING without its properties. |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1198 */ |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1199 (string, start, end)) |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1200 { |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1201 Charcount ccstart, ccend; |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1202 Bytecount bstart, blen; |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1203 Lisp_Object val; |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1204 |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1205 get_string_range_char (string, start, end, &ccstart, &ccend, |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1206 GB_HISTORICAL_STRING_BEHAVIOR); |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1207 bstart = string_index_char_to_byte (string, ccstart); |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1208 blen = string_offset_char_to_byte_len (string, bstart, ccend - ccstart); |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1209 val = make_string (XSTRING_DATA (string) + bstart, blen); |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1210 |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1211 return val; |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1212 } |
|
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
1213 |
| 771 | 1214 /* Split STRING into a list of substrings. The substrings are the |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1215 parts of original STRING separated by SEPCHAR. |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1216 |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1217 If UNESCAPE is non-zero, ESCAPECHAR specifies a character that will quote |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1218 SEPCHAR, and cause it not to split STRING. A double ESCAPECHAR is |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1219 necessary for ESCAPECHAR to appear once in a substring. */ |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1220 |
| 771 | 1221 static Lisp_Object |
| 867 | 1222 split_string_by_ichar_1 (const Ibyte *string, Bytecount size, |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1223 Ichar sepchar, int unescape, Ichar escapechar) |
| 771 | 1224 { |
| 1225 Lisp_Object result = Qnil; | |
| 867 | 1226 const Ibyte *end = string + size; |
| 771 | 1227 |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1228 if (unescape) |
| 771 | 1229 { |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1230 Ibyte unescape_buffer[64], *unescape_buffer_ptr = unescape_buffer, |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1231 escaped[MAX_ICHAR_LEN], *unescape_cursor; |
|
5036
9624523604c5
Use better types when ESCAPECHAR is specified, split_string_by_ichar_1
Aidan Kehoe <kehoea@parhasard.net>
parents:
5035
diff
changeset
|
1232 Bytecount unescape_buffer_size = countof (unescape_buffer), |
|
9624523604c5
Use better types when ESCAPECHAR is specified, split_string_by_ichar_1
Aidan Kehoe <kehoea@parhasard.net>
parents:
5035
diff
changeset
|
1233 escaped_len = set_itext_ichar (escaped, escapechar); |
|
9624523604c5
Use better types when ESCAPECHAR is specified, split_string_by_ichar_1
Aidan Kehoe <kehoea@parhasard.net>
parents:
5035
diff
changeset
|
1234 Boolint deleting_escapes, previous_escaped; |
|
9624523604c5
Use better types when ESCAPECHAR is specified, split_string_by_ichar_1
Aidan Kehoe <kehoea@parhasard.net>
parents:
5035
diff
changeset
|
1235 Ichar pchar; |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1236 |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1237 while (1) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1238 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1239 const Ibyte *p = string, *cursor; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1240 deleting_escapes = 0; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1241 previous_escaped = 0; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1242 |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1243 while (p < end) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1244 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1245 pchar = itext_ichar (p); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1246 |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1247 if (pchar == sepchar) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1248 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1249 if (!previous_escaped) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1250 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1251 break; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1252 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1253 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1254 else if (pchar == escapechar |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1255 /* Doubled escapes don't escape: */ |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1256 && !previous_escaped) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1257 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1258 ++deleting_escapes; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1259 previous_escaped = 1; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1260 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1261 else |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1262 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1263 previous_escaped = 0; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1264 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1265 |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1266 INC_IBYTEPTR (p); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1267 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1268 |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1269 if (deleting_escapes) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1270 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1271 if (((p - string) - (escaped_len * deleting_escapes)) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1272 > unescape_buffer_size) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1273 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1274 unescape_buffer_size = |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1275 ((p - string) - (escaped_len * deleting_escapes)) * 1.5; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1276 unescape_buffer_ptr = alloca_ibytes (unescape_buffer_size); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1277 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1278 |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1279 cursor = string; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1280 unescape_cursor = unescape_buffer_ptr; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1281 previous_escaped = 0; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1282 |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1283 while (cursor < p) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1284 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1285 pchar = itext_ichar (cursor); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1286 |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1287 if (pchar != escapechar || previous_escaped) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1288 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1289 memcpy (unescape_cursor, cursor, |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1290 itext_ichar_len (cursor)); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1291 INC_IBYTEPTR (unescape_cursor); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1292 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1293 |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1294 previous_escaped = !previous_escaped |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1295 && (pchar == escapechar); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1296 |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1297 INC_IBYTEPTR (cursor); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1298 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1299 |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1300 result = Fcons (make_string (unescape_buffer_ptr, |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1301 unescape_cursor |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1302 - unescape_buffer_ptr), |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1303 result); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1304 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1305 else |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1306 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1307 result = Fcons (make_string (string, p - string), result); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1308 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1309 if (p < end) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1310 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1311 string = p; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1312 INC_IBYTEPTR (string); /* skip sepchar */ |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1313 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1314 else |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1315 break; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1316 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1317 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1318 else |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1319 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1320 while (1) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1321 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1322 const Ibyte *p = string; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1323 while (p < end) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1324 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1325 if (itext_ichar (p) == sepchar) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1326 break; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1327 INC_IBYTEPTR (p); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1328 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1329 result = Fcons (make_string (string, p - string), result); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1330 if (p < end) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1331 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1332 string = p; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1333 INC_IBYTEPTR (string); /* skip sepchar */ |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1334 } |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1335 else |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1336 break; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1337 } |
| 771 | 1338 } |
| 1339 return Fnreverse (result); | |
| 1340 } | |
| 1341 | |
| 1342 /* The same as the above, except PATH is an external C string (it is | |
| 1343 converted using Qfile_name), and sepchar is hardcoded to SEPCHAR | |
| 1344 (':' or whatever). */ | |
| 1345 Lisp_Object | |
| 1346 split_external_path (const Extbyte *path) | |
| 1347 { | |
| 1348 Bytecount newlen; | |
| 867 | 1349 Ibyte *newpath; |
| 771 | 1350 if (!path) |
| 1351 return Qnil; | |
| 1352 | |
| 1353 TO_INTERNAL_FORMAT (C_STRING, path, ALLOCA, (newpath, newlen), Qfile_name); | |
| 1354 | |
| 1355 /* #### Does this make sense? It certainly does for | |
| 1356 split_env_path(), but it looks dubious here. Does any code | |
| 1357 depend on split_external_path("") returning nil instead of an empty | |
| 1358 string? */ | |
| 1359 if (!newlen) | |
| 1360 return Qnil; | |
| 1361 | |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1362 return split_string_by_ichar_1 (newpath, newlen, SEPCHAR, 0, 0); |
| 771 | 1363 } |
| 1364 | |
| 1365 Lisp_Object | |
| 867 | 1366 split_env_path (const CIbyte *evarname, const Ibyte *default_) |
| 771 | 1367 { |
| 867 | 1368 const Ibyte *path = 0; |
| 771 | 1369 if (evarname) |
| 1370 path = egetenv (evarname); | |
| 1371 if (!path) | |
| 1372 path = default_; | |
| 1373 if (!path) | |
| 1374 return Qnil; | |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1375 return split_string_by_ichar_1 (path, qxestrlen (path), SEPCHAR, 0, 0); |
| 771 | 1376 } |
| 1377 | |
| 1378 /* Ben thinks this function should not exist or be exported to Lisp. | |
| 1379 We use it to define split-path-string in subr.el (not!). */ | |
| 1380 | |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1381 DEFUN ("split-string-by-char", Fsplit_string_by_char, 2, 3, 0, /* |
| 771 | 1382 Split STRING into a list of substrings originally separated by SEPCHAR. |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1383 |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1384 With optional ESCAPE-CHAR, any instances of SEPCHAR preceded by that |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1385 character will not split the string, and a double instance of ESCAPE-CHAR |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1386 will be necessary for a single ESCAPE-CHAR to appear in the output string. |
| 771 | 1387 */ |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1388 (string, sepchar, escape_char)) |
| 771 | 1389 { |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1390 Ichar escape_ichar = 0; |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1391 |
| 771 | 1392 CHECK_STRING (string); |
| 1393 CHECK_CHAR (sepchar); | |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1394 if (!NILP (escape_char)) |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1395 { |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1396 CHECK_CHAR (escape_char); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1397 escape_ichar = XCHAR (escape_char); |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1398 } |
| 867 | 1399 return split_string_by_ichar_1 (XSTRING_DATA (string), |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1400 XSTRING_LENGTH (string), |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1401 XCHAR (sepchar), |
|
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1402 !NILP (escape_char), escape_ichar); |
| 771 | 1403 } |
| 1404 | |
| 1405 /* #### This was supposed to be in subr.el, but is used VERY early in | |
| 1406 the bootstrap process, so it goes here. Damn. */ | |
| 1407 | |
| 1408 DEFUN ("split-path", Fsplit_path, 1, 1, 0, /* | |
| 1409 Explode a search path into a list of strings. | |
| 1410 The path components are separated with the characters specified | |
| 1411 with `path-separator'. | |
| 1412 */ | |
| 1413 (path)) | |
| 1414 { | |
| 1415 CHECK_STRING (path); | |
| 1416 | |
| 1417 while (!STRINGP (Vpath_separator) | |
| 826 | 1418 || (string_char_length (Vpath_separator) != 1)) |
| 771 | 1419 Vpath_separator = signal_continuable_error |
| 1420 (Qinvalid_state, | |
| 1421 "`path-separator' should be set to a single-character string", | |
| 1422 Vpath_separator); | |
| 1423 | |
| 867 | 1424 return (split_string_by_ichar_1 |
| 771 | 1425 (XSTRING_DATA (path), XSTRING_LENGTH (path), |
|
5035
b1e48555be7d
Add a new optional ESCAPE-CHAR argument to #'split-string-by-char.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5034
diff
changeset
|
1426 itext_ichar (XSTRING_DATA (Vpath_separator)), 0, 0)); |
| 771 | 1427 } |
| 1428 | |
| 428 | 1429 |
| 1430 DEFUN ("nthcdr", Fnthcdr, 2, 2, 0, /* | |
| 1431 Take cdr N times on LIST, and return the result. | |
| 1432 */ | |
| 1433 (n, list)) | |
| 1434 { | |
| 1920 | 1435 /* This function can GC */ |
| 647 | 1436 REGISTER EMACS_INT i; |
| 428 | 1437 REGISTER Lisp_Object tail = list; |
| 1438 CHECK_NATNUM (n); | |
| 1439 for (i = XINT (n); i; i--) | |
| 1440 { | |
| 1441 if (CONSP (tail)) | |
| 1442 tail = XCDR (tail); | |
| 1443 else if (NILP (tail)) | |
| 1444 return Qnil; | |
| 1445 else | |
| 1446 { | |
| 1447 tail = wrong_type_argument (Qlistp, tail); | |
| 1448 i++; | |
| 1449 } | |
| 1450 } | |
| 1451 return tail; | |
| 1452 } | |
| 1453 | |
| 1454 DEFUN ("nth", Fnth, 2, 2, 0, /* | |
| 1455 Return the Nth element of LIST. | |
| 1456 N counts from zero. If LIST is not that long, nil is returned. | |
| 1457 */ | |
| 1458 (n, list)) | |
| 1459 { | |
| 1920 | 1460 /* This function can GC */ |
| 428 | 1461 return Fcar (Fnthcdr (n, list)); |
| 1462 } | |
| 1463 | |
| 1464 DEFUN ("elt", Felt, 2, 2, 0, /* | |
| 1465 Return element of SEQUENCE at index N. | |
| 1466 */ | |
| 1467 (sequence, n)) | |
| 1468 { | |
| 1920 | 1469 /* This function can GC */ |
| 428 | 1470 retry: |
| 1471 CHECK_INT_COERCE_CHAR (n); /* yuck! */ | |
| 1472 if (LISTP (sequence)) | |
| 1473 { | |
| 1474 Lisp_Object tem = Fnthcdr (n, sequence); | |
| 1475 /* #### Utterly, completely, fucking disgusting. | |
| 1476 * #### The whole point of "elt" is that it operates on | |
| 1477 * #### sequences, and does error- (bounds-) checking. | |
| 1478 */ | |
| 1479 if (CONSP (tem)) | |
| 1480 return XCAR (tem); | |
| 1481 else | |
| 1482 #if 1 | |
| 1483 /* This is The Way It Has Always Been. */ | |
| 1484 return Qnil; | |
| 1485 #else | |
| 1486 /* This is The Way Mly and Cltl2 say It Should Be. */ | |
| 1487 args_out_of_range (sequence, n); | |
| 1488 #endif | |
| 1489 } | |
| 1490 else if (STRINGP (sequence) || | |
| 1491 VECTORP (sequence) || | |
| 1492 BIT_VECTORP (sequence)) | |
| 1493 return Faref (sequence, n); | |
| 1494 #ifdef LOSING_BYTECODE | |
| 1495 else if (COMPILED_FUNCTIONP (sequence)) | |
| 1496 { | |
| 1497 EMACS_INT idx = XINT (n); | |
| 1498 if (idx < 0) | |
| 1499 { | |
| 1500 lose: | |
| 1501 args_out_of_range (sequence, n); | |
| 1502 } | |
| 1503 /* Utter perversity */ | |
| 1504 { | |
| 1505 Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (sequence); | |
| 1506 switch (idx) | |
| 1507 { | |
| 1508 case COMPILED_ARGLIST: | |
| 1509 return compiled_function_arglist (f); | |
| 1510 case COMPILED_INSTRUCTIONS: | |
| 1511 return compiled_function_instructions (f); | |
| 1512 case COMPILED_CONSTANTS: | |
| 1513 return compiled_function_constants (f); | |
| 1514 case COMPILED_STACK_DEPTH: | |
| 1515 return compiled_function_stack_depth (f); | |
| 1516 case COMPILED_DOC_STRING: | |
| 1517 return compiled_function_documentation (f); | |
| 1518 case COMPILED_DOMAIN: | |
| 1519 return compiled_function_domain (f); | |
| 1520 case COMPILED_INTERACTIVE: | |
| 1521 if (f->flags.interactivep) | |
| 1522 return compiled_function_interactive (f); | |
| 1523 /* if we return nil, can't tell interactive with no args | |
| 1524 from noninteractive. */ | |
| 1525 goto lose; | |
| 1526 default: | |
| 1527 goto lose; | |
| 1528 } | |
| 1529 } | |
| 1530 } | |
| 1531 #endif /* LOSING_BYTECODE */ | |
| 1532 else | |
| 1533 { | |
| 1534 check_losing_bytecode ("elt", sequence); | |
| 1535 sequence = wrong_type_argument (Qsequencep, sequence); | |
| 1536 goto retry; | |
| 1537 } | |
| 1538 } | |
| 1539 | |
| 1540 DEFUN ("last", Flast, 1, 2, 0, /* | |
| 1541 Return the tail of list LIST, of length N (default 1). | |
| 1542 LIST may be a dotted list, but not a circular list. | |
| 1543 Optional argument N must be a non-negative integer. | |
| 1544 If N is zero, then the atom that terminates the list is returned. | |
| 1545 If N is greater than the length of LIST, then LIST itself is returned. | |
| 1546 */ | |
| 1547 (list, n)) | |
| 1548 { | |
| 1549 EMACS_INT int_n, count; | |
| 1550 Lisp_Object retval, tortoise, hare; | |
| 1551 | |
| 1552 CHECK_LIST (list); | |
| 1553 | |
| 1554 if (NILP (n)) | |
| 1555 int_n = 1; | |
| 1556 else | |
| 1557 { | |
| 1558 CHECK_NATNUM (n); | |
| 1559 int_n = XINT (n); | |
| 1560 } | |
| 1561 | |
| 1562 for (retval = tortoise = hare = list, count = 0; | |
| 1563 CONSP (hare); | |
| 1564 hare = XCDR (hare), | |
| 1565 (int_n-- <= 0 ? ((void) (retval = XCDR (retval))) : (void)0), | |
| 1566 count++) | |
| 1567 { | |
| 1568 if (count < CIRCULAR_LIST_SUSPICION_LENGTH) continue; | |
| 1569 | |
| 1570 if (count & 1) | |
| 1571 tortoise = XCDR (tortoise); | |
| 1572 if (EQ (hare, tortoise)) | |
| 1573 signal_circular_list_error (list); | |
| 1574 } | |
| 1575 | |
| 1576 return retval; | |
| 1577 } | |
| 1578 | |
|
5306
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1579 static Lisp_Object bignum_butlast (Lisp_Object list, Lisp_Object number, |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1580 Boolint copy); |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1581 |
| 428 | 1582 DEFUN ("nbutlast", Fnbutlast, 1, 2, 0, /* |
| 1583 Modify LIST to remove the last N (default 1) elements. | |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1584 |
| 428 | 1585 If LIST has N or fewer elements, nil is returned and LIST is unmodified. |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1586 Otherwise, LIST may be dotted, but not circular. |
| 428 | 1587 */ |
| 1588 (list, n)) | |
| 1589 { | |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1590 Elemcount int_n = 1; |
| 428 | 1591 |
| 1592 CHECK_LIST (list); | |
| 1593 | |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1594 if (!NILP (n)) |
| 428 | 1595 { |
|
5306
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1596 if (BIGNUMP (n)) |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1597 { |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1598 return bignum_butlast (list, n, 0); |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1599 } |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1600 |
| 428 | 1601 CHECK_NATNUM (n); |
| 1602 int_n = XINT (n); | |
| 1603 } | |
| 1604 | |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1605 if (CONSP (list)) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1606 { |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1607 Lisp_Object last_cons = list; |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1608 |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1609 EXTERNAL_LIST_LOOP_3 (elt, list, tail) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1610 { |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1611 if (int_n-- < 0) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1612 { |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1613 last_cons = XCDR (last_cons); |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1614 } |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1615 |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1616 if (!CONSP (XCDR (tail))) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1617 { |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1618 break; |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1619 } |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1620 } |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1621 |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1622 if (int_n >= 0) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1623 { |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1624 return Qnil; |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1625 } |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1626 |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1627 XCDR (last_cons) = Qnil; |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1628 } |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1629 |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1630 return list; |
| 428 | 1631 } |
| 1632 | |
| 1633 DEFUN ("butlast", Fbutlast, 1, 2, 0, /* | |
| 1634 Return a copy of LIST with the last N (default 1) elements removed. | |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1635 |
| 428 | 1636 If LIST has N or fewer elements, nil is returned. |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1637 Otherwise, LIST may be dotted, but not circular, and `(butlast LIST 0)' |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1638 converts a dotted into a true list. |
| 428 | 1639 */ |
| 1640 (list, n)) | |
| 1641 { | |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1642 Lisp_Object retval = Qnil, retval_tail = Qnil; |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1643 Elemcount int_n = 1; |
| 428 | 1644 |
| 1645 CHECK_LIST (list); | |
| 1646 | |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1647 if (!NILP (n)) |
| 428 | 1648 { |
|
5306
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1649 if (BIGNUMP (n)) |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1650 { |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1651 return bignum_butlast (list, n, 1); |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1652 } |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1653 |
| 428 | 1654 CHECK_NATNUM (n); |
| 1655 int_n = XINT (n); | |
| 1656 } | |
| 1657 | |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1658 if (CONSP (list)) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1659 { |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1660 Lisp_Object tail = list; |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1661 |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1662 EXTERNAL_LIST_LOOP_3 (elt, list, list_tail) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1663 { |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1664 if (--int_n < 0) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1665 { |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1666 if (NILP (retval_tail)) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1667 { |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1668 retval = retval_tail = Fcons (XCAR (tail), Qnil); |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1669 } |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1670 else |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1671 { |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1672 XSETCDR (retval_tail, Fcons (XCAR (tail), Qnil)); |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1673 retval_tail = XCDR (retval_tail); |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1674 } |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1675 |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1676 tail = XCDR (tail); |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1677 } |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1678 |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1679 if (!CONSP (XCDR (list_tail))) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1680 { |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1681 break; |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1682 } |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1683 } |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1684 } |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1685 |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5283
diff
changeset
|
1686 return retval; |
| 428 | 1687 } |
| 1688 | |
|
5306
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1689 /* This is sufficient to implement #'butlast and #'nbutlast with bignum N |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1690 under XEmacs, because #'list-length and #'safe-length can never return a |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1691 bignum. This means that #'nbutlast never has to modify and #'butlast |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1692 never has to copy. */ |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1693 static Lisp_Object |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1694 bignum_butlast (Lisp_Object list, Lisp_Object number, Boolint copy) |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1695 { |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1696 Boolint malformed = EQ (Fsafe_length (list), Qzero); |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1697 Boolint circular = !malformed && EQ (Flist_length (list), Qnil); |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1698 |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1699 assert (BIGNUMP (number)); |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1700 |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1701 #ifdef HAVE_BIGNUM |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1702 |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1703 if (bignum_sign (XBIGNUM_DATA (number)) < 0) |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1704 { |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1705 dead_wrong_type_argument (Qnatnump, number); |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1706 } |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1707 |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1708 number = Fcanonicalize_number (number); |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1709 |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1710 if (INTP (number)) |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1711 { |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1712 return copy ? Fbutlast (list, number) : Fnbutlast (list, number); |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1713 } |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1714 |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1715 #endif |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1716 |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1717 if (circular) |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1718 { |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1719 signal_circular_list_error (list); |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1720 } |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1721 |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1722 return Qnil; |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1723 } |
|
cde1608596d0
Handle bignum N correctly, #'butlast, #'nbutlast.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5303
diff
changeset
|
1724 |
| 428 | 1725 DEFUN ("member", Fmember, 2, 2, 0, /* |
| 1726 Return non-nil if ELT is an element of LIST. Comparison done with `equal'. | |
| 1727 The value is actually the tail of LIST whose car is ELT. | |
| 1728 */ | |
| 1729 (elt, list)) | |
| 1730 { | |
| 1731 EXTERNAL_LIST_LOOP_3 (list_elt, list, tail) | |
| 1732 { | |
| 1733 if (internal_equal (elt, list_elt, 0)) | |
| 1734 return tail; | |
| 1735 } | |
| 1736 return Qnil; | |
| 1737 } | |
| 1738 | |
| 1739 DEFUN ("old-member", Fold_member, 2, 2, 0, /* | |
| 1740 Return non-nil if ELT is an element of LIST. Comparison done with `old-equal'. | |
| 1741 The value is actually the tail of LIST whose car is ELT. | |
| 1742 This function is provided only for byte-code compatibility with v19. | |
| 1743 Do not use it. | |
| 1744 */ | |
| 1745 (elt, list)) | |
| 1746 { | |
| 1747 EXTERNAL_LIST_LOOP_3 (list_elt, list, tail) | |
| 1748 { | |
| 1749 if (internal_old_equal (elt, list_elt, 0)) | |
| 1750 return tail; | |
| 1751 } | |
| 1752 return Qnil; | |
| 1753 } | |
| 1754 | |
| 1755 DEFUN ("memq", Fmemq, 2, 2, 0, /* | |
| 1756 Return non-nil if ELT is an element of LIST. Comparison done with `eq'. | |
| 1757 The value is actually the tail of LIST whose car is ELT. | |
| 1758 */ | |
| 1759 (elt, list)) | |
| 1760 { | |
| 1761 EXTERNAL_LIST_LOOP_3 (list_elt, list, tail) | |
| 1762 { | |
| 1763 if (EQ_WITH_EBOLA_NOTICE (elt, list_elt)) | |
| 1764 return tail; | |
| 1765 } | |
| 1766 return Qnil; | |
| 1767 } | |
| 1768 | |
| 1769 DEFUN ("old-memq", Fold_memq, 2, 2, 0, /* | |
| 1770 Return non-nil if ELT is an element of LIST. Comparison done with `old-eq'. | |
| 1771 The value is actually the tail of LIST whose car is ELT. | |
| 1772 This function is provided only for byte-code compatibility with v19. | |
| 1773 Do not use it. | |
| 1774 */ | |
| 1775 (elt, list)) | |
| 1776 { | |
| 1777 EXTERNAL_LIST_LOOP_3 (list_elt, list, tail) | |
| 1778 { | |
| 1779 if (HACKEQ_UNSAFE (elt, list_elt)) | |
| 1780 return tail; | |
| 1781 } | |
| 1782 return Qnil; | |
| 1783 } | |
| 1784 | |
| 1785 Lisp_Object | |
| 1786 memq_no_quit (Lisp_Object elt, Lisp_Object list) | |
| 1787 { | |
| 1788 LIST_LOOP_3 (list_elt, list, tail) | |
| 1789 { | |
| 1790 if (EQ_WITH_EBOLA_NOTICE (elt, list_elt)) | |
| 1791 return tail; | |
| 1792 } | |
| 1793 return Qnil; | |
| 1794 } | |
| 1795 | |
| 1796 DEFUN ("assoc", Fassoc, 2, 2, 0, /* | |
| 444 | 1797 Return non-nil if KEY is `equal' to the car of an element of ALIST. |
| 1798 The value is actually the element of ALIST whose car equals KEY. | |
| 428 | 1799 */ |
| 444 | 1800 (key, alist)) |
| 428 | 1801 { |
| 1802 /* This function can GC. */ | |
| 444 | 1803 EXTERNAL_ALIST_LOOP_4 (elt, elt_car, elt_cdr, alist) |
| 428 | 1804 { |
| 1805 if (internal_equal (key, elt_car, 0)) | |
| 1806 return elt; | |
| 1807 } | |
| 1808 return Qnil; | |
| 1809 } | |
| 1810 | |
| 1811 DEFUN ("old-assoc", Fold_assoc, 2, 2, 0, /* | |
| 444 | 1812 Return non-nil if KEY is `old-equal' to the car of an element of ALIST. |
| 1813 The value is actually the element of ALIST whose car equals KEY. | |
| 428 | 1814 */ |
| 444 | 1815 (key, alist)) |
| 428 | 1816 { |
| 1817 /* This function can GC. */ | |
| 444 | 1818 EXTERNAL_ALIST_LOOP_4 (elt, elt_car, elt_cdr, alist) |
| 428 | 1819 { |
| 1820 if (internal_old_equal (key, elt_car, 0)) | |
| 1821 return elt; | |
| 1822 } | |
| 1823 return Qnil; | |
| 1824 } | |
| 1825 | |
| 1826 Lisp_Object | |
| 444 | 1827 assoc_no_quit (Lisp_Object key, Lisp_Object alist) |
| 428 | 1828 { |
| 1829 int speccount = specpdl_depth (); | |
| 1830 specbind (Qinhibit_quit, Qt); | |
| 771 | 1831 return unbind_to_1 (speccount, Fassoc (key, alist)); |
| 428 | 1832 } |
| 1833 | |
| 1834 DEFUN ("assq", Fassq, 2, 2, 0, /* | |
| 444 | 1835 Return non-nil if KEY is `eq' to the car of an element of ALIST. |
| 1836 The value is actually the element of ALIST whose car is KEY. | |
| 1837 Elements of ALIST that are not conses are ignored. | |
| 428 | 1838 */ |
| 444 | 1839 (key, alist)) |
| 428 | 1840 { |
| 444 | 1841 EXTERNAL_ALIST_LOOP_4 (elt, elt_car, elt_cdr, alist) |
| 428 | 1842 { |
| 1843 if (EQ_WITH_EBOLA_NOTICE (key, elt_car)) | |
| 1844 return elt; | |
| 1845 } | |
| 1846 return Qnil; | |
| 1847 } | |
| 1848 | |
| 1849 DEFUN ("old-assq", Fold_assq, 2, 2, 0, /* | |
| 444 | 1850 Return non-nil if KEY is `old-eq' to the car of an element of ALIST. |
| 1851 The value is actually the element of ALIST whose car is KEY. | |
| 1852 Elements of ALIST that are not conses are ignored. | |
| 428 | 1853 This function is provided only for byte-code compatibility with v19. |
| 1854 Do not use it. | |
| 1855 */ | |
| 444 | 1856 (key, alist)) |
| 428 | 1857 { |
| 444 | 1858 EXTERNAL_ALIST_LOOP_4 (elt, elt_car, elt_cdr, alist) |
| 428 | 1859 { |
| 1860 if (HACKEQ_UNSAFE (key, elt_car)) | |
| 1861 return elt; | |
| 1862 } | |
| 1863 return Qnil; | |
| 1864 } | |
| 1865 | |
| 1866 /* Like Fassq but never report an error and do not allow quits. | |
| 1867 Use only on lists known never to be circular. */ | |
| 1868 | |
| 1869 Lisp_Object | |
| 444 | 1870 assq_no_quit (Lisp_Object key, Lisp_Object alist) |
| 428 | 1871 { |
| 1872 /* This cannot GC. */ | |
| 444 | 1873 LIST_LOOP_2 (elt, alist) |
| 428 | 1874 { |
| 1875 Lisp_Object elt_car = XCAR (elt); | |
| 1876 if (EQ_WITH_EBOLA_NOTICE (key, elt_car)) | |
| 1877 return elt; | |
| 1878 } | |
| 1879 return Qnil; | |
| 1880 } | |
| 1881 | |
| 1882 DEFUN ("rassoc", Frassoc, 2, 2, 0, /* | |
| 444 | 1883 Return non-nil if VALUE is `equal' to the cdr of an element of ALIST. |
| 1884 The value is actually the element of ALIST whose cdr equals VALUE. | |
| 428 | 1885 */ |
| 444 | 1886 (value, alist)) |
| 428 | 1887 { |
| 444 | 1888 EXTERNAL_ALIST_LOOP_4 (elt, elt_car, elt_cdr, alist) |
| 428 | 1889 { |
| 444 | 1890 if (internal_equal (value, elt_cdr, 0)) |
| 428 | 1891 return elt; |
| 1892 } | |
| 1893 return Qnil; | |
| 1894 } | |
| 1895 | |
| 1896 DEFUN ("old-rassoc", Fold_rassoc, 2, 2, 0, /* | |
| 444 | 1897 Return non-nil if VALUE is `old-equal' to the cdr of an element of ALIST. |
| 1898 The value is actually the element of ALIST whose cdr equals VALUE. | |
| 428 | 1899 */ |
| 444 | 1900 (value, alist)) |
| 428 | 1901 { |
| 444 | 1902 EXTERNAL_ALIST_LOOP_4 (elt, elt_car, elt_cdr, alist) |
| 428 | 1903 { |
| 444 | 1904 if (internal_old_equal (value, elt_cdr, 0)) |
| 428 | 1905 return elt; |
| 1906 } | |
| 1907 return Qnil; | |
| 1908 } | |
| 1909 | |
| 1910 DEFUN ("rassq", Frassq, 2, 2, 0, /* | |
| 444 | 1911 Return non-nil if VALUE is `eq' to the cdr of an element of ALIST. |
| 1912 The value is actually the element of ALIST whose cdr is VALUE. | |
| 428 | 1913 */ |
| 444 | 1914 (value, alist)) |
| 428 | 1915 { |
| 444 | 1916 EXTERNAL_ALIST_LOOP_4 (elt, elt_car, elt_cdr, alist) |
| 428 | 1917 { |
| 444 | 1918 if (EQ_WITH_EBOLA_NOTICE (value, elt_cdr)) |
| 428 | 1919 return elt; |
| 1920 } | |
| 1921 return Qnil; | |
| 1922 } | |
| 1923 | |
| 1924 DEFUN ("old-rassq", Fold_rassq, 2, 2, 0, /* | |
| 444 | 1925 Return non-nil if VALUE is `old-eq' to the cdr of an element of ALIST. |
| 1926 The value is actually the element of ALIST whose cdr is VALUE. | |
| 428 | 1927 */ |
| 444 | 1928 (value, alist)) |
| 428 | 1929 { |
| 444 | 1930 EXTERNAL_ALIST_LOOP_4 (elt, elt_car, elt_cdr, alist) |
| 428 | 1931 { |
| 444 | 1932 if (HACKEQ_UNSAFE (value, elt_cdr)) |
| 428 | 1933 return elt; |
| 1934 } | |
| 1935 return Qnil; | |
| 1936 } | |
| 1937 | |
| 444 | 1938 /* Like Frassq, but caller must ensure that ALIST is properly |
| 428 | 1939 nil-terminated and ebola-free. */ |
| 1940 Lisp_Object | |
| 444 | 1941 rassq_no_quit (Lisp_Object value, Lisp_Object alist) |
| 428 | 1942 { |
| 444 | 1943 LIST_LOOP_2 (elt, alist) |
| 428 | 1944 { |
| 1945 Lisp_Object elt_cdr = XCDR (elt); | |
| 444 | 1946 if (EQ_WITH_EBOLA_NOTICE (value, elt_cdr)) |
| 428 | 1947 return elt; |
| 1948 } | |
| 1949 return Qnil; | |
| 1950 } | |
| 1951 | |
| 1952 | |
| 1953 DEFUN ("delete", Fdelete, 2, 2, 0, /* | |
| 1954 Delete by side effect any occurrences of ELT as a member of LIST. | |
| 1955 The modified LIST is returned. Comparison is done with `equal'. | |
| 1956 If the first member of LIST is ELT, there is no way to remove it by side | |
| 1957 effect; therefore, write `(setq foo (delete element foo))' to be sure | |
| 1958 of changing the value of `foo'. | |
| 1959 Also see: `remove'. | |
| 1960 */ | |
| 1961 (elt, list)) | |
| 1962 { | |
| 1963 EXTERNAL_LIST_LOOP_DELETE_IF (list_elt, list, | |
| 1964 (internal_equal (elt, list_elt, 0))); | |
| 1965 return list; | |
| 1966 } | |
| 1967 | |
| 1968 DEFUN ("old-delete", Fold_delete, 2, 2, 0, /* | |
| 1969 Delete by side effect any occurrences of ELT as a member of LIST. | |
| 1970 The modified LIST is returned. Comparison is done with `old-equal'. | |
| 1971 If the first member of LIST is ELT, there is no way to remove it by side | |
| 1972 effect; therefore, write `(setq foo (old-delete element foo))' to be sure | |
| 1973 of changing the value of `foo'. | |
| 1974 */ | |
| 1975 (elt, list)) | |
| 1976 { | |
| 1977 EXTERNAL_LIST_LOOP_DELETE_IF (list_elt, list, | |
| 1978 (internal_old_equal (elt, list_elt, 0))); | |
| 1979 return list; | |
| 1980 } | |
| 1981 | |
| 1982 DEFUN ("delq", Fdelq, 2, 2, 0, /* | |
| 1983 Delete by side effect any occurrences of ELT as a member of LIST. | |
| 1984 The modified LIST is returned. Comparison is done with `eq'. | |
| 1985 If the first member of LIST is ELT, there is no way to remove it by side | |
| 1986 effect; therefore, write `(setq foo (delq element foo))' to be sure of | |
| 1987 changing the value of `foo'. | |
| 1988 */ | |
| 1989 (elt, list)) | |
| 1990 { | |
| 1991 EXTERNAL_LIST_LOOP_DELETE_IF (list_elt, list, | |
| 1992 (EQ_WITH_EBOLA_NOTICE (elt, list_elt))); | |
| 1993 return list; | |
| 1994 } | |
| 1995 | |
| 1996 DEFUN ("old-delq", Fold_delq, 2, 2, 0, /* | |
| 1997 Delete by side effect any occurrences of ELT as a member of LIST. | |
| 1998 The modified LIST is returned. Comparison is done with `old-eq'. | |
| 1999 If the first member of LIST is ELT, there is no way to remove it by side | |
| 2000 effect; therefore, write `(setq foo (old-delq element foo))' to be sure of | |
| 2001 changing the value of `foo'. | |
| 2002 */ | |
| 2003 (elt, list)) | |
| 2004 { | |
| 2005 EXTERNAL_LIST_LOOP_DELETE_IF (list_elt, list, | |
| 2006 (HACKEQ_UNSAFE (elt, list_elt))); | |
| 2007 return list; | |
| 2008 } | |
| 2009 | |
| 2010 /* Like Fdelq, but caller must ensure that LIST is properly | |
| 2011 nil-terminated and ebola-free. */ | |
| 2012 | |
| 2013 Lisp_Object | |
| 2014 delq_no_quit (Lisp_Object elt, Lisp_Object list) | |
| 2015 { | |
| 2016 LIST_LOOP_DELETE_IF (list_elt, list, | |
| 2017 (EQ_WITH_EBOLA_NOTICE (elt, list_elt))); | |
| 2018 return list; | |
| 2019 } | |
| 2020 | |
| 2021 /* Be VERY careful with this. This is like delq_no_quit() but | |
| 2022 also calls free_cons() on the removed conses. You must be SURE | |
| 2023 that no pointers to the freed conses remain around (e.g. | |
| 2024 someone else is pointing to part of the list). This function | |
| 2025 is useful on internal lists that are used frequently and where | |
| 2026 the actual list doesn't escape beyond known code bounds. */ | |
| 2027 | |
| 2028 Lisp_Object | |
| 2029 delq_no_quit_and_free_cons (Lisp_Object elt, Lisp_Object list) | |
| 2030 { | |
| 2031 REGISTER Lisp_Object tail = list; | |
| 2032 REGISTER Lisp_Object prev = Qnil; | |
| 2033 | |
| 2034 while (!NILP (tail)) | |
| 2035 { | |
| 2036 REGISTER Lisp_Object tem = XCAR (tail); | |
| 2037 if (EQ (elt, tem)) | |
| 2038 { | |
| 2039 Lisp_Object cons_to_free = tail; | |
| 2040 if (NILP (prev)) | |
| 2041 list = XCDR (tail); | |
| 2042 else | |
| 2043 XCDR (prev) = XCDR (tail); | |
| 2044 tail = XCDR (tail); | |
| 853 | 2045 free_cons (cons_to_free); |
| 428 | 2046 } |
| 2047 else | |
| 2048 { | |
| 2049 prev = tail; | |
| 2050 tail = XCDR (tail); | |
| 2051 } | |
| 2052 } | |
| 2053 return list; | |
| 2054 } | |
| 2055 | |
| 2056 DEFUN ("remassoc", Fremassoc, 2, 2, 0, /* | |
| 444 | 2057 Delete by side effect any elements of ALIST whose car is `equal' to KEY. |
| 2058 The modified ALIST is returned. If the first member of ALIST has a car | |
| 428 | 2059 that is `equal' to KEY, there is no way to remove it by side effect; |
| 2060 therefore, write `(setq foo (remassoc key foo))' to be sure of changing | |
| 2061 the value of `foo'. | |
| 2062 */ | |
| 444 | 2063 (key, alist)) |
| 428 | 2064 { |
| 444 | 2065 EXTERNAL_LIST_LOOP_DELETE_IF (elt, alist, |
| 428 | 2066 (CONSP (elt) && |
| 2067 internal_equal (key, XCAR (elt), 0))); | |
| 444 | 2068 return alist; |
| 428 | 2069 } |
| 2070 | |
| 2071 Lisp_Object | |
| 444 | 2072 remassoc_no_quit (Lisp_Object key, Lisp_Object alist) |
| 428 | 2073 { |
| 2074 int speccount = specpdl_depth (); | |
| 2075 specbind (Qinhibit_quit, Qt); | |
| 771 | 2076 return unbind_to_1 (speccount, Fremassoc (key, alist)); |
| 428 | 2077 } |
| 2078 | |
| 2079 DEFUN ("remassq", Fremassq, 2, 2, 0, /* | |
| 444 | 2080 Delete by side effect any elements of ALIST whose car is `eq' to KEY. |
| 2081 The modified ALIST is returned. If the first member of ALIST has a car | |
| 428 | 2082 that is `eq' to KEY, there is no way to remove it by side effect; |
| 2083 therefore, write `(setq foo (remassq key foo))' to be sure of changing | |
| 2084 the value of `foo'. | |
| 2085 */ | |
| 444 | 2086 (key, alist)) |
| 428 | 2087 { |
| 444 | 2088 EXTERNAL_LIST_LOOP_DELETE_IF (elt, alist, |
| 428 | 2089 (CONSP (elt) && |
| 2090 EQ_WITH_EBOLA_NOTICE (key, XCAR (elt)))); | |
| 444 | 2091 return alist; |
| 428 | 2092 } |
| 2093 | |
| 2094 /* no quit, no errors; be careful */ | |
| 2095 | |
| 2096 Lisp_Object | |
| 444 | 2097 remassq_no_quit (Lisp_Object key, Lisp_Object alist) |
| 428 | 2098 { |
| 444 | 2099 LIST_LOOP_DELETE_IF (elt, alist, |
| 428 | 2100 (CONSP (elt) && |
| 2101 EQ_WITH_EBOLA_NOTICE (key, XCAR (elt)))); | |
| 444 | 2102 return alist; |
| 428 | 2103 } |
| 2104 | |
| 2105 DEFUN ("remrassoc", Fremrassoc, 2, 2, 0, /* | |
| 444 | 2106 Delete by side effect any elements of ALIST whose cdr is `equal' to VALUE. |
| 2107 The modified ALIST is returned. If the first member of ALIST has a car | |
| 428 | 2108 that is `equal' to VALUE, there is no way to remove it by side effect; |
| 2109 therefore, write `(setq foo (remrassoc value foo))' to be sure of changing | |
| 2110 the value of `foo'. | |
| 2111 */ | |
| 444 | 2112 (value, alist)) |
| 428 | 2113 { |
| 444 | 2114 EXTERNAL_LIST_LOOP_DELETE_IF (elt, alist, |
| 428 | 2115 (CONSP (elt) && |
| 2116 internal_equal (value, XCDR (elt), 0))); | |
| 444 | 2117 return alist; |
| 428 | 2118 } |
| 2119 | |
| 2120 DEFUN ("remrassq", Fremrassq, 2, 2, 0, /* | |
| 444 | 2121 Delete by side effect any elements of ALIST whose cdr is `eq' to VALUE. |
| 2122 The modified ALIST is returned. If the first member of ALIST has a car | |
| 428 | 2123 that is `eq' to VALUE, there is no way to remove it by side effect; |
| 2124 therefore, write `(setq foo (remrassq value foo))' to be sure of changing | |
| 2125 the value of `foo'. | |
| 2126 */ | |
| 444 | 2127 (value, alist)) |
| 428 | 2128 { |
| 444 | 2129 EXTERNAL_LIST_LOOP_DELETE_IF (elt, alist, |
| 428 | 2130 (CONSP (elt) && |
| 2131 EQ_WITH_EBOLA_NOTICE (value, XCDR (elt)))); | |
| 444 | 2132 return alist; |
| 428 | 2133 } |
| 2134 | |
| 2135 /* Like Fremrassq, fast and unsafe; be careful */ | |
| 2136 Lisp_Object | |
| 444 | 2137 remrassq_no_quit (Lisp_Object value, Lisp_Object alist) |
| 428 | 2138 { |
| 444 | 2139 LIST_LOOP_DELETE_IF (elt, alist, |
| 428 | 2140 (CONSP (elt) && |
| 2141 EQ_WITH_EBOLA_NOTICE (value, XCDR (elt)))); | |
| 444 | 2142 return alist; |
| 428 | 2143 } |
| 2144 | |
| 2145 DEFUN ("nreverse", Fnreverse, 1, 1, 0, /* | |
|
5300
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2146 Reverse SEQUENCE, destructively. |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2147 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2148 Return the beginning of the reversed sequence, which will be a distinct Lisp |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2149 object if SEQUENCE is a list with length greater than one. See also |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2150 `reverse', the non-destructive version of this function. |
| 428 | 2151 */ |
|
5300
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2152 (sequence)) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2153 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2154 CHECK_SEQUENCE (sequence); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2155 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2156 if (CONSP (sequence)) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2157 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2158 struct gcpro gcpro1, gcpro2; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2159 Lisp_Object prev = Qnil; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2160 Lisp_Object tail = sequence; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2161 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2162 /* We gcpro our args; see `nconc' */ |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2163 GCPRO2 (prev, tail); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2164 while (!NILP (tail)) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2165 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2166 REGISTER Lisp_Object next; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2167 CONCHECK_CONS (tail); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2168 next = XCDR (tail); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2169 XCDR (tail) = prev; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2170 prev = tail; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2171 tail = next; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2172 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2173 UNGCPRO; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2174 return prev; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2175 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2176 else if (VECTORP (sequence)) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2177 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2178 Elemcount length = XVECTOR_LENGTH (sequence), ii = length; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2179 Elemcount half = length / 2; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2180 Lisp_Object swap = Qnil; |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
2181 CHECK_LISP_WRITEABLE (sequence); |
|
5300
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2182 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2183 while (ii > half) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2184 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2185 swap = XVECTOR_DATA (sequence) [length - ii]; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2186 XVECTOR_DATA (sequence) [length - ii] |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2187 = XVECTOR_DATA (sequence) [ii - 1]; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2188 XVECTOR_DATA (sequence) [ii - 1] = swap; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2189 --ii; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2190 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2191 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2192 else if (STRINGP (sequence)) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2193 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2194 Elemcount length = XSTRING_LENGTH (sequence); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2195 Ibyte *staging = alloca_ibytes (length), *staging_end = staging + length; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2196 Ibyte *cursor = XSTRING_DATA (sequence), *endp = cursor + length; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2197 |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
2198 CHECK_LISP_WRITEABLE (sequence); |
|
5300
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2199 while (cursor < endp) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2200 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2201 staging_end -= itext_ichar_len (cursor); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2202 itext_copy_ichar (cursor, staging_end); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2203 INC_IBYTEPTR (cursor); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2204 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2205 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2206 assert (staging == staging_end); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2207 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2208 memcpy (XSTRING_DATA (sequence), staging, length); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2209 init_string_ascii_begin (sequence); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2210 bump_string_modiff (sequence); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2211 sledgehammer_check_ascii_begin (sequence); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2212 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2213 else if (BIT_VECTORP (sequence)) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2214 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2215 Lisp_Bit_Vector *bv = XBIT_VECTOR (sequence); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2216 Elemcount length = bit_vector_length (bv), ii = length; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2217 Elemcount half = length / 2; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2218 int swap = 0; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2219 |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
2220 CHECK_LISP_WRITEABLE (sequence); |
|
5300
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2221 while (ii > half) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2222 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2223 swap = bit_vector_bit (bv, length - ii); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2224 set_bit_vector_bit (bv, length - ii, bit_vector_bit (bv, ii - 1)); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2225 set_bit_vector_bit (bv, ii - 1, swap); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2226 --ii; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2227 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2228 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2229 else |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2230 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2231 assert (NILP (sequence)); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2232 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2233 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2234 return sequence; |
| 428 | 2235 } |
| 2236 | |
| 2237 DEFUN ("reverse", Freverse, 1, 1, 0, /* | |
|
5300
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2238 Reverse SEQUENCE, copying. Return the reversed sequence. |
| 428 | 2239 See also the function `nreverse', which is used more often. |
| 2240 */ | |
|
5300
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2241 (sequence)) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2242 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2243 Lisp_Object result = Qnil; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2244 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2245 CHECK_SEQUENCE (sequence); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2246 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2247 if (CONSP (sequence)) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2248 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2249 EXTERNAL_LIST_LOOP_2 (elt, sequence) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2250 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2251 result = Fcons (elt, result); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2252 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2253 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2254 else if (VECTORP (sequence)) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2255 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2256 Elemcount length = XVECTOR_LENGTH (sequence), ii = length; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2257 Lisp_Object *staging = alloca_array (Lisp_Object, length); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2258 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2259 while (ii > 0) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2260 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2261 staging[length - ii] = XVECTOR_DATA (sequence) [ii - 1]; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2262 --ii; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2263 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2264 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2265 result = Fvector (length, staging); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2266 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2267 else if (STRINGP (sequence)) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2268 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2269 Elemcount length = XSTRING_LENGTH (sequence); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2270 Ibyte *staging = alloca_ibytes (length), *staging_end = staging + length; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2271 Ibyte *cursor = XSTRING_DATA (sequence), *endp = cursor + length; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2272 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2273 while (cursor < endp) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2274 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2275 staging_end -= itext_ichar_len (cursor); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2276 itext_copy_ichar (cursor, staging_end); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2277 INC_IBYTEPTR (cursor); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2278 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2279 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2280 assert (staging == staging_end); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2281 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2282 result = make_string (staging, length); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2283 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2284 else if (BIT_VECTORP (sequence)) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2285 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2286 Lisp_Bit_Vector *bv = XBIT_VECTOR (sequence), *res; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2287 Elemcount length = bit_vector_length (bv), ii = length; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2288 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2289 result = make_bit_vector (length, Qzero); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2290 res = XBIT_VECTOR (result); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2291 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2292 while (ii > 0) |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2293 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2294 set_bit_vector_bit (res, length - ii, bit_vector_bit (bv, ii - 1)); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2295 --ii; |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2296 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2297 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2298 else |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2299 { |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2300 assert (NILP (sequence)); |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2301 } |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2302 |
|
9f738305f80f
Accept sequences generally, not just lists, #'reverse, #'nreverse.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5299
diff
changeset
|
2303 return result; |
| 428 | 2304 } |
| 2305 | |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2306 static Lisp_Object |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2307 c_merge_predicate_key (Lisp_Object obj1, Lisp_Object obj2, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2308 Lisp_Object pred, Lisp_Object key_func) |
| 428 | 2309 { |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2310 struct gcpro gcpro1; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2311 Lisp_Object args[3]; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2312 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2313 /* We could use call2() and call3() here, but we're called O(nlogn) times |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2314 for a sequence of length n, it make some sense to inline them. */ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2315 args[0] = key_func; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2316 args[1] = obj1; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2317 args[2] = Qnil; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2318 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2319 GCPRO1 (args[0]); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2320 gcpro1.nvars = countof (args); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2321 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2322 obj1 = IGNORE_MULTIPLE_VALUES (Ffuncall (2, args)); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2323 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2324 args[1] = obj2; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2325 obj2 = IGNORE_MULTIPLE_VALUES (Ffuncall (2, args)); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2326 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2327 args[0] = pred; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2328 args[1] = obj1; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2329 args[2] = obj2; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2330 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2331 RETURN_UNGCPRO (IGNORE_MULTIPLE_VALUES (Ffuncall (countof (args), args))); |
| 428 | 2332 } |
| 2333 | |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2334 static Lisp_Object |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2335 c_merge_predicate_nokey (Lisp_Object obj1, Lisp_Object obj2, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2336 Lisp_Object pred, Lisp_Object UNUSED (key_func)) |
| 428 | 2337 { |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2338 struct gcpro gcpro1; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2339 Lisp_Object args[3]; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2340 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2341 /* This is (almost) the implementation of call2, it makes some sense to |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2342 inline it here. */ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2343 args[0] = pred; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2344 args[1] = obj1; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2345 args[2] = obj2; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2346 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2347 GCPRO1 (args[0]); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2348 gcpro1.nvars = countof (args); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2349 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2350 RETURN_UNGCPRO (IGNORE_MULTIPLE_VALUES (Ffuncall (countof (args), args))); |
| 428 | 2351 } |
| 2352 | |
| 2353 Lisp_Object | |
| 2354 list_merge (Lisp_Object org_l1, Lisp_Object org_l2, | |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2355 Lisp_Object (*c_predicate) (Lisp_Object, Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2356 Lisp_Object, Lisp_Object), |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2357 Lisp_Object predicate, Lisp_Object key_func) |
| 428 | 2358 { |
| 2359 Lisp_Object value; | |
| 2360 Lisp_Object tail; | |
| 2361 Lisp_Object tem; | |
| 2362 Lisp_Object l1, l2; | |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2363 Lisp_Object tortoises[2]; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2364 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; |
|
5283
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2365 int l1_count = 0, l2_count = 0; |
| 428 | 2366 |
| 2367 l1 = org_l1; | |
| 2368 l2 = org_l2; | |
| 2369 tail = Qnil; | |
| 2370 value = Qnil; | |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2371 tortoises[0] = org_l1; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2372 tortoises[1] = org_l2; |
| 428 | 2373 |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2374 if (NULL == c_predicate) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2375 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2376 c_predicate = EQ (key_func, Qidentity) ? |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2377 c_merge_predicate_nokey : c_merge_predicate_key; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2378 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2379 |
| 428 | 2380 /* It is sufficient to protect org_l1 and org_l2. |
| 2381 When l1 and l2 are updated, we copy the new values | |
| 2382 back into the org_ vars. */ | |
| 2383 | |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2384 GCPRO5 (org_l1, org_l2, predicate, value, tortoises[0]); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2385 gcpro5.nvars = 2; |
| 428 | 2386 |
| 2387 while (1) | |
| 2388 { | |
| 2389 if (NILP (l1)) | |
| 2390 { | |
| 2391 UNGCPRO; | |
| 2392 if (NILP (tail)) | |
| 2393 return l2; | |
| 2394 Fsetcdr (tail, l2); | |
| 2395 return value; | |
| 2396 } | |
| 2397 if (NILP (l2)) | |
| 2398 { | |
| 2399 UNGCPRO; | |
| 2400 if (NILP (tail)) | |
| 2401 return l1; | |
| 2402 Fsetcdr (tail, l1); | |
| 2403 return value; | |
| 2404 } | |
| 2405 | |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2406 if (NILP (c_predicate (Fcar (l2), Fcar (l1), predicate, key_func))) |
| 428 | 2407 { |
| 2408 tem = l1; | |
| 2409 l1 = Fcdr (l1); | |
| 2410 org_l1 = l1; | |
|
5283
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2411 |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2412 if (l1_count++ > CIRCULAR_LIST_SUSPICION_LENGTH) |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2413 { |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2414 if (l1_count & 1) |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2415 { |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2416 if (!CONSP (tortoises[0])) |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2417 { |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2418 mapping_interaction_error (Qmerge, tortoises[0]); |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2419 } |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2420 |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2421 tortoises[0] = XCDR (tortoises[0]); |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2422 } |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2423 |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2424 if (EQ (org_l1, tortoises[0])) |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2425 { |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2426 signal_circular_list_error (org_l1); |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2427 } |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2428 } |
| 428 | 2429 } |
| 2430 else | |
| 2431 { | |
| 2432 tem = l2; | |
| 2433 l2 = Fcdr (l2); | |
| 2434 org_l2 = l2; | |
|
5283
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2435 |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2436 if (l2_count++ > CIRCULAR_LIST_SUSPICION_LENGTH) |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2437 { |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2438 if (l2_count & 1) |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2439 { |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2440 if (!CONSP (tortoises[1])) |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2441 { |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2442 mapping_interaction_error (Qmerge, tortoises[1]); |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2443 } |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2444 |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2445 tortoises[1] = XCDR (tortoises[1]); |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2446 } |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2447 |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2448 if (EQ (org_l2, tortoises[1])) |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2449 { |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2450 signal_circular_list_error (org_l2); |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2451 } |
|
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2452 } |
| 428 | 2453 } |
|
5283
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2454 |
| 428 | 2455 if (NILP (tail)) |
| 2456 value = tem; | |
| 2457 else | |
| 2458 Fsetcdr (tail, tem); | |
|
5283
be436ac36ba4
Don't share a counter when checking for circularity, list_merge().
Aidan Kehoe <kehoea@parhasard.net>
parents:
5277
diff
changeset
|
2459 |
| 428 | 2460 tail = tem; |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2461 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2462 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2463 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2464 static void |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2465 array_merge (Lisp_Object *dest, Elemcount dest_len, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2466 Lisp_Object *front, Elemcount front_len, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2467 Lisp_Object *back, Elemcount back_len, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2468 Lisp_Object (*c_predicate) (Lisp_Object, Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2469 Lisp_Object, Lisp_Object), |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2470 Lisp_Object predicate, Lisp_Object key_func) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2471 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2472 Elemcount ii, fronting, backing; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2473 Lisp_Object *front_staging = front; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2474 Lisp_Object *back_staging = back; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2475 struct gcpro gcpro1, gcpro2; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2476 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2477 assert (dest_len == (back_len + front_len)); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2478 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2479 if (0 == dest_len) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2480 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2481 return; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2482 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2483 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2484 if (front >= dest && front < (dest + dest_len)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2485 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2486 front_staging = alloca_array (Lisp_Object, front_len); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2487 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2488 for (ii = 0; ii < front_len; ++ii) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2489 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2490 front_staging[ii] = front[ii]; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2491 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2492 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2493 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2494 if (back >= dest && back < (dest + dest_len)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2495 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2496 back_staging = alloca_array (Lisp_Object, back_len); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2497 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2498 for (ii = 0; ii < back_len; ++ii) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2499 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2500 back_staging[ii] = back[ii]; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2501 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2502 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2503 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2504 GCPRO2 (front_staging[0], back_staging[0]); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2505 gcpro1.nvars = front_len; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2506 gcpro2.nvars = back_len; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2507 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2508 for (ii = fronting = backing = 0; ii < dest_len; ++ii) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2509 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2510 if (fronting >= front_len) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2511 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2512 while (ii < dest_len) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2513 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2514 dest[ii] = back_staging[backing]; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2515 ++ii, ++backing; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2516 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2517 UNGCPRO; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2518 return; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2519 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2520 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2521 if (backing >= back_len) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2522 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2523 while (ii < dest_len) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2524 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2525 dest[ii] = front_staging[fronting]; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2526 ++ii, ++fronting; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2527 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2528 UNGCPRO; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2529 return; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2530 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2531 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2532 if (NILP (c_predicate (back_staging[backing], front_staging[fronting], |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2533 predicate, key_func))) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2534 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2535 dest[ii] = front_staging[fronting]; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2536 ++fronting; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2537 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2538 else |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2539 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2540 dest[ii] = back_staging[backing]; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2541 ++backing; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2542 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2543 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2544 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2545 UNGCPRO; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2546 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2547 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2548 static Lisp_Object |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2549 list_array_merge_into_list (Lisp_Object list, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2550 Lisp_Object *array, Elemcount array_len, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2551 Lisp_Object (*c_predicate) (Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2552 Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2553 Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2554 Lisp_Object), |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2555 Lisp_Object predicate, Lisp_Object key_func, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2556 Boolint reverse_order) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2557 { |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2558 Lisp_Object tail = Qnil, value = Qnil, tortoise = list; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2559 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2560 Elemcount array_index = 0; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2561 int looped = 0; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2562 |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2563 GCPRO4 (list, tail, value, tortoise); |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2564 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2565 while (1) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2566 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2567 if (NILP (list)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2568 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2569 UNGCPRO; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2570 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2571 if (NILP (tail)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2572 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2573 return Flist (array_len, array); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2574 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2575 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2576 Fsetcdr (tail, Flist (array_len - array_index, array + array_index)); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2577 return value; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2578 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2579 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2580 if (array_index >= array_len) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2581 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2582 UNGCPRO; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2583 if (NILP (tail)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2584 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2585 return list; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2586 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2587 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2588 Fsetcdr (tail, list); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2589 return value; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2590 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2591 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2592 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2593 if (reverse_order ? |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2594 !NILP (c_predicate (Fcar (list), array [array_index], predicate, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2595 key_func)) : |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2596 NILP (c_predicate (array [array_index], Fcar (list), predicate, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2597 key_func))) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2598 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2599 if (NILP (tail)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2600 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2601 value = tail = list; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2602 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2603 else |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2604 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2605 Fsetcdr (tail, list); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2606 tail = XCDR (tail); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2607 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2608 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2609 list = Fcdr (list); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2610 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2611 else |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2612 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2613 if (NILP (tail)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2614 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2615 value = tail = Fcons (array [array_index], Qnil); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2616 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2617 else |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2618 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2619 Fsetcdr (tail, Fcons (array [array_index], tail)); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2620 tail = XCDR (tail); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2621 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2622 ++array_index; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2623 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2624 |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2625 if (++looped > CIRCULAR_LIST_SUSPICION_LENGTH) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2626 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2627 if (looped & 1) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2628 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2629 tortoise = XCDR (tortoise); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2630 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2631 |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2632 if (EQ (list, tortoise)) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2633 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2634 signal_circular_list_error (list); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2635 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2636 } |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2637 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2638 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2639 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2640 static void |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2641 list_list_merge_into_array (Lisp_Object *output, Elemcount output_len, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2642 Lisp_Object list_one, Lisp_Object list_two, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2643 Lisp_Object (*c_predicate) (Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2644 Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2645 Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2646 Lisp_Object), |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2647 Lisp_Object predicate, Lisp_Object key_func) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2648 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2649 Elemcount output_index = 0; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2650 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2651 while (output_index < output_len) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2652 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2653 if (NILP (list_one)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2654 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2655 while (output_index < output_len) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2656 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2657 output [output_index] = Fcar (list_two); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2658 list_two = Fcdr (list_two), ++output_index; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2659 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2660 return; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2661 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2662 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2663 if (NILP (list_two)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2664 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2665 while (output_index < output_len) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2666 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2667 output [output_index] = Fcar (list_one); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2668 list_one = Fcdr (list_one), ++output_index; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2669 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2670 return; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2671 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2672 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2673 if (NILP (c_predicate (Fcar (list_two), Fcar (list_one), predicate, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2674 key_func))) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2675 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2676 output [output_index] = XCAR (list_one); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2677 list_one = XCDR (list_one); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2678 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2679 else |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2680 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2681 output [output_index] = XCAR (list_two); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2682 list_two = XCDR (list_two); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2683 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2684 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2685 ++output_index; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2686 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2687 /* No need to check for circularity. */ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2688 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2689 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2690 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2691 static void |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2692 list_array_merge_into_array (Lisp_Object *output, Elemcount output_len, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2693 Lisp_Object list, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2694 Lisp_Object *array, Elemcount array_len, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2695 Lisp_Object (*c_predicate) (Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2696 Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2697 Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2698 Lisp_Object), |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2699 Lisp_Object predicate, Lisp_Object key_func, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2700 Boolint reverse_order) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2701 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2702 Elemcount output_index = 0, array_index = 0; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2703 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2704 while (output_index < output_len) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2705 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2706 if (NILP (list)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2707 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2708 if (array_len - array_index != output_len - output_index) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2709 { |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
2710 mapping_interaction_error (Qmerge, list); |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2711 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2712 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2713 while (array_index < array_len) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2714 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2715 output [output_index++] = array [array_index++]; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2716 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2717 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2718 return; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2719 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2720 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2721 if (array_index >= array_len) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2722 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2723 while (output_index < output_len) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2724 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2725 output [output_index++] = Fcar (list); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2726 list = Fcdr (list); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2727 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2728 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2729 return; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2730 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2731 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2732 if (reverse_order ? |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2733 !NILP (c_predicate (Fcar (list), array [array_index], predicate, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2734 key_func)) : |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2735 NILP (c_predicate (array [array_index], Fcar (list), predicate, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2736 key_func))) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2737 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2738 output [output_index] = XCAR (list); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2739 list = XCDR (list); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2740 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2741 else |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2742 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2743 output [output_index] = array [array_index]; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2744 ++array_index; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2745 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2746 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2747 ++output_index; |
| 428 | 2748 } |
| 2749 } | |
| 2750 | |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2751 #define STRING_DATA_TO_OBJECT_ARRAY(strdata, c_array, counter, len) \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2752 do { \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2753 c_array = alloca_array (Lisp_Object, len); \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2754 for (counter = 0; counter < len; ++counter) \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2755 { \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2756 c_array[counter] = make_char (itext_ichar (strdata)); \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2757 INC_IBYTEPTR (strdata); \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2758 } \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2759 } while (0) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2760 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2761 #define BIT_VECTOR_TO_OBJECT_ARRAY(v, c_array, counter, len) do { \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2762 c_array = alloca_array (Lisp_Object, len); \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2763 for (counter = 0; counter < len; ++counter) \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2764 { \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2765 c_array[counter] = make_int (bit_vector_bit (v, counter)); \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2766 } \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2767 } while (0) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2768 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2769 /* This macro might eventually find a better home than here. */ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2770 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
2771 #define CHECK_KEY_ARGUMENT(key) \ |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2772 do { \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2773 if (NILP (key)) \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2774 { \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2775 key = Qidentity; \ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2776 } \ |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
2777 \ |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
2778 if (!EQ (key, Qidentity)) \ |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
2779 { \ |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
2780 key = indirect_function (key, 1); \ |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
2781 } \ |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2782 } while (0) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2783 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2784 DEFUN ("merge", Fmerge, 4, MANY, 0, /* |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2785 Destructively merge SEQUENCE-ONE and SEQUENCE-TWO, producing a new sequence. |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2786 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2787 TYPE is the type of sequence to return. PREDICATE is a `less-than' |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2788 predicate on the elements. |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2789 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2790 Optional keyword argument KEY is a function used to extract an object to be |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2791 used for comparison from each element of SEQUENCE-ONE and SEQUENCE-TWO. |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2792 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2793 arguments: (TYPE SEQUENCE-ONE SEQUENCE-TWO PREDICATE &key (KEY #'IDENTITY)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2794 */ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2795 (int nargs, Lisp_Object *args)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2796 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2797 Lisp_Object type = args[0], sequence_one = args[1], sequence_two = args[2], |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2798 predicate = args[3], result = Qnil; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2799 Lisp_Object (*c_predicate) (Lisp_Object, Lisp_Object, Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2800 Lisp_Object); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2801 |
|
5277
d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5275
diff
changeset
|
2802 PARSE_KEYWORDS (Fmerge, nargs, args, 1, (key), NULL); |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2803 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2804 CHECK_SEQUENCE (sequence_one); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2805 CHECK_SEQUENCE (sequence_two); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2806 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
2807 CHECK_KEY_ARGUMENT (key); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
2808 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
2809 c_predicate = EQ (key, Qidentity) ? |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
2810 c_merge_predicate_nokey : c_merge_predicate_key; |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2811 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2812 if (EQ (type, Qlist) && (LISTP (sequence_one) || LISTP (sequence_two))) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2813 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2814 if (NILP (sequence_two)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2815 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2816 result = Fappend (2, args + 1); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2817 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2818 else if (NILP (sequence_one)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2819 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2820 args[3] = Qnil; /* Overwriting PREDICATE, and losing its GC |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2821 protection, but that doesn't matter. */ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2822 result = Fappend (2, args + 2); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2823 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2824 else if (CONSP (sequence_one) && CONSP (sequence_two)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2825 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2826 result = list_merge (sequence_one, sequence_two, c_predicate, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2827 predicate, key); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2828 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2829 else |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2830 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2831 Lisp_Object *array_storage, swap; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2832 Elemcount array_length, i; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2833 Boolint reverse_order = 0; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2834 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2835 if (!CONSP (sequence_one)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2836 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2837 /* Make sequence_one the cons, sequence_two the array: */ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2838 swap = sequence_one; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2839 sequence_one = sequence_two; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2840 sequence_two = swap; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2841 reverse_order = 1; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2842 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2843 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2844 if (VECTORP (sequence_two)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2845 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2846 array_storage = XVECTOR_DATA (sequence_two); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2847 array_length = XVECTOR_LENGTH (sequence_two); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2848 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2849 else if (STRINGP (sequence_two)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2850 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2851 Ibyte *strdata = XSTRING_DATA (sequence_two); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2852 array_length = string_char_length (sequence_two); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2853 /* No need to GCPRO, characters are immediate. */ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2854 STRING_DATA_TO_OBJECT_ARRAY (strdata, array_storage, i, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2855 array_length); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2856 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2857 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2858 else |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2859 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2860 Lisp_Bit_Vector *v = XBIT_VECTOR (sequence_two); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2861 array_length = bit_vector_length (v); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2862 /* No need to GCPRO, fixnums are immediate. */ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2863 BIT_VECTOR_TO_OBJECT_ARRAY (v, array_storage, i, array_length); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2864 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2865 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2866 result = list_array_merge_into_list (sequence_one, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2867 array_storage, array_length, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2868 c_predicate, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2869 predicate, key, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2870 reverse_order); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2871 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2872 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2873 else |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2874 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2875 Elemcount sequence_one_len = XINT (Flength (sequence_one)), |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2876 sequence_two_len = XINT (Flength (sequence_two)), i; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2877 Elemcount output_len = 1 + sequence_one_len + sequence_two_len; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2878 Lisp_Object *output = alloca_array (Lisp_Object, output_len), |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2879 *sequence_one_storage = NULL, *sequence_two_storage = NULL; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2880 Boolint do_coerce = !(EQ (type, Qvector) || EQ (type, Qstring) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2881 || EQ (type, Qbit_vector) || EQ (type, Qlist)); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2882 Ibyte *strdata = NULL; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2883 Lisp_Bit_Vector *v = NULL; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2884 struct gcpro gcpro1; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2885 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2886 output[0] = do_coerce ? Qlist : type; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2887 for (i = 1; i < output_len; ++i) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2888 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2889 output[i] = Qnil; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2890 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2891 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2892 GCPRO1 (output[0]); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2893 gcpro1.nvars = output_len; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2894 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2895 if (VECTORP (sequence_one)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2896 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2897 sequence_one_storage = XVECTOR_DATA (sequence_one); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2898 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2899 else if (STRINGP (sequence_one)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2900 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2901 strdata = XSTRING_DATA (sequence_one); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2902 STRING_DATA_TO_OBJECT_ARRAY (strdata, sequence_one_storage, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2903 i, sequence_one_len); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2904 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2905 else if (BIT_VECTORP (sequence_one)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2906 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2907 v = XBIT_VECTOR (sequence_one); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2908 BIT_VECTOR_TO_OBJECT_ARRAY (v, sequence_one_storage, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2909 i, sequence_one_len); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2910 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2911 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2912 if (VECTORP (sequence_two)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2913 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2914 sequence_two_storage = XVECTOR_DATA (sequence_two); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2915 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2916 else if (STRINGP (sequence_two)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2917 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2918 strdata = XSTRING_DATA (sequence_two); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2919 STRING_DATA_TO_OBJECT_ARRAY (strdata, sequence_two_storage, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2920 i, sequence_two_len); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2921 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2922 else if (BIT_VECTORP (sequence_two)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2923 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2924 v = XBIT_VECTOR (sequence_two); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2925 BIT_VECTOR_TO_OBJECT_ARRAY (v, sequence_two_storage, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2926 i, sequence_two_len); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2927 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2928 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2929 if (LISTP (sequence_one) && LISTP (sequence_two)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2930 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2931 list_list_merge_into_array (output + 1, output_len - 1, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2932 sequence_one, sequence_two, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2933 c_predicate, predicate, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2934 key); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2935 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2936 else if (LISTP (sequence_one)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2937 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2938 list_array_merge_into_array (output + 1, output_len - 1, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2939 sequence_one, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2940 sequence_two_storage, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2941 sequence_two_len, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2942 c_predicate, predicate, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2943 key, 0); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2944 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2945 else if (LISTP (sequence_two)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2946 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2947 list_array_merge_into_array (output + 1, output_len - 1, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2948 sequence_two, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2949 sequence_one_storage, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2950 sequence_one_len, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2951 c_predicate, predicate, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2952 key, 1); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2953 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2954 else |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2955 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2956 array_merge (output + 1, output_len - 1, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2957 sequence_one_storage, sequence_one_len, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2958 sequence_two_storage, sequence_two_len, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2959 c_predicate, predicate, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2960 key); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2961 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2962 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2963 result = Ffuncall (output_len, output); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2964 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2965 if (do_coerce) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2966 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2967 result = call2 (Qcoerce, result, type); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2968 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2969 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2970 UNGCPRO; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2971 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2972 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2973 return result; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2974 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2975 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2976 /* The sort function should return non-nil if OBJ1 < OBJ2, nil otherwise. |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2977 NOTE: This is backwards from the way qsort() works. */ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2978 Lisp_Object |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2979 list_sort (Lisp_Object list, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2980 Lisp_Object (*c_predicate) (Lisp_Object, Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2981 Lisp_Object, Lisp_Object), |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2982 Lisp_Object predicate, Lisp_Object key_func) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2983 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2984 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2985 Lisp_Object back, tem; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2986 Lisp_Object front = list; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2987 Lisp_Object len = Flength (list); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2988 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2989 if (XINT (len) < 2) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2990 return list; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2991 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2992 if (NULL == c_predicate) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2993 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2994 c_predicate = EQ (key_func, Qidentity) ? c_merge_predicate_nokey : |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2995 c_merge_predicate_key; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2996 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2997 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2998 len = make_int (XINT (len) / 2 - 1); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
2999 tem = Fnthcdr (len, list); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3000 back = Fcdr (tem); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3001 Fsetcdr (tem, Qnil); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3002 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3003 GCPRO4 (front, back, predicate, key_func); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3004 front = list_sort (front, c_predicate, predicate, key_func); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3005 back = list_sort (back, c_predicate, predicate, key_func); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3006 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3007 RETURN_UNGCPRO (list_merge (front, back, c_predicate, predicate, key_func)); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3008 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3009 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3010 static void |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3011 array_sort (Lisp_Object *array, Elemcount array_len, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3012 Lisp_Object (*c_predicate) (Lisp_Object, Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3013 Lisp_Object, Lisp_Object), |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3014 Lisp_Object predicate, Lisp_Object key_func) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3015 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3016 Elemcount split; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3017 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3018 if (array_len < 2) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3019 return; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3020 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3021 split = array_len / 2; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3022 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3023 array_sort (array, split, c_predicate, predicate, key_func); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3024 array_sort (array + split, array_len - split, c_predicate, predicate, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3025 key_func); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3026 array_merge (array, array_len, array, split, array + split, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3027 array_len - split, c_predicate, predicate, key_func); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3028 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3029 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3030 DEFUN ("sort*", FsortX, 2, MANY, 0, /* |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3031 Sort SEQUENCE, comparing elements using PREDICATE. |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3032 Returns the sorted sequence. SEQUENCE is modified by side effect. |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3033 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3034 PREDICATE is called with two elements of SEQUENCE, and should return t if |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3035 the first element is `less' than the second. |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3036 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3037 Optional keyword argument KEY is a function used to extract an object to be |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3038 used for comparison from each element of SEQUENCE. |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3039 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3040 In this implementation, sorting is always stable; but call `stable-sort' if |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3041 this stability is important to you, other implementations may not make the |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3042 same guarantees. |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3043 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3044 arguments: (SEQUENCE PREDICATE &key (KEY #'IDENTITY)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3045 */ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3046 (int nargs, Lisp_Object *args)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3047 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3048 Lisp_Object sequence = args[0], predicate = args[1]; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3049 Lisp_Object *sequence_carray; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3050 Lisp_Object (*c_predicate) (Lisp_Object, Lisp_Object, Lisp_Object, |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3051 Lisp_Object); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3052 Elemcount sequence_len, i; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3053 |
|
5277
d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5275
diff
changeset
|
3054 PARSE_KEYWORDS (FsortX, nargs, args, 1, (key), NULL); |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3055 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3056 CHECK_SEQUENCE (sequence); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3057 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
3058 CHECK_KEY_ARGUMENT (key); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
3059 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
3060 c_predicate = EQ (key, Qidentity) ? |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
3061 c_merge_predicate_nokey : c_merge_predicate_key; |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3062 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3063 if (LISTP (sequence)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3064 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3065 sequence = list_sort (sequence, c_predicate, predicate, key); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3066 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3067 else if (VECTORP (sequence)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3068 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3069 array_sort (XVECTOR_DATA (sequence), XVECTOR_LENGTH (sequence), |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3070 c_predicate, predicate, key); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3071 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3072 else if (STRINGP (sequence)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3073 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3074 Ibyte *strdata = XSTRING_DATA (sequence); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3075 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3076 sequence_len = string_char_length (sequence); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3077 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3078 STRING_DATA_TO_OBJECT_ARRAY (strdata, sequence_carray, i, sequence_len); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3079 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3080 /* No GCPRO necessary, characters are immediate. */ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3081 array_sort (sequence_carray, sequence_len, c_predicate, predicate, key); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3082 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3083 strdata = XSTRING_DATA (sequence); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3084 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3085 CHECK_LISP_WRITEABLE (sequence); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3086 for (i = 0; i < sequence_len; ++i) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3087 { |
|
5184
039d9a7f2e6d
Call init_string_ascii_begin() in #'sort*, #'fill, don't be clever.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
3088 strdata += set_itext_ichar (strdata, XCHAR (sequence_carray[i])); |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3089 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3090 |
|
5184
039d9a7f2e6d
Call init_string_ascii_begin() in #'sort*, #'fill, don't be clever.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5182
diff
changeset
|
3091 init_string_ascii_begin (sequence); |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3092 bump_string_modiff (sequence); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3093 sledgehammer_check_ascii_begin (sequence); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3094 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3095 else if (BIT_VECTORP (sequence)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3096 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3097 Lisp_Bit_Vector *v = XBIT_VECTOR (sequence); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3098 sequence_len = bit_vector_length (v); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3099 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3100 BIT_VECTOR_TO_OBJECT_ARRAY (v, sequence_carray, i, sequence_len); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3101 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3102 /* No GCPRO necessary, bits are immediate. */ |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3103 array_sort (sequence_carray, sequence_len, c_predicate, predicate, key); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3104 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3105 for (i = 0; i < sequence_len; ++i) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3106 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3107 set_bit_vector_bit (v, i, XINT (sequence_carray [i])); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3108 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3109 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3110 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3111 return sequence; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
3112 } |
| 428 | 3113 |
| 3114 /************************************************************************/ | |
| 3115 /* property-list functions */ | |
| 3116 /************************************************************************/ | |
| 3117 | |
| 3118 /* For properties of text, we need to do order-insensitive comparison of | |
| 3119 plists. That is, we need to compare two plists such that they are the | |
| 3120 same if they have the same set of keys, and equivalent values. | |
| 3121 So (a 1 b 2) would be equal to (b 2 a 1). | |
| 3122 | |
| 3123 NIL_MEANS_NOT_PRESENT is as in `plists-eq' etc. | |
| 3124 LAXP means use `equal' for comparisons. | |
| 3125 */ | |
| 3126 int | |
| 3127 plists_differ (Lisp_Object a, Lisp_Object b, int nil_means_not_present, | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
3128 int laxp, int depth, int foldcase) |
| 428 | 3129 { |
| 438 | 3130 int eqp = (depth == -1); /* -1 as depth means use eq, not equal. */ |
| 428 | 3131 int la, lb, m, i, fill; |
| 3132 Lisp_Object *keys, *vals; | |
|
5000
44d7bde26046
fix compile errors, fix revert-buffer bug on binary/Latin 1 files, Mule-ize some files
Ben Wing <ben@xemacs.org>
parents:
4966
diff
changeset
|
3133 Boolbyte *flags; |
| 428 | 3134 Lisp_Object rest; |
| 3135 | |
| 3136 if (NILP (a) && NILP (b)) | |
| 3137 return 0; | |
| 3138 | |
| 3139 Fcheck_valid_plist (a); | |
| 3140 Fcheck_valid_plist (b); | |
| 3141 | |
| 3142 la = XINT (Flength (a)); | |
| 3143 lb = XINT (Flength (b)); | |
| 3144 m = (la > lb ? la : lb); | |
| 3145 fill = 0; | |
| 3146 keys = alloca_array (Lisp_Object, m); | |
| 3147 vals = alloca_array (Lisp_Object, m); | |
|
5000
44d7bde26046
fix compile errors, fix revert-buffer bug on binary/Latin 1 files, Mule-ize some files
Ben Wing <ben@xemacs.org>
parents:
4966
diff
changeset
|
3148 flags = alloca_array (Boolbyte, m); |
| 428 | 3149 |
| 3150 /* First extract the pairs from A. */ | |
| 3151 for (rest = a; !NILP (rest); rest = XCDR (XCDR (rest))) | |
| 3152 { | |
| 3153 Lisp_Object k = XCAR (rest); | |
| 3154 Lisp_Object v = XCAR (XCDR (rest)); | |
| 3155 /* Maybe be Ebolified. */ | |
| 3156 if (nil_means_not_present && NILP (v)) continue; | |
| 3157 keys [fill] = k; | |
| 3158 vals [fill] = v; | |
| 3159 flags[fill] = 0; | |
| 3160 fill++; | |
| 3161 } | |
| 3162 /* Now iterate over B, and stop if we find something that's not in A, | |
| 3163 or that doesn't match. As we match, mark them. */ | |
| 3164 for (rest = b; !NILP (rest); rest = XCDR (XCDR (rest))) | |
| 3165 { | |
| 3166 Lisp_Object k = XCAR (rest); | |
| 3167 Lisp_Object v = XCAR (XCDR (rest)); | |
| 3168 /* Maybe be Ebolified. */ | |
| 3169 if (nil_means_not_present && NILP (v)) continue; | |
| 3170 for (i = 0; i < fill; i++) | |
| 3171 { | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
3172 if (!laxp ? EQ (k, keys [i]) : |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
3173 internal_equal_0 (k, keys [i], depth, foldcase)) |
| 428 | 3174 { |
| 434 | 3175 if (eqp |
| 3176 /* We narrowly escaped being Ebolified here. */ | |
| 3177 ? !EQ_WITH_EBOLA_NOTICE (v, vals [i]) | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
3178 : !internal_equal_0 (v, vals [i], depth, foldcase)) |
| 428 | 3179 /* a property in B has a different value than in A */ |
| 3180 goto MISMATCH; | |
| 3181 flags [i] = 1; | |
| 3182 break; | |
| 3183 } | |
| 3184 } | |
| 3185 if (i == fill) | |
| 3186 /* there are some properties in B that are not in A */ | |
| 3187 goto MISMATCH; | |
| 3188 } | |
| 3189 /* Now check to see that all the properties in A were also in B */ | |
| 3190 for (i = 0; i < fill; i++) | |
| 3191 if (flags [i] == 0) | |
| 3192 goto MISMATCH; | |
| 3193 | |
| 3194 /* Ok. */ | |
| 3195 return 0; | |
| 3196 | |
| 3197 MISMATCH: | |
| 3198 return 1; | |
| 3199 } | |
| 3200 | |
| 3201 DEFUN ("plists-eq", Fplists_eq, 2, 3, 0, /* | |
| 3202 Return non-nil if property lists A and B are `eq'. | |
| 3203 A property list is an alternating list of keywords and values. | |
| 3204 This function does order-insensitive comparisons of the property lists: | |
| 3205 For example, the property lists '(a 1 b 2) and '(b 2 a 1) are equal. | |
| 3206 Comparison between values is done using `eq'. See also `plists-equal'. | |
| 3207 If optional arg NIL-MEANS-NOT-PRESENT is non-nil, then a property with | |
| 3208 a nil value is ignored. This feature is a virus that has infected | |
| 3209 old Lisp implementations, but should not be used except for backward | |
| 3210 compatibility. | |
| 3211 */ | |
| 3212 (a, b, nil_means_not_present)) | |
| 3213 { | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
3214 return (plists_differ (a, b, !NILP (nil_means_not_present), 0, -1, 0) |
| 428 | 3215 ? Qnil : Qt); |
| 3216 } | |
| 3217 | |
| 3218 DEFUN ("plists-equal", Fplists_equal, 2, 3, 0, /* | |
| 3219 Return non-nil if property lists A and B are `equal'. | |
| 3220 A property list is an alternating list of keywords and values. This | |
| 3221 function does order-insensitive comparisons of the property lists: For | |
| 3222 example, the property lists '(a 1 b 2) and '(b 2 a 1) are equal. | |
| 3223 Comparison between values is done using `equal'. See also `plists-eq'. | |
| 3224 If optional arg NIL-MEANS-NOT-PRESENT is non-nil, then a property with | |
| 3225 a nil value is ignored. This feature is a virus that has infected | |
| 3226 old Lisp implementations, but should not be used except for backward | |
| 3227 compatibility. | |
| 3228 */ | |
| 3229 (a, b, nil_means_not_present)) | |
| 3230 { | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
3231 return (plists_differ (a, b, !NILP (nil_means_not_present), 0, 1, 0) |
| 428 | 3232 ? Qnil : Qt); |
| 3233 } | |
| 3234 | |
| 3235 | |
| 3236 DEFUN ("lax-plists-eq", Flax_plists_eq, 2, 3, 0, /* | |
| 3237 Return non-nil if lax property lists A and B are `eq'. | |
| 3238 A property list is an alternating list of keywords and values. | |
| 3239 This function does order-insensitive comparisons of the property lists: | |
| 3240 For example, the property lists '(a 1 b 2) and '(b 2 a 1) are equal. | |
| 3241 Comparison between values is done using `eq'. See also `plists-equal'. | |
| 3242 A lax property list is like a regular one except that comparisons between | |
| 3243 keywords is done using `equal' instead of `eq'. | |
| 3244 If optional arg NIL-MEANS-NOT-PRESENT is non-nil, then a property with | |
| 3245 a nil value is ignored. This feature is a virus that has infected | |
| 3246 old Lisp implementations, but should not be used except for backward | |
| 3247 compatibility. | |
| 3248 */ | |
| 3249 (a, b, nil_means_not_present)) | |
| 3250 { | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
3251 return (plists_differ (a, b, !NILP (nil_means_not_present), 1, -1, 0) |
| 428 | 3252 ? Qnil : Qt); |
| 3253 } | |
| 3254 | |
| 3255 DEFUN ("lax-plists-equal", Flax_plists_equal, 2, 3, 0, /* | |
| 3256 Return non-nil if lax property lists A and B are `equal'. | |
| 3257 A property list is an alternating list of keywords and values. This | |
| 3258 function does order-insensitive comparisons of the property lists: For | |
| 3259 example, the property lists '(a 1 b 2) and '(b 2 a 1) are equal. | |
| 3260 Comparison between values is done using `equal'. See also `plists-eq'. | |
| 3261 A lax property list is like a regular one except that comparisons between | |
| 3262 keywords is done using `equal' instead of `eq'. | |
| 3263 If optional arg NIL-MEANS-NOT-PRESENT is non-nil, then a property with | |
| 3264 a nil value is ignored. This feature is a virus that has infected | |
| 3265 old Lisp implementations, but should not be used except for backward | |
| 3266 compatibility. | |
| 3267 */ | |
| 3268 (a, b, nil_means_not_present)) | |
| 3269 { | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
3270 return (plists_differ (a, b, !NILP (nil_means_not_present), 1, 1, 0) |
| 428 | 3271 ? Qnil : Qt); |
| 3272 } | |
| 3273 | |
| 3274 /* Return the value associated with key PROPERTY in property list PLIST. | |
| 3275 Return nil if key not found. This function is used for internal | |
| 3276 property lists that cannot be directly manipulated by the user. | |
| 3277 */ | |
| 3278 | |
| 3279 Lisp_Object | |
| 3280 internal_plist_get (Lisp_Object plist, Lisp_Object property) | |
| 3281 { | |
| 3282 Lisp_Object tail; | |
| 3283 | |
| 3284 for (tail = plist; !NILP (tail); tail = XCDR (XCDR (tail))) | |
| 3285 { | |
| 3286 if (EQ (XCAR (tail), property)) | |
| 3287 return XCAR (XCDR (tail)); | |
| 3288 } | |
| 3289 | |
| 3290 return Qunbound; | |
| 3291 } | |
| 3292 | |
| 3293 /* Set PLIST's value for PROPERTY to VALUE. Analogous to | |
| 3294 internal_plist_get(). */ | |
| 3295 | |
| 3296 void | |
| 3297 internal_plist_put (Lisp_Object *plist, Lisp_Object property, | |
| 3298 Lisp_Object value) | |
| 3299 { | |
| 3300 Lisp_Object tail; | |
| 3301 | |
| 3302 for (tail = *plist; !NILP (tail); tail = XCDR (XCDR (tail))) | |
| 3303 { | |
| 3304 if (EQ (XCAR (tail), property)) | |
| 3305 { | |
| 3306 XCAR (XCDR (tail)) = value; | |
| 3307 return; | |
| 3308 } | |
| 3309 } | |
| 3310 | |
| 3311 *plist = Fcons (property, Fcons (value, *plist)); | |
| 3312 } | |
| 3313 | |
| 3314 int | |
| 3315 internal_remprop (Lisp_Object *plist, Lisp_Object property) | |
| 3316 { | |
| 3317 Lisp_Object tail, prev; | |
| 3318 | |
| 3319 for (tail = *plist, prev = Qnil; | |
| 3320 !NILP (tail); | |
| 3321 tail = XCDR (XCDR (tail))) | |
| 3322 { | |
| 3323 if (EQ (XCAR (tail), property)) | |
| 3324 { | |
| 3325 if (NILP (prev)) | |
| 3326 *plist = XCDR (XCDR (tail)); | |
| 3327 else | |
| 3328 XCDR (XCDR (prev)) = XCDR (XCDR (tail)); | |
| 3329 return 1; | |
| 3330 } | |
| 3331 else | |
| 3332 prev = tail; | |
| 3333 } | |
| 3334 | |
| 3335 return 0; | |
| 3336 } | |
| 3337 | |
| 3338 /* Called on a malformed property list. BADPLACE should be some | |
| 3339 place where truncating will form a good list -- i.e. we shouldn't | |
| 3340 result in a list with an odd length. */ | |
| 3341 | |
| 3342 static Lisp_Object | |
| 578 | 3343 bad_bad_bunny (Lisp_Object *plist, Lisp_Object *badplace, Error_Behavior errb) |
| 428 | 3344 { |
| 3345 if (ERRB_EQ (errb, ERROR_ME)) | |
| 3346 return Fsignal (Qmalformed_property_list, list2 (*plist, *badplace)); | |
| 3347 else | |
| 3348 { | |
| 3349 if (ERRB_EQ (errb, ERROR_ME_WARN)) | |
| 3350 { | |
| 3351 warn_when_safe_lispobj | |
| 3352 (Qlist, Qwarning, | |
| 771 | 3353 list2 (build_msg_string |
| 428 | 3354 ("Malformed property list -- list has been truncated"), |
| 3355 *plist)); | |
| 793 | 3356 /* #### WARNING: This is more dangerous than it seems; perhaps |
| 3357 not a good idea. It also violates the principle of least | |
| 3358 surprise -- passing in ERROR_ME_WARN causes truncation, but | |
| 3359 ERROR_ME and ERROR_ME_NOT don't. */ | |
| 428 | 3360 *badplace = Qnil; |
| 3361 } | |
| 3362 return Qunbound; | |
| 3363 } | |
| 3364 } | |
| 3365 | |
| 3366 /* Called on a circular property list. BADPLACE should be some place | |
| 3367 where truncating will result in an even-length list, as above. | |
| 3368 If doesn't particularly matter where we truncate -- anywhere we | |
| 3369 truncate along the entire list will break the circularity, because | |
| 3370 it will create a terminus and the list currently doesn't have one. | |
| 3371 */ | |
| 3372 | |
| 3373 static Lisp_Object | |
| 578 | 3374 bad_bad_turtle (Lisp_Object *plist, Lisp_Object *badplace, Error_Behavior errb) |
| 428 | 3375 { |
| 3376 if (ERRB_EQ (errb, ERROR_ME)) | |
| 3377 return Fsignal (Qcircular_property_list, list1 (*plist)); | |
| 3378 else | |
| 3379 { | |
| 3380 if (ERRB_EQ (errb, ERROR_ME_WARN)) | |
| 3381 { | |
| 3382 warn_when_safe_lispobj | |
| 3383 (Qlist, Qwarning, | |
| 771 | 3384 list2 (build_msg_string |
| 428 | 3385 ("Circular property list -- list has been truncated"), |
| 3386 *plist)); | |
| 793 | 3387 /* #### WARNING: This is more dangerous than it seems; perhaps |
| 3388 not a good idea. It also violates the principle of least | |
| 3389 surprise -- passing in ERROR_ME_WARN causes truncation, but | |
| 3390 ERROR_ME and ERROR_ME_NOT don't. */ | |
| 428 | 3391 *badplace = Qnil; |
| 3392 } | |
| 3393 return Qunbound; | |
| 3394 } | |
| 3395 } | |
| 3396 | |
| 3397 /* Advance the tortoise pointer by two (one iteration of a property-list | |
| 3398 loop) and the hare pointer by four and verify that no malformations | |
| 3399 or circularities exist. If so, return zero and store a value into | |
| 3400 RETVAL that should be returned by the calling function. Otherwise, | |
| 3401 return 1. See external_plist_get(). | |
| 3402 */ | |
| 3403 | |
| 3404 static int | |
| 3405 advance_plist_pointers (Lisp_Object *plist, | |
| 3406 Lisp_Object **tortoise, Lisp_Object **hare, | |
| 578 | 3407 Error_Behavior errb, Lisp_Object *retval) |
| 428 | 3408 { |
| 3409 int i; | |
| 3410 Lisp_Object *tortsave = *tortoise; | |
| 3411 | |
| 3412 /* Note that our "fixing" may be more brutal than necessary, | |
| 3413 but it's the user's own problem, not ours, if they went in and | |
| 3414 manually fucked up a plist. */ | |
| 3415 | |
| 3416 for (i = 0; i < 2; i++) | |
| 3417 { | |
| 3418 /* This is a standard iteration of a defensive-loop-checking | |
| 3419 loop. We just do it twice because we want to advance past | |
| 3420 both the property and its value. | |
| 3421 | |
| 3422 If the pointer indirection is confusing you, remember that | |
| 3423 one level of indirection on the hare and tortoise pointers | |
| 3424 is only due to pass-by-reference for this function. The other | |
| 3425 level is so that the plist can be fixed in place. */ | |
| 3426 | |
| 3427 /* When we reach the end of a well-formed plist, **HARE is | |
| 3428 nil. In that case, we don't do anything at all except | |
| 3429 advance TORTOISE by one. Otherwise, we advance HARE | |
| 3430 by two (making sure it's OK to do so), then advance | |
| 3431 TORTOISE by one (it will always be OK to do so because | |
| 3432 the HARE is always ahead of the TORTOISE and will have | |
| 3433 already verified the path), then make sure TORTOISE and | |
| 3434 HARE don't contain the same non-nil object -- if the | |
| 3435 TORTOISE and the HARE ever meet, then obviously we're | |
| 3436 in a circularity, and if we're in a circularity, then | |
| 3437 the TORTOISE and the HARE can't cross paths without | |
| 3438 meeting, since the HARE only gains one step over the | |
| 3439 TORTOISE per iteration. */ | |
| 3440 | |
| 3441 if (!NILP (**hare)) | |
| 3442 { | |
| 3443 Lisp_Object *haresave = *hare; | |
| 3444 if (!CONSP (**hare)) | |
| 3445 { | |
| 3446 *retval = bad_bad_bunny (plist, haresave, errb); | |
| 3447 return 0; | |
| 3448 } | |
| 3449 *hare = &XCDR (**hare); | |
| 3450 /* In a non-plist, we'd check here for a nil value for | |
| 3451 **HARE, which is OK (it just means the list has an | |
| 3452 odd number of elements). In a plist, it's not OK | |
| 3453 for the list to have an odd number of elements. */ | |
| 3454 if (!CONSP (**hare)) | |
| 3455 { | |
| 3456 *retval = bad_bad_bunny (plist, haresave, errb); | |
| 3457 return 0; | |
| 3458 } | |
| 3459 *hare = &XCDR (**hare); | |
| 3460 } | |
| 3461 | |
| 3462 *tortoise = &XCDR (**tortoise); | |
| 3463 if (!NILP (**hare) && EQ (**tortoise, **hare)) | |
| 3464 { | |
| 3465 *retval = bad_bad_turtle (plist, tortsave, errb); | |
| 3466 return 0; | |
| 3467 } | |
| 3468 } | |
| 3469 | |
| 3470 return 1; | |
| 3471 } | |
| 3472 | |
| 3473 /* Return the value of PROPERTY from PLIST, or Qunbound if | |
| 3474 property is not on the list. | |
| 3475 | |
| 3476 PLIST is a Lisp-accessible property list, meaning that it | |
| 3477 has to be checked for malformations and circularities. | |
| 3478 | |
| 3479 If ERRB is ERROR_ME, an error will be signalled. Otherwise, the | |
| 3480 function will never signal an error; and if ERRB is ERROR_ME_WARN, | |
| 3481 on finding a malformation or a circularity, it issues a warning and | |
| 3482 attempts to silently fix the problem. | |
| 3483 | |
| 3484 A pointer to PLIST is passed in so that PLIST can be successfully | |
| 3485 "fixed" even if the error is at the beginning of the plist. */ | |
| 3486 | |
| 3487 Lisp_Object | |
| 3488 external_plist_get (Lisp_Object *plist, Lisp_Object property, | |
| 578 | 3489 int laxp, Error_Behavior errb) |
| 428 | 3490 { |
| 3491 Lisp_Object *tortoise = plist; | |
| 3492 Lisp_Object *hare = plist; | |
| 3493 | |
| 3494 while (!NILP (*tortoise)) | |
| 3495 { | |
| 3496 Lisp_Object *tortsave = tortoise; | |
| 3497 Lisp_Object retval; | |
| 3498 | |
| 3499 /* We do the standard tortoise/hare march. We isolate the | |
| 3500 grungy stuff to do this in advance_plist_pointers(), though. | |
| 3501 To us, all this function does is advance the tortoise | |
| 3502 pointer by two and the hare pointer by four and make sure | |
| 3503 everything's OK. We first advance the pointers and then | |
| 3504 check if a property matched; this ensures that our | |
| 3505 check for a matching property is safe. */ | |
| 3506 | |
| 3507 if (!advance_plist_pointers (plist, &tortoise, &hare, errb, &retval)) | |
| 3508 return retval; | |
| 3509 | |
| 3510 if (!laxp ? EQ (XCAR (*tortsave), property) | |
| 3511 : internal_equal (XCAR (*tortsave), property, 0)) | |
| 3512 return XCAR (XCDR (*tortsave)); | |
| 3513 } | |
| 3514 | |
| 3515 return Qunbound; | |
| 3516 } | |
| 3517 | |
| 3518 /* Set PLIST's value for PROPERTY to VALUE, given a possibly | |
| 3519 malformed or circular plist. Analogous to external_plist_get(). */ | |
| 3520 | |
| 3521 void | |
| 3522 external_plist_put (Lisp_Object *plist, Lisp_Object property, | |
| 578 | 3523 Lisp_Object value, int laxp, Error_Behavior errb) |
| 428 | 3524 { |
| 3525 Lisp_Object *tortoise = plist; | |
| 3526 Lisp_Object *hare = plist; | |
| 3527 | |
| 3528 while (!NILP (*tortoise)) | |
| 3529 { | |
| 3530 Lisp_Object *tortsave = tortoise; | |
| 3531 Lisp_Object retval; | |
| 3532 | |
| 3533 /* See above */ | |
| 3534 if (!advance_plist_pointers (plist, &tortoise, &hare, errb, &retval)) | |
| 3535 return; | |
| 3536 | |
| 3537 if (!laxp ? EQ (XCAR (*tortsave), property) | |
| 3538 : internal_equal (XCAR (*tortsave), property, 0)) | |
| 3539 { | |
| 3540 XCAR (XCDR (*tortsave)) = value; | |
| 3541 return; | |
| 3542 } | |
| 3543 } | |
| 3544 | |
| 3545 *plist = Fcons (property, Fcons (value, *plist)); | |
| 3546 } | |
| 3547 | |
| 3548 int | |
| 3549 external_remprop (Lisp_Object *plist, Lisp_Object property, | |
| 578 | 3550 int laxp, Error_Behavior errb) |
| 428 | 3551 { |
| 3552 Lisp_Object *tortoise = plist; | |
| 3553 Lisp_Object *hare = plist; | |
| 3554 | |
| 3555 while (!NILP (*tortoise)) | |
| 3556 { | |
| 3557 Lisp_Object *tortsave = tortoise; | |
| 3558 Lisp_Object retval; | |
| 3559 | |
| 3560 /* See above */ | |
| 3561 if (!advance_plist_pointers (plist, &tortoise, &hare, errb, &retval)) | |
| 3562 return 0; | |
| 3563 | |
| 3564 if (!laxp ? EQ (XCAR (*tortsave), property) | |
| 3565 : internal_equal (XCAR (*tortsave), property, 0)) | |
| 3566 { | |
| 3567 /* Now you see why it's so convenient to have that level | |
| 3568 of indirection. */ | |
| 3569 *tortsave = XCDR (XCDR (*tortsave)); | |
| 3570 return 1; | |
| 3571 } | |
| 3572 } | |
| 3573 | |
| 3574 return 0; | |
| 3575 } | |
| 3576 | |
| 3577 DEFUN ("plist-get", Fplist_get, 2, 3, 0, /* | |
| 3578 Extract a value from a property list. | |
| 3579 PLIST is a property list, which is a list of the form | |
| 444 | 3580 \(PROPERTY1 VALUE1 PROPERTY2 VALUE2...). |
| 3581 PROPERTY is usually a symbol. | |
| 3582 This function returns the value corresponding to the PROPERTY, | |
| 3583 or DEFAULT if PROPERTY is not one of the properties on the list. | |
| 428 | 3584 */ |
| 444 | 3585 (plist, property, default_)) |
| 428 | 3586 { |
| 444 | 3587 Lisp_Object value = external_plist_get (&plist, property, 0, ERROR_ME); |
| 3588 return UNBOUNDP (value) ? default_ : value; | |
| 428 | 3589 } |
| 3590 | |
| 3591 DEFUN ("plist-put", Fplist_put, 3, 3, 0, /* | |
| 444 | 3592 Change value in PLIST of PROPERTY to VALUE. |
| 3593 PLIST is a property list, which is a list of the form | |
| 3594 \(PROPERTY1 VALUE1 PROPERTY2 VALUE2 ...). | |
| 3595 PROPERTY is usually a symbol and VALUE is any object. | |
| 3596 If PROPERTY is already a property on the list, its value is set to VALUE, | |
| 3597 otherwise the new PROPERTY VALUE pair is added. | |
| 3598 The new plist is returned; use `(setq x (plist-put x property value))' | |
| 3599 to be sure to use the new value. PLIST is modified by side effect. | |
| 428 | 3600 */ |
| 444 | 3601 (plist, property, value)) |
| 428 | 3602 { |
| 444 | 3603 external_plist_put (&plist, property, value, 0, ERROR_ME); |
| 428 | 3604 return plist; |
| 3605 } | |
| 3606 | |
| 3607 DEFUN ("plist-remprop", Fplist_remprop, 2, 2, 0, /* | |
| 444 | 3608 Remove from PLIST the property PROPERTY and its value. |
| 3609 PLIST is a property list, which is a list of the form | |
| 3610 \(PROPERTY1 VALUE1 PROPERTY2 VALUE2 ...). | |
| 3611 PROPERTY is usually a symbol. | |
| 3612 The new plist is returned; use `(setq x (plist-remprop x property))' | |
| 3613 to be sure to use the new value. PLIST is modified by side effect. | |
| 428 | 3614 */ |
| 444 | 3615 (plist, property)) |
| 428 | 3616 { |
| 444 | 3617 external_remprop (&plist, property, 0, ERROR_ME); |
| 428 | 3618 return plist; |
| 3619 } | |
| 3620 | |
| 3621 DEFUN ("plist-member", Fplist_member, 2, 2, 0, /* | |
| 444 | 3622 Return t if PROPERTY has a value specified in PLIST. |
| 428 | 3623 */ |
| 444 | 3624 (plist, property)) |
| 428 | 3625 { |
| 444 | 3626 Lisp_Object value = Fplist_get (plist, property, Qunbound); |
| 3627 return UNBOUNDP (value) ? Qnil : Qt; | |
| 428 | 3628 } |
| 3629 | |
| 3630 DEFUN ("check-valid-plist", Fcheck_valid_plist, 1, 1, 0, /* | |
| 3631 Given a plist, signal an error if there is anything wrong with it. | |
| 3632 This means that it's a malformed or circular plist. | |
| 3633 */ | |
| 3634 (plist)) | |
| 3635 { | |
| 3636 Lisp_Object *tortoise; | |
| 3637 Lisp_Object *hare; | |
| 3638 | |
| 3639 start_over: | |
| 3640 tortoise = &plist; | |
| 3641 hare = &plist; | |
| 3642 while (!NILP (*tortoise)) | |
| 3643 { | |
| 3644 Lisp_Object retval; | |
| 3645 | |
| 3646 /* See above */ | |
| 3647 if (!advance_plist_pointers (&plist, &tortoise, &hare, ERROR_ME, | |
| 3648 &retval)) | |
| 3649 goto start_over; | |
| 3650 } | |
| 3651 | |
| 3652 return Qnil; | |
| 3653 } | |
| 3654 | |
| 3655 DEFUN ("valid-plist-p", Fvalid_plist_p, 1, 1, 0, /* | |
| 3656 Given a plist, return non-nil if its format is correct. | |
| 3657 If it returns nil, `check-valid-plist' will signal an error when given | |
| 442 | 3658 the plist; that means it's a malformed or circular plist. |
| 428 | 3659 */ |
| 3660 (plist)) | |
| 3661 { | |
| 3662 Lisp_Object *tortoise; | |
| 3663 Lisp_Object *hare; | |
| 3664 | |
| 3665 tortoise = &plist; | |
| 3666 hare = &plist; | |
| 3667 while (!NILP (*tortoise)) | |
| 3668 { | |
| 3669 Lisp_Object retval; | |
| 3670 | |
| 3671 /* See above */ | |
| 3672 if (!advance_plist_pointers (&plist, &tortoise, &hare, ERROR_ME_NOT, | |
| 3673 &retval)) | |
| 3674 return Qnil; | |
| 3675 } | |
| 3676 | |
| 3677 return Qt; | |
| 3678 } | |
| 3679 | |
| 3680 DEFUN ("canonicalize-plist", Fcanonicalize_plist, 1, 2, 0, /* | |
| 3681 Destructively remove any duplicate entries from a plist. | |
| 3682 In such cases, the first entry applies. | |
| 3683 | |
| 3684 If optional arg NIL-MEANS-NOT-PRESENT is non-nil, then a property with | |
| 3685 a nil value is removed. This feature is a virus that has infected | |
| 3686 old Lisp implementations, but should not be used except for backward | |
| 3687 compatibility. | |
| 3688 | |
| 3689 The new plist is returned. If NIL-MEANS-NOT-PRESENT is given, the | |
| 3690 return value may not be EQ to the passed-in value, so make sure to | |
| 3691 `setq' the value back into where it came from. | |
| 3692 */ | |
| 3693 (plist, nil_means_not_present)) | |
| 3694 { | |
| 3695 Lisp_Object head = plist; | |
| 3696 | |
| 3697 Fcheck_valid_plist (plist); | |
| 3698 | |
| 3699 while (!NILP (plist)) | |
| 3700 { | |
| 3701 Lisp_Object prop = Fcar (plist); | |
| 3702 Lisp_Object next = Fcdr (plist); | |
| 3703 | |
| 3704 CHECK_CONS (next); /* just make doubly sure we catch any errors */ | |
| 3705 if (!NILP (nil_means_not_present) && NILP (Fcar (next))) | |
| 3706 { | |
| 3707 if (EQ (head, plist)) | |
| 3708 head = Fcdr (next); | |
| 3709 plist = Fcdr (next); | |
| 3710 continue; | |
| 3711 } | |
| 3712 /* external_remprop returns 1 if it removed any property. | |
| 3713 We have to loop till it didn't remove anything, in case | |
| 3714 the property occurs many times. */ | |
| 3715 while (external_remprop (&XCDR (next), prop, 0, ERROR_ME)) | |
| 3716 DO_NOTHING; | |
| 3717 plist = Fcdr (next); | |
| 3718 } | |
| 3719 | |
| 3720 return head; | |
| 3721 } | |
| 3722 | |
| 3723 DEFUN ("lax-plist-get", Flax_plist_get, 2, 3, 0, /* | |
| 3724 Extract a value from a lax property list. | |
| 444 | 3725 LAX-PLIST is a lax property list, which is a list of the form |
| 3726 \(PROPERTY1 VALUE1 PROPERTY2 VALUE2...), where comparisons between | |
| 3727 properties is done using `equal' instead of `eq'. | |
| 3728 PROPERTY is usually a symbol. | |
| 3729 This function returns the value corresponding to PROPERTY, | |
| 3730 or DEFAULT if PROPERTY is not one of the properties on the list. | |
| 428 | 3731 */ |
| 444 | 3732 (lax_plist, property, default_)) |
| 428 | 3733 { |
| 444 | 3734 Lisp_Object value = external_plist_get (&lax_plist, property, 1, ERROR_ME); |
| 3735 return UNBOUNDP (value) ? default_ : value; | |
| 428 | 3736 } |
| 3737 | |
| 3738 DEFUN ("lax-plist-put", Flax_plist_put, 3, 3, 0, /* | |
| 444 | 3739 Change value in LAX-PLIST of PROPERTY to VALUE. |
| 3740 LAX-PLIST is a lax property list, which is a list of the form | |
| 3741 \(PROPERTY1 VALUE1 PROPERTY2 VALUE2...), where comparisons between | |
| 3742 properties is done using `equal' instead of `eq'. | |
| 3743 PROPERTY is usually a symbol and VALUE is any object. | |
| 3744 If PROPERTY is already a property on the list, its value is set to | |
| 3745 VALUE, otherwise the new PROPERTY VALUE pair is added. | |
| 3746 The new plist is returned; use `(setq x (lax-plist-put x property value))' | |
| 3747 to be sure to use the new value. LAX-PLIST is modified by side effect. | |
| 428 | 3748 */ |
| 444 | 3749 (lax_plist, property, value)) |
| 428 | 3750 { |
| 444 | 3751 external_plist_put (&lax_plist, property, value, 1, ERROR_ME); |
| 428 | 3752 return lax_plist; |
| 3753 } | |
| 3754 | |
| 3755 DEFUN ("lax-plist-remprop", Flax_plist_remprop, 2, 2, 0, /* | |
| 444 | 3756 Remove from LAX-PLIST the property PROPERTY and its value. |
| 3757 LAX-PLIST is a lax property list, which is a list of the form | |
| 3758 \(PROPERTY1 VALUE1 PROPERTY2 VALUE2...), where comparisons between | |
| 3759 properties is done using `equal' instead of `eq'. | |
| 3760 PROPERTY is usually a symbol. | |
| 3761 The new plist is returned; use `(setq x (lax-plist-remprop x property))' | |
| 3762 to be sure to use the new value. LAX-PLIST is modified by side effect. | |
| 428 | 3763 */ |
| 444 | 3764 (lax_plist, property)) |
| 428 | 3765 { |
| 444 | 3766 external_remprop (&lax_plist, property, 1, ERROR_ME); |
| 428 | 3767 return lax_plist; |
| 3768 } | |
| 3769 | |
| 3770 DEFUN ("lax-plist-member", Flax_plist_member, 2, 2, 0, /* | |
| 444 | 3771 Return t if PROPERTY has a value specified in LAX-PLIST. |
| 3772 LAX-PLIST is a lax property list, which is a list of the form | |
| 3773 \(PROPERTY1 VALUE1 PROPERTY2 VALUE2...), where comparisons between | |
| 3774 properties is done using `equal' instead of `eq'. | |
| 428 | 3775 */ |
| 444 | 3776 (lax_plist, property)) |
| 428 | 3777 { |
| 444 | 3778 return UNBOUNDP (Flax_plist_get (lax_plist, property, Qunbound)) ? Qnil : Qt; |
| 428 | 3779 } |
| 3780 | |
| 3781 DEFUN ("canonicalize-lax-plist", Fcanonicalize_lax_plist, 1, 2, 0, /* | |
| 3782 Destructively remove any duplicate entries from a lax plist. | |
| 3783 In such cases, the first entry applies. | |
| 3784 | |
| 3785 If optional arg NIL-MEANS-NOT-PRESENT is non-nil, then a property with | |
| 3786 a nil value is removed. This feature is a virus that has infected | |
| 3787 old Lisp implementations, but should not be used except for backward | |
| 3788 compatibility. | |
| 3789 | |
| 3790 The new plist is returned. If NIL-MEANS-NOT-PRESENT is given, the | |
| 3791 return value may not be EQ to the passed-in value, so make sure to | |
| 3792 `setq' the value back into where it came from. | |
| 3793 */ | |
| 3794 (lax_plist, nil_means_not_present)) | |
| 3795 { | |
| 3796 Lisp_Object head = lax_plist; | |
| 3797 | |
| 3798 Fcheck_valid_plist (lax_plist); | |
| 3799 | |
| 3800 while (!NILP (lax_plist)) | |
| 3801 { | |
| 3802 Lisp_Object prop = Fcar (lax_plist); | |
| 3803 Lisp_Object next = Fcdr (lax_plist); | |
| 3804 | |
| 3805 CHECK_CONS (next); /* just make doubly sure we catch any errors */ | |
| 3806 if (!NILP (nil_means_not_present) && NILP (Fcar (next))) | |
| 3807 { | |
| 3808 if (EQ (head, lax_plist)) | |
| 3809 head = Fcdr (next); | |
| 3810 lax_plist = Fcdr (next); | |
| 3811 continue; | |
| 3812 } | |
| 3813 /* external_remprop returns 1 if it removed any property. | |
| 3814 We have to loop till it didn't remove anything, in case | |
| 3815 the property occurs many times. */ | |
| 3816 while (external_remprop (&XCDR (next), prop, 1, ERROR_ME)) | |
| 3817 DO_NOTHING; | |
| 3818 lax_plist = Fcdr (next); | |
| 3819 } | |
| 3820 | |
| 3821 return head; | |
| 3822 } | |
| 3823 | |
| 3824 /* In C because the frame props stuff uses it */ | |
| 3825 | |
| 3826 DEFUN ("destructive-alist-to-plist", Fdestructive_alist_to_plist, 1, 1, 0, /* | |
| 3827 Convert association list ALIST into the equivalent property-list form. | |
| 3828 The plist is returned. This converts from | |
| 3829 | |
| 3830 \((a . 1) (b . 2) (c . 3)) | |
| 3831 | |
| 3832 into | |
| 3833 | |
| 3834 \(a 1 b 2 c 3) | |
| 3835 | |
| 3836 The original alist is destroyed in the process of constructing the plist. | |
| 3837 See also `alist-to-plist'. | |
| 3838 */ | |
| 3839 (alist)) | |
| 3840 { | |
| 3841 Lisp_Object head = alist; | |
| 3842 while (!NILP (alist)) | |
| 3843 { | |
| 3844 /* remember the alist element. */ | |
| 3845 Lisp_Object el = Fcar (alist); | |
| 3846 | |
| 3847 Fsetcar (alist, Fcar (el)); | |
| 3848 Fsetcar (el, Fcdr (el)); | |
| 3849 Fsetcdr (el, Fcdr (alist)); | |
| 3850 Fsetcdr (alist, el); | |
| 3851 alist = Fcdr (Fcdr (alist)); | |
| 3852 } | |
| 3853 | |
| 3854 return head; | |
| 3855 } | |
| 3856 | |
| 3857 DEFUN ("get", Fget, 2, 3, 0, /* | |
| 442 | 3858 Return the value of OBJECT's PROPERTY property. |
| 3859 This is the last VALUE stored with `(put OBJECT PROPERTY VALUE)'. | |
| 428 | 3860 If there is no such property, return optional third arg DEFAULT |
| 442 | 3861 \(which defaults to `nil'). OBJECT can be a symbol, string, extent, |
|
5255
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3862 face, glyph, or process. See also `put', `remprop', `object-plist', and |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3863 `object-setplist'. |
| 428 | 3864 */ |
| 442 | 3865 (object, property, default_)) |
| 428 | 3866 { |
| 3867 /* Various places in emacs call Fget() and expect it not to quit, | |
| 3868 so don't quit. */ | |
| 442 | 3869 Lisp_Object val; |
| 3870 | |
| 3871 if (LRECORDP (object) && XRECORD_LHEADER_IMPLEMENTATION (object)->getprop) | |
| 3872 val = XRECORD_LHEADER_IMPLEMENTATION (object)->getprop (object, property); | |
| 428 | 3873 else |
| 563 | 3874 invalid_operation ("Object type has no properties", object); |
| 442 | 3875 |
| 3876 return UNBOUNDP (val) ? default_ : val; | |
| 428 | 3877 } |
| 3878 | |
| 3879 DEFUN ("put", Fput, 3, 3, 0, /* | |
| 442 | 3880 Set OBJECT's PROPERTY to VALUE. |
| 3881 It can be subsequently retrieved with `(get OBJECT PROPERTY)'. | |
| 3882 OBJECT can be a symbol, face, extent, or string. | |
| 428 | 3883 For a string, no properties currently have predefined meanings. |
| 3884 For the predefined properties for extents, see `set-extent-property'. | |
| 3885 For the predefined properties for faces, see `set-face-property'. | |
| 3886 See also `get', `remprop', and `object-plist'. | |
| 3887 */ | |
| 442 | 3888 (object, property, value)) |
| 428 | 3889 { |
| 1920 | 3890 /* This function cannot GC */ |
| 428 | 3891 CHECK_LISP_WRITEABLE (object); |
| 3892 | |
| 442 | 3893 if (LRECORDP (object) && XRECORD_LHEADER_IMPLEMENTATION (object)->putprop) |
| 428 | 3894 { |
| 442 | 3895 if (! XRECORD_LHEADER_IMPLEMENTATION (object)->putprop |
| 3896 (object, property, value)) | |
| 563 | 3897 invalid_change ("Can't set property on object", property); |
| 428 | 3898 } |
| 3899 else | |
| 563 | 3900 invalid_change ("Object type has no settable properties", object); |
| 428 | 3901 |
| 3902 return value; | |
| 3903 } | |
| 3904 | |
| 3905 DEFUN ("remprop", Fremprop, 2, 2, 0, /* | |
| 442 | 3906 Remove, from OBJECT's property list, PROPERTY and its corresponding value. |
|
5255
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3907 OBJECT can be a symbol, string, extent, face, glyph, or process. |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3908 Return non-nil if the property list was actually modified (i.e. if PROPERTY |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3909 was present in the property list). See also `get', `put', `object-plist', |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3910 and `object-setplist'. |
| 428 | 3911 */ |
| 442 | 3912 (object, property)) |
| 428 | 3913 { |
| 442 | 3914 int ret = 0; |
| 3915 | |
| 428 | 3916 CHECK_LISP_WRITEABLE (object); |
| 3917 | |
| 442 | 3918 if (LRECORDP (object) && XRECORD_LHEADER_IMPLEMENTATION (object)->remprop) |
| 428 | 3919 { |
| 442 | 3920 ret = XRECORD_LHEADER_IMPLEMENTATION (object)->remprop (object, property); |
| 3921 if (ret == -1) | |
| 563 | 3922 invalid_change ("Can't remove property from object", property); |
| 428 | 3923 } |
| 3924 else | |
| 563 | 3925 invalid_change ("Object type has no removable properties", object); |
| 442 | 3926 |
| 3927 return ret ? Qt : Qnil; | |
| 428 | 3928 } |
| 3929 | |
| 3930 DEFUN ("object-plist", Fobject_plist, 1, 1, 0, /* | |
| 442 | 3931 Return a property list of OBJECT's properties. |
| 3932 For a symbol, this is equivalent to `symbol-plist'. | |
| 3933 OBJECT can be a symbol, string, extent, face, or glyph. | |
| 3934 Do not modify the returned property list directly; | |
| 3935 this may or may not have the desired effects. Use `put' instead. | |
| 428 | 3936 */ |
| 3937 (object)) | |
| 3938 { | |
| 442 | 3939 if (LRECORDP (object) && XRECORD_LHEADER_IMPLEMENTATION (object)->plist) |
| 3940 return XRECORD_LHEADER_IMPLEMENTATION (object)->plist (object); | |
| 428 | 3941 else |
| 563 | 3942 invalid_operation ("Object type has no properties", object); |
| 428 | 3943 |
| 3944 return Qnil; | |
| 3945 } | |
| 3946 | |
|
5255
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3947 DEFUN ("object-setplist", Fobject_setplist, 2, 2, 0, /* |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3948 Set OBJECT's property list to NEWPLIST, and return NEWPLIST. |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3949 For a symbol, this is equivalent to `setplist'. |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3950 |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3951 OBJECT can be a symbol or a process, other objects with visible plists do |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3952 not allow their modification with `object-setplist'. |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3953 */ |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3954 (object, newplist)) |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3955 { |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3956 if (LRECORDP (object) && XRECORD_LHEADER_IMPLEMENTATION (object)->setplist) |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3957 { |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3958 return XRECORD_LHEADER_IMPLEMENTATION (object)->setplist (object, |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3959 newplist); |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3960 } |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3961 |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3962 invalid_operation ("Not possible to set object's plist", object); |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3963 return Qnil; |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3964 } |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3965 |
|
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
3966 |
| 428 | 3967 |
| 853 | 3968 static Lisp_Object |
| 3969 tweaked_internal_equal (Lisp_Object obj1, Lisp_Object obj2, | |
| 3970 Lisp_Object depth) | |
| 3971 { | |
| 3972 return make_int (internal_equal (obj1, obj2, XINT (depth))); | |
| 3973 } | |
| 3974 | |
| 3975 int | |
| 3976 internal_equal_trapping_problems (Lisp_Object warning_class, | |
|
5000
44d7bde26046
fix compile errors, fix revert-buffer bug on binary/Latin 1 files, Mule-ize some files
Ben Wing <ben@xemacs.org>
parents:
4966
diff
changeset
|
3977 const Ascbyte *warning_string, |
| 853 | 3978 int flags, |
| 3979 struct call_trapping_problems_result *p, | |
| 3980 int retval, | |
| 3981 Lisp_Object obj1, Lisp_Object obj2, | |
| 3982 int depth) | |
| 3983 { | |
| 3984 Lisp_Object glorp = | |
| 3985 va_call_trapping_problems (warning_class, warning_string, | |
| 3986 flags, p, | |
| 3987 (lisp_fn_t) tweaked_internal_equal, | |
| 3988 3, obj1, obj2, make_int (depth)); | |
| 3989 if (UNBOUNDP (glorp)) | |
| 3990 return retval; | |
| 3991 else | |
| 3992 return XINT (glorp); | |
| 3993 } | |
| 3994 | |
| 428 | 3995 int |
| 3996 internal_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) | |
| 3997 { | |
| 3998 if (depth > 200) | |
| 563 | 3999 stack_overflow ("Stack overflow in equal", Qunbound); |
| 428 | 4000 QUIT; |
| 4001 if (EQ_WITH_EBOLA_NOTICE (obj1, obj2)) | |
| 4002 return 1; | |
| 4003 /* Note that (equal 20 20.0) should be nil */ | |
| 4004 if (XTYPE (obj1) != XTYPE (obj2)) | |
| 4005 return 0; | |
| 4006 if (LRECORDP (obj1)) | |
| 4007 { | |
| 442 | 4008 const struct lrecord_implementation |
| 428 | 4009 *imp1 = XRECORD_LHEADER_IMPLEMENTATION (obj1), |
| 4010 *imp2 = XRECORD_LHEADER_IMPLEMENTATION (obj2); | |
| 4011 | |
| 4012 return (imp1 == imp2) && | |
| 4013 /* EQ-ness of the objects was noticed above */ | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4014 (imp1->equal && (imp1->equal) (obj1, obj2, depth, 0)); |
| 428 | 4015 } |
| 4016 | |
| 4017 return 0; | |
| 4018 } | |
| 4019 | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4020 enum array_type |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4021 { |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4022 ARRAY_NONE = 0, |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4023 ARRAY_STRING, |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4024 ARRAY_VECTOR, |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4025 ARRAY_BIT_VECTOR |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4026 }; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4027 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4028 static enum array_type |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4029 array_type (Lisp_Object obj) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4030 { |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4031 if (STRINGP (obj)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4032 return ARRAY_STRING; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4033 if (VECTORP (obj)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4034 return ARRAY_VECTOR; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4035 if (BIT_VECTORP (obj)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4036 return ARRAY_BIT_VECTOR; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4037 return ARRAY_NONE; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4038 } |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4039 |
| 801 | 4040 int |
| 4041 internal_equalp (Lisp_Object obj1, Lisp_Object obj2, int depth) | |
| 4042 { | |
| 4043 if (depth > 200) | |
| 4044 stack_overflow ("Stack overflow in equalp", Qunbound); | |
| 4045 QUIT; | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4046 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4047 /* 1. Objects that are `eq' are equal. This will catch the common case |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4048 of two equal fixnums or the same object seen twice. */ |
| 801 | 4049 if (EQ_WITH_EBOLA_NOTICE (obj1, obj2)) |
| 4050 return 1; | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4051 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4052 /* 2. If both numbers, compare with `='. */ |
| 1983 | 4053 if (NUMBERP (obj1) && NUMBERP (obj2)) |
| 4054 { | |
|
4910
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4906
diff
changeset
|
4055 return (0 == bytecode_arithcompare (obj1, obj2)); |
| 1983 | 4056 } |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4057 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4058 /* 3. If characters, compare case-insensitively. */ |
| 801 | 4059 if (CHARP (obj1) && CHARP (obj2)) |
|
4910
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4906
diff
changeset
|
4060 return CANONCASE (0, XCHAR (obj1)) == CANONCASE (0, XCHAR (obj2)); |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4061 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4062 /* 4. If arrays of different types, compare their lengths, and |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4063 then compare element-by-element. */ |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4064 { |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4065 enum array_type artype1, artype2; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4066 artype1 = array_type (obj1); |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4067 artype2 = array_type (obj2); |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4068 if (artype1 != artype2 && artype1 && artype2) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4069 { |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4070 EMACS_INT i; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4071 EMACS_INT l1 = XINT (Flength (obj1)); |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4072 EMACS_INT l2 = XINT (Flength (obj2)); |
|
4910
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4906
diff
changeset
|
4073 /* Both arrays, but of different lengths */ |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4074 if (l1 != l2) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4075 return 0; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4076 for (i = 0; i < l1; i++) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4077 if (!internal_equalp (Faref (obj1, make_int (i)), |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4078 Faref (obj2, make_int (i)), depth + 1)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4079 return 0; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4080 return 1; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4081 } |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4082 } |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4083 /* 5. Else, they must be the same type. If so, call the equal() method, |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4084 telling it to fold case. For objects that care about case-folding |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4085 their contents, the equal() method will call internal_equal_0(). */ |
| 801 | 4086 if (XTYPE (obj1) != XTYPE (obj2)) |
| 4087 return 0; | |
| 4088 if (LRECORDP (obj1)) | |
| 4089 { | |
| 4090 const struct lrecord_implementation | |
| 4091 *imp1 = XRECORD_LHEADER_IMPLEMENTATION (obj1), | |
| 4092 *imp2 = XRECORD_LHEADER_IMPLEMENTATION (obj2); | |
| 4093 | |
| 4094 return (imp1 == imp2) && | |
| 4095 /* EQ-ness of the objects was noticed above */ | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4096 (imp1->equal && (imp1->equal) (obj1, obj2, depth, 1)); |
| 801 | 4097 } |
| 4098 | |
| 4099 return 0; | |
| 4100 } | |
| 4101 | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4102 int |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4103 internal_equal_0 (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4104 { |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4105 if (foldcase) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4106 return internal_equalp (obj1, obj2, depth); |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4107 else |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4108 return internal_equal (obj1, obj2, depth); |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4109 } |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4110 |
| 428 | 4111 /* Note that we may be calling sub-objects that will use |
| 4112 internal_equal() (instead of internal_old_equal()). Oh well. | |
| 4113 We will get an Ebola note if there's any possibility of confusion, | |
| 4114 but that seems unlikely. */ | |
| 4115 | |
| 4116 static int | |
| 4117 internal_old_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) | |
| 4118 { | |
| 4119 if (depth > 200) | |
| 563 | 4120 stack_overflow ("Stack overflow in equal", Qunbound); |
| 428 | 4121 QUIT; |
| 4122 if (HACKEQ_UNSAFE (obj1, obj2)) | |
| 4123 return 1; | |
| 4124 /* Note that (equal 20 20.0) should be nil */ | |
| 4125 if (XTYPE (obj1) != XTYPE (obj2)) | |
| 4126 return 0; | |
| 4127 | |
| 4128 return internal_equal (obj1, obj2, depth); | |
| 4129 } | |
| 4130 | |
| 4131 DEFUN ("equal", Fequal, 2, 2, 0, /* | |
| 4132 Return t if two Lisp objects have similar structure and contents. | |
| 4133 They must have the same data type. | |
| 4134 Conses are compared by comparing the cars and the cdrs. | |
| 4135 Vectors and strings are compared element by element. | |
| 4136 Numbers are compared by value. Symbols must match exactly. | |
| 4137 */ | |
| 444 | 4138 (object1, object2)) |
| 428 | 4139 { |
| 444 | 4140 return internal_equal (object1, object2, 0) ? Qt : Qnil; |
| 428 | 4141 } |
| 4142 | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4143 DEFUN ("equalp", Fequalp, 2, 2, 0, /* |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4144 Return t if two Lisp objects have similar structure and contents. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4145 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4146 This is like `equal', except that it accepts numerically equal |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4147 numbers of different types (float, integer, bignum, bigfloat), and also |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4148 compares strings and characters case-insensitively. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4149 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4150 Type objects that are arrays (that is, strings, bit-vectors, and vectors) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4151 of the same length and with contents that are `equalp' are themselves |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4152 `equalp', regardless of whether the two objects have the same type. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4153 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4154 Other objects whose primary purpose is as containers of other objects are |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4155 `equalp' if they would otherwise be equal (same length, type, etc.) and |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4156 their contents are `equalp'. This goes for conses, weak lists, |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4157 weak boxes, ephemerons, specifiers, hash tables, char tables and range |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4158 tables. However, objects that happen to contain other objects but are not |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4159 primarily designed for this purpose (e.g. compiled functions, events or |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4160 display-related objects such as glyphs, faces or extents) are currently |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4161 compared using `equalp' the same way as using `equal'. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4162 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4163 More specifically, two hash tables are `equalp' if they have the same test |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4164 (see `hash-table-test'), the same number of entries, and the same value for |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4165 `hash-table-weakness', and if, for each entry in one hash table, its key is |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4166 equivalent to a key in the other hash table using the hash table test, and |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4167 its value is `equalp' to the other hash table's value for that key. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4168 */ |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4169 (object1, object2)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4170 { |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4171 return internal_equalp (object1, object2, 0) ? Qt : Qnil; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4172 } |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4173 |
| 428 | 4174 DEFUN ("old-equal", Fold_equal, 2, 2, 0, /* |
| 4175 Return t if two Lisp objects have similar structure and contents. | |
| 4176 They must have the same data type. | |
| 4177 \(Note, however, that an exception is made for characters and integers; | |
| 4178 this is known as the "char-int confoundance disease." See `eq' and | |
| 4179 `old-eq'.) | |
| 4180 This function is provided only for byte-code compatibility with v19. | |
| 4181 Do not use it. | |
| 4182 */ | |
| 444 | 4183 (object1, object2)) |
| 428 | 4184 { |
| 444 | 4185 return internal_old_equal (object1, object2, 0) ? Qt : Qnil; |
| 428 | 4186 } |
| 4187 | |
| 4188 | |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4189 static Lisp_Object replace_string_range_1 (Lisp_Object dest, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4190 Lisp_Object start, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4191 Lisp_Object end, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4192 const Ibyte *source, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4193 const Ibyte *source_limit, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4194 Lisp_Object item); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4195 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4196 /* Fill the substring of DEST beginning at START and ending before END with |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4197 the character ITEM. If DEST does not have sufficient space for END - |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4198 START characters at START, write as many as is possible without changing |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4199 the character length of DEST. Update the string modification flag and do |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4200 any sledgehammer checks we have turned on. |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4201 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4202 START must be a Lisp integer. END can be nil, indicating the length of the |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4203 string, or a Lisp integer. The condition (<= 0 START END (length DEST)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4204 must hold, or fill_string_range() will signal an error. */ |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4205 static Lisp_Object |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4206 fill_string_range (Lisp_Object dest, Lisp_Object item, Lisp_Object start, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4207 Lisp_Object end) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4208 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4209 return replace_string_range_1 (dest, start, end, NULL, NULL, item); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4210 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4211 |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4212 DEFUN ("fill", Ffill, 2, MANY, 0, /* |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4213 Destructively modify SEQUENCE by replacing each element with ITEM. |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4214 SEQUENCE is a list, vector, bit vector, or string. |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4215 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4216 Optional keyword START is the index of the first element of SEQUENCE |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4217 to be modified, and defaults to zero. Optional keyword END is the |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4218 exclusive upper bound on the elements of SEQUENCE to be modified, and |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4219 defaults to the length of SEQUENCE. |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4220 |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4221 arguments: (SEQUENCE ITEM &key (START 0) (END (length SEQUENCE))) |
| 428 | 4222 */ |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4223 (int nargs, Lisp_Object *args)) |
| 428 | 4224 { |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4225 Lisp_Object sequence = args[0]; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4226 Lisp_Object item = args[1]; |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4227 Elemcount starting = 0, ending = EMACS_INT_MAX, ii, len; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4228 |
|
5277
d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5275
diff
changeset
|
4229 PARSE_KEYWORDS (Ffill, nargs, args, 2, (start, end), (start = Qzero)); |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4230 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4231 CHECK_NATNUM (start); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4232 starting = XINT (start); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4233 |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4234 if (!NILP (end)) |
| 428 | 4235 { |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4236 CHECK_NATNUM (end); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4237 ending = XINT (end); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4238 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4239 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4240 retry: |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4241 if (STRINGP (sequence)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4242 { |
| 428 | 4243 CHECK_CHAR_COERCE_INT (item); |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4244 CHECK_LISP_WRITEABLE (sequence); |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4245 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4246 fill_string_range (sequence, item, start, end); |
| 428 | 4247 } |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4248 else if (VECTORP (sequence)) |
| 428 | 4249 { |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4250 Lisp_Object *p = XVECTOR_DATA (sequence); |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4251 |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4252 CHECK_LISP_WRITEABLE (sequence); |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4253 len = XVECTOR_LENGTH (sequence); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4254 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4255 check_sequence_range (sequence, start, end, make_int (len)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4256 ending = min (ending, len); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4257 |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4258 for (ii = starting; ii < ending; ++ii) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4259 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4260 p[ii] = item; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4261 } |
| 428 | 4262 } |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4263 else if (BIT_VECTORP (sequence)) |
| 428 | 4264 { |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4265 Lisp_Bit_Vector *v = XBIT_VECTOR (sequence); |
| 428 | 4266 int bit; |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4267 |
| 428 | 4268 CHECK_BIT (item); |
| 444 | 4269 bit = XINT (item); |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4270 CHECK_LISP_WRITEABLE (sequence); |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4271 len = bit_vector_length (v); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4272 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4273 check_sequence_range (sequence, start, end, make_int (len)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4274 ending = min (ending, len); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4275 |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4276 for (ii = starting; ii < ending; ++ii) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4277 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4278 set_bit_vector_bit (v, ii, bit); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4279 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4280 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4281 else if (LISTP (sequence)) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4282 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4283 Elemcount counting = 0; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4284 |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4285 EXTERNAL_LIST_LOOP_3 (elt, sequence, tail) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4286 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4287 if (counting >= starting) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4288 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4289 if (counting < ending) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4290 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4291 XSETCAR (tail, item); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4292 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4293 else if (counting == ending) |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4294 { |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4295 break; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4296 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4297 } |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4298 ++counting; |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4299 } |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4300 |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
4301 if (counting < starting || (counting != ending && !NILP (end))) |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4302 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
4303 check_sequence_range (args[0], start, end, Flength (args[0])); |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4304 } |
| 428 | 4305 } |
| 4306 else | |
| 4307 { | |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4308 sequence = wrong_type_argument (Qsequencep, sequence); |
| 428 | 4309 goto retry; |
| 4310 } | |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
4311 return sequence; |
| 428 | 4312 } |
| 4313 | |
| 4314 Lisp_Object | |
| 4315 nconc2 (Lisp_Object arg1, Lisp_Object arg2) | |
| 4316 { | |
| 4317 Lisp_Object args[2]; | |
| 4318 struct gcpro gcpro1; | |
| 4319 args[0] = arg1; | |
| 4320 args[1] = arg2; | |
| 4321 | |
| 4322 GCPRO1 (args[0]); | |
| 4323 gcpro1.nvars = 2; | |
| 4324 | |
| 4325 RETURN_UNGCPRO (bytecode_nconc2 (args)); | |
| 4326 } | |
| 4327 | |
| 4328 Lisp_Object | |
| 4329 bytecode_nconc2 (Lisp_Object *args) | |
| 4330 { | |
| 4331 retry: | |
| 4332 | |
| 4333 if (CONSP (args[0])) | |
| 4334 { | |
| 4335 /* (setcdr (last args[0]) args[1]) */ | |
| 4336 Lisp_Object tortoise, hare; | |
| 665 | 4337 Elemcount count; |
| 428 | 4338 |
| 4339 for (hare = tortoise = args[0], count = 0; | |
| 4340 CONSP (XCDR (hare)); | |
| 4341 hare = XCDR (hare), count++) | |
| 4342 { | |
| 4343 if (count < CIRCULAR_LIST_SUSPICION_LENGTH) continue; | |
| 4344 | |
| 4345 if (count & 1) | |
| 4346 tortoise = XCDR (tortoise); | |
| 4347 if (EQ (hare, tortoise)) | |
| 4348 signal_circular_list_error (args[0]); | |
| 4349 } | |
| 4350 XCDR (hare) = args[1]; | |
| 4351 return args[0]; | |
| 4352 } | |
| 4353 else if (NILP (args[0])) | |
| 4354 { | |
| 4355 return args[1]; | |
| 4356 } | |
| 4357 else | |
| 4358 { | |
| 4359 args[0] = wrong_type_argument (args[0], Qlistp); | |
| 4360 goto retry; | |
| 4361 } | |
| 4362 } | |
| 4363 | |
| 4364 DEFUN ("nconc", Fnconc, 0, MANY, 0, /* | |
| 4365 Concatenate any number of lists by altering them. | |
| 4366 Only the last argument is not altered, and need not be a list. | |
| 4367 Also see: `append'. | |
| 4368 If the first argument is nil, there is no way to modify it by side | |
| 4369 effect; therefore, write `(setq foo (nconc foo list))' to be sure of | |
| 4370 changing the value of `foo'. | |
|
4693
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3842
diff
changeset
|
4371 |
|
80cd90837ac5
Add argument information to remaining MANY or UNEVALLED C subrs.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3842
diff
changeset
|
4372 arguments: (&rest ARGS) |
| 428 | 4373 */ |
| 4374 (int nargs, Lisp_Object *args)) | |
| 4375 { | |
| 4376 int argnum = 0; | |
| 4377 struct gcpro gcpro1; | |
| 4378 | |
| 4379 /* The modus operandi in Emacs is "caller gc-protects args". | |
| 4380 However, nconc (particularly nconc2 ()) is called many times | |
| 4381 in Emacs on freshly created stuff (e.g. you see the idiom | |
| 4382 nconc2 (Fcopy_sequence (foo), bar) a lot). So we help those | |
| 4383 callers out by protecting the args ourselves to save them | |
| 4384 a lot of temporary-variable grief. */ | |
| 4385 | |
| 4386 GCPRO1 (args[0]); | |
| 4387 gcpro1.nvars = nargs; | |
| 4388 | |
| 4389 while (argnum < nargs) | |
| 4390 { | |
| 4391 Lisp_Object val; | |
| 4392 retry: | |
| 4393 val = args[argnum]; | |
| 4394 if (CONSP (val)) | |
| 4395 { | |
| 4396 /* `val' is the first cons, which will be our return value. */ | |
| 4397 /* `last_cons' will be the cons cell to mutate. */ | |
| 4398 Lisp_Object last_cons = val; | |
| 4399 Lisp_Object tortoise = val; | |
| 4400 | |
| 4401 for (argnum++; argnum < nargs; argnum++) | |
| 4402 { | |
| 4403 Lisp_Object next = args[argnum]; | |
| 4404 retry_next: | |
| 4405 if (CONSP (next) || argnum == nargs -1) | |
| 4406 { | |
| 4407 /* (setcdr (last val) next) */ | |
| 665 | 4408 Elemcount count; |
| 428 | 4409 |
| 4410 for (count = 0; | |
| 4411 CONSP (XCDR (last_cons)); | |
| 4412 last_cons = XCDR (last_cons), count++) | |
| 4413 { | |
| 4414 if (count < CIRCULAR_LIST_SUSPICION_LENGTH) continue; | |
| 4415 | |
| 4416 if (count & 1) | |
| 4417 tortoise = XCDR (tortoise); | |
| 4418 if (EQ (last_cons, tortoise)) | |
| 4419 signal_circular_list_error (args[argnum-1]); | |
| 4420 } | |
| 4421 XCDR (last_cons) = next; | |
| 4422 } | |
| 4423 else if (NILP (next)) | |
| 4424 { | |
| 4425 continue; | |
| 4426 } | |
| 4427 else | |
| 4428 { | |
| 4429 next = wrong_type_argument (Qlistp, next); | |
| 4430 goto retry_next; | |
| 4431 } | |
| 4432 } | |
| 4433 RETURN_UNGCPRO (val); | |
| 4434 } | |
| 4435 else if (NILP (val)) | |
| 4436 argnum++; | |
| 4437 else if (argnum == nargs - 1) /* last arg? */ | |
| 4438 RETURN_UNGCPRO (val); | |
| 4439 else | |
| 4440 { | |
| 4441 args[argnum] = wrong_type_argument (Qlistp, val); | |
| 4442 goto retry; | |
| 4443 } | |
| 4444 } | |
| 4445 RETURN_UNGCPRO (Qnil); /* No non-nil args provided. */ | |
| 4446 } | |
| 4447 | |
| 4448 | |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4449 /* Replace the substring of DEST beginning at START and ending before END |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4450 with the text at SOURCE, which is END - START characters long and |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4451 SOURCE_LIMIT - SOURCE octets long. If DEST does not have sufficient |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4452 space for END - START characters at START, write as many as is possible |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4453 without changing the length of DEST. Update the string modification flag |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4454 and do any sledgehammer checks we have turned on in this build. |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4455 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4456 START must be a Lisp integer. END can be nil, indicating the length of the |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4457 string, or a Lisp integer. The condition (<= 0 START END (length DEST)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4458 must hold, or replace_string_range() will signal an error. */ |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4459 static Lisp_Object |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4460 replace_string_range (Lisp_Object dest, Lisp_Object start, Lisp_Object end, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4461 const Ibyte *source, const Ibyte *source_limit) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4462 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4463 return replace_string_range_1 (dest, start, end, source, source_limit, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4464 Qnil); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4465 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4466 |
| 434 | 4467 /* This is the guts of several mapping functions. |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4468 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4469 Call FUNCTION CALL_COUNT times, with NSEQUENCES arguments each time, |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4470 taking the elements from SEQUENCES. If VALS is non-NULL, store the |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4471 results into VALS, a C array of Lisp_Objects; else, if LISP_VALS is |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4472 non-nil, store the results into LISP_VALS, a sequence with sufficient |
|
5034
1b96882bdf37
Fix a multiple-value bug, mapcarX; correct a comment and a label name.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5002
diff
changeset
|
4473 room for CALL_COUNT results (but see the documentation of SOME_OR_EVERY.) |
|
1b96882bdf37
Fix a multiple-value bug, mapcarX; correct a comment and a label name.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5002
diff
changeset
|
4474 Else, do not accumulate any result. |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4475 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4476 If VALS is non-NULL, NSEQUENCES is one, and SEQUENCES[0] is a cons, |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4477 mapcarX will store the elements of SEQUENCES[0] in stack and GCPRO them, |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4478 so FUNCTION cannot insert a non-cons into SEQUENCES[0] and throw off |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4479 mapcarX. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4480 |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4481 Otherwise, mapcarX signals an invalid state error (see |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4482 mapping_interaction_error(), above) if it encounters a non-cons, |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4483 non-array when traversing SEQUENCES. Common Lisp specifies in |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4484 MAPPING-DESTRUCTIVE-INTERACTION that it is an error when FUNCTION |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4485 destructively modifies SEQUENCES in a way that might affect the ongoing |
|
4997
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
4486 traversal operation. |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
4487 |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4488 CALLER is a symbol describing the Lisp-visible function that was called, |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4489 and any errors thrown because SEQUENCES was modified will reflect it. |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4490 |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4491 If CALLER is Qsome, return the (possibly multiple) values given by |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4492 FUNCTION the first time it is non-nil, and abandon the iterations. |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4493 LISP_VALS must be the result of calling STORE_VOID_IN_LISP on the address |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4494 of a Lisp object, and the return value will be stored at that address. |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4495 If CALLER is Qevery, LISP_VALS must also reflect a pointer to a Lisp |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4496 object, and Qnil will be stored at that address if FUNCTION gives nil; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4497 otherwise it will be left alone. */ |
| 428 | 4498 |
| 4499 static void | |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4500 mapcarX (Elemcount call_count, Lisp_Object *vals, Lisp_Object lisp_vals, |
|
4997
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
4501 Lisp_Object function, int nsequences, Lisp_Object *sequences, |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4502 Lisp_Object caller) |
| 428 | 4503 { |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4504 Lisp_Object called, *args; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4505 struct gcpro gcpro1, gcpro2; |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
4506 Ibyte *lisp_vals_staging = NULL, *cursor = NULL; |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4507 int i, j; |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4508 |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4509 assert ((EQ (caller, Qsome) || EQ (caller, Qevery)) ? vals == NULL : 1); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4510 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4511 args = alloca_array (Lisp_Object, nsequences + 1); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4512 args[0] = function; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4513 for (i = 1; i <= nsequences; ++i) |
| 428 | 4514 { |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4515 args[i] = Qnil; |
| 428 | 4516 } |
| 4517 | |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4518 if (vals != NULL) |
| 428 | 4519 { |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4520 GCPRO2 (args[0], vals[0]); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4521 gcpro1.nvars = nsequences + 1; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4522 gcpro2.nvars = 0; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4523 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4524 else |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4525 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4526 GCPRO1 (args[0]); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4527 gcpro1.nvars = nsequences + 1; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4528 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4529 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4530 /* Be extra nice in the event that we've been handed one list and one |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4531 only; make it possible for FUNCTION to set cdrs not yet processed to |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4532 non-cons, non-nil objects without ill-effect, if we have been handed |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4533 the stack space to do that. */ |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4534 if (vals != NULL && 1 == nsequences && CONSP (sequences[0])) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4535 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4536 Lisp_Object lst = sequences[0]; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4537 Lisp_Object *val = vals; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4538 for (i = 0; i < call_count; ++i) |
| 434 | 4539 { |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4540 *val++ = XCAR (lst); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4541 lst = XCDR (lst); |
| 428 | 4542 } |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4543 gcpro2.nvars = call_count; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4544 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4545 for (i = 0; i < call_count; ++i) |
| 428 | 4546 { |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4547 args[1] = vals[i]; |
|
5034
1b96882bdf37
Fix a multiple-value bug, mapcarX; correct a comment and a label name.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5002
diff
changeset
|
4548 vals[i] = IGNORE_MULTIPLE_VALUES (Ffuncall (nsequences + 1, args)); |
| 428 | 4549 } |
| 4550 } | |
| 4551 else | |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4552 { |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
4553 enum lrecord_type lisp_vals_type = lrecord_type_symbol; |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4554 Binbyte *sequence_types = alloca_array (Binbyte, nsequences); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4555 for (j = 0; j < nsequences; ++j) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4556 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4557 sequence_types[j] = XRECORD_LHEADER (sequences[j])->type; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4558 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4559 |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4560 if (!EQ (caller, Qsome) && !EQ (caller, Qevery)) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4561 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4562 assert (LRECORDP (lisp_vals)); |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4563 |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4564 lisp_vals_type |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4565 = (enum lrecord_type) XRECORD_LHEADER (lisp_vals)->type; |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4566 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4567 if (lrecord_type_string == lisp_vals_type) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4568 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4569 lisp_vals_staging = cursor |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4570 = alloca_ibytes (call_count * MAX_ICHAR_LEN); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4571 } |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
4572 else if (ARRAYP (lisp_vals)) |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
4573 { |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
4574 CHECK_LISP_WRITEABLE (lisp_vals); |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
4575 } |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4576 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4577 |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4578 for (i = 0; i < call_count; ++i) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4579 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4580 for (j = 0; j < nsequences; ++j) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4581 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4582 switch (sequence_types[j]) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4583 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4584 case lrecord_type_cons: |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4585 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4586 if (!CONSP (sequences[j])) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4587 { |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4588 /* This means FUNCTION has messed around with a cons |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4589 in one of the sequences, since we checked the |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4590 type (CHECK_SEQUENCE()) and the length and |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4591 structure (with Flength()) correctly in our |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4592 callers. */ |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4593 mapping_interaction_error (caller, sequences[j]); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4594 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4595 args[j + 1] = XCAR (sequences[j]); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4596 sequences[j] = XCDR (sequences[j]); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4597 break; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4598 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4599 case lrecord_type_vector: |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4600 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4601 args[j + 1] = XVECTOR_DATA (sequences[j])[i]; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4602 break; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4603 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4604 case lrecord_type_string: |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4605 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4606 args[j + 1] = make_char (string_ichar (sequences[j], i)); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4607 break; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4608 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4609 case lrecord_type_bit_vector: |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4610 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4611 args[j + 1] |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4612 = make_int (bit_vector_bit (XBIT_VECTOR (sequences[j]), |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4613 i)); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4614 break; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4615 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4616 default: |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4617 ABORT(); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4618 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4619 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4620 called = Ffuncall (nsequences + 1, args); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4621 if (vals != NULL) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4622 { |
|
4997
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
4623 vals[i] = IGNORE_MULTIPLE_VALUES (called); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4624 gcpro2.nvars += 1; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4625 } |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4626 else if (EQ (Qsome, caller)) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4627 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4628 if (!NILP (IGNORE_MULTIPLE_VALUES (called))) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4629 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4630 Lisp_Object *result |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4631 = (Lisp_Object *) GET_VOID_FROM_LISP (lisp_vals); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4632 *result = called; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4633 UNGCPRO; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4634 return; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4635 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4636 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4637 else if (EQ (Qevery, caller)) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4638 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4639 if (NILP (IGNORE_MULTIPLE_VALUES (called))) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4640 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4641 Lisp_Object *result |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4642 = (Lisp_Object *) GET_VOID_FROM_LISP (lisp_vals); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4643 *result = Qnil; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4644 UNGCPRO; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4645 return; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4646 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4647 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4648 else |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4649 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4650 called = IGNORE_MULTIPLE_VALUES (called); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4651 switch (lisp_vals_type) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4652 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4653 case lrecord_type_symbol: |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4654 /* Discard the result of funcall. */ |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4655 break; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4656 case lrecord_type_cons: |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4657 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4658 if (!CONSP (lisp_vals)) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4659 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4660 /* If FUNCTION has inserted a non-cons non-nil |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4661 cdr into the list before we've processed the |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4662 relevant part, error. */ |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4663 mapping_interaction_error (caller, lisp_vals); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4664 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4665 XSETCAR (lisp_vals, called); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4666 lisp_vals = XCDR (lisp_vals); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4667 break; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4668 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4669 case lrecord_type_vector: |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4670 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4671 i < XVECTOR_LENGTH (lisp_vals) ? |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4672 (XVECTOR_DATA (lisp_vals)[i] = called) : |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4673 /* Let #'aset error. */ |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4674 Faset (lisp_vals, make_int (i), called); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4675 break; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4676 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4677 case lrecord_type_string: |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4678 { |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4679 CHECK_CHAR_COERCE_INT (called); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4680 cursor += set_itext_ichar (cursor, XCHAR (called)); |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4681 break; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4682 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4683 case lrecord_type_bit_vector: |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4684 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4685 (BITP (called) && |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4686 i < bit_vector_length (XBIT_VECTOR (lisp_vals))) ? |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4687 set_bit_vector_bit (XBIT_VECTOR (lisp_vals), i, |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4688 XINT (called)) : |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4689 (void) Faset (lisp_vals, make_int (i), called); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4690 break; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4691 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4692 default: |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4693 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4694 ABORT(); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4695 break; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4696 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4697 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4698 } |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4699 } |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4700 |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
4701 if (lisp_vals_staging != NULL) |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4702 { |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
4703 CHECK_LISP_WRITEABLE (lisp_vals); |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4704 replace_string_range (lisp_vals, Qzero, make_int (call_count), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4705 lisp_vals_staging, cursor); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4706 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4707 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
4708 |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4709 UNGCPRO; |
| 428 | 4710 } |
| 4711 | |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4712 /* Given NSEQUENCES objects at the address pointed to by SEQUENCES, return |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4713 the length of the shortest sequence. Error if all are circular, or if any |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4714 one of them is not a sequence. */ |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4715 static Elemcount |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4716 shortest_length_among_sequences (int nsequences, Lisp_Object *sequences) |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4717 { |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4718 Elemcount len = EMACS_INT_MAX; |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
4719 Lisp_Object length = Qnil; |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4720 int i; |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4721 |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4722 for (i = 0; i < nsequences; ++i) |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4723 { |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4724 if (CONSP (sequences[i])) |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4725 { |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4726 length = Flist_length (sequences[i]); |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4727 if (!NILP (length)) |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4728 { |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4729 len = min (len, XINT (length)); |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4730 } |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4731 } |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4732 else |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4733 { |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4734 CHECK_SEQUENCE (sequences[i]); |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4735 length = Flength (sequences[i]); |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4736 len = min (len, XINT (length)); |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4737 } |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4738 } |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4739 |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4740 if (NILP (length)) |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4741 { |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4742 signal_circular_list_error (sequences[0]); |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4743 } |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4744 |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4745 return len; |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4746 } |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4747 |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4748 DEFUN ("mapconcat", Fmapconcat, 3, MANY, 0, /* |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4749 Call FUNCTION on each element of SEQUENCE, and concat results to a string. |
| 751 | 4750 Between each pair of results, insert SEPARATOR. |
| 4751 | |
| 4752 Each result, and SEPARATOR, should be strings. Thus, using " " as SEPARATOR | |
| 4753 results in spaces between the values returned by FUNCTION. SEQUENCE itself | |
| 4754 may be a list, a vector, a bit vector, or a string. | |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4755 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4756 With optional SEQUENCES, call FUNCTION each time with as many arguments as |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4757 there are SEQUENCES, plus one for the element from SEQUENCE. One element |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4758 from each sequence will be used each time FUNCTION is called, and |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4759 `mapconcat' will give up once the shortest sequence is exhausted. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4760 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4761 arguments: (FUNCTION SEQUENCE SEPARATOR &rest SEQUENCES) |
| 428 | 4762 */ |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4763 (int nargs, Lisp_Object *args)) |
| 428 | 4764 { |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4765 Lisp_Object function = args[0]; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4766 Lisp_Object sequence = args[1]; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4767 Lisp_Object separator = args[2]; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4768 Elemcount len = EMACS_INT_MAX; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4769 Lisp_Object *args0; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4770 EMACS_INT i, nargs0; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4771 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4772 args[2] = sequence; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4773 args[1] = separator; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4774 |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4775 len = shortest_length_among_sequences (nargs - 2, args + 2); |
| 428 | 4776 |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
4777 if (len == 0) return build_ascstring (""); |
| 428 | 4778 |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4779 nargs0 = len + len - 1; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4780 args0 = alloca_array (Lisp_Object, nargs0); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4781 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4782 /* Special-case this, it's very common and doesn't require any |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4783 funcalls. Upside of doing it here, instead of cl-macs.el: no consing, |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4784 apart from the final string, we allocate everything on the stack. */ |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4785 if (EQ (function, Qidentity) && 3 == nargs && CONSP (sequence)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4786 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4787 for (i = 0; i < len; ++i) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4788 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4789 args0[i] = XCAR (sequence); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4790 sequence = XCDR (sequence); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4791 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4792 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4793 else |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4794 { |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4795 mapcarX (len, args0, Qnil, function, nargs - 2, args + 2, Qmapconcat); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4796 } |
| 428 | 4797 |
| 4798 for (i = len - 1; i >= 0; i--) | |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4799 args0[i + i] = args0[i]; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4800 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4801 for (i = 1; i < nargs0; i += 2) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4802 args0[i] = separator; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4803 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4804 return Fconcat (nargs0, args0); |
| 428 | 4805 } |
| 4806 | |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4807 DEFUN ("mapcar*", FmapcarX, 2, MANY, 0, /* |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4808 Call FUNCTION on each element of SEQUENCE; return a list of the results. |
| 434 | 4809 The result is a list of the same length as SEQUENCE. |
| 428 | 4810 SEQUENCE may be a list, a vector, a bit vector, or a string. |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4811 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4812 With optional SEQUENCES, call FUNCTION each time with as many arguments as |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4813 there are SEQUENCES, plus one for the element from SEQUENCE. One element |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4814 from each sequence will be used each time FUNCTION is called, and `mapcar' |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4815 stops calling FUNCTION once the shortest sequence is exhausted. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4816 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4817 arguments: (FUNCTION SEQUENCE &rest SEQUENCES) |
| 428 | 4818 */ |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4819 (int nargs, Lisp_Object *args)) |
| 428 | 4820 { |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4821 Lisp_Object function = args[0]; |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4822 Elemcount len = shortest_length_among_sequences (nargs - 1, args + 1); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4823 Lisp_Object *args0; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4824 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4825 args0 = alloca_array (Lisp_Object, len); |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4826 mapcarX (len, args0, Qnil, function, nargs - 1, args + 1, QmapcarX); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4827 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4828 return Flist ((int) len, args0); |
| 428 | 4829 } |
| 4830 | |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4831 DEFUN ("mapvector", Fmapvector, 2, MANY, 0, /* |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4832 Call FUNCTION on each element of SEQUENCE; return a vector of the results. |
| 428 | 4833 The result is a vector of the same length as SEQUENCE. |
| 434 | 4834 SEQUENCE may be a list, a vector, a bit vector, or a string. |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4835 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4836 With optional SEQUENCES, call FUNCTION each time with as many arguments as |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4837 there are SEQUENCES, plus one for the element from SEQUENCE. One element |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4838 from each sequence will be used each time FUNCTION is called, and |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4839 `mapvector' stops calling FUNCTION once the shortest sequence is exhausted. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4840 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4841 arguments: (FUNCTION SEQUENCE &rest SEQUENCES) |
| 428 | 4842 */ |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4843 (int nargs, Lisp_Object *args)) |
| 428 | 4844 { |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4845 Lisp_Object function = args[0]; |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4846 Elemcount len = shortest_length_among_sequences (nargs - 1, args + 1); |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4847 Lisp_Object result = make_vector (len, Qnil); |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4848 |
| 428 | 4849 struct gcpro gcpro1; |
| 4850 GCPRO1 (result); | |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4851 /* Don't pass result as the lisp_object argument, we want mapcarX to protect |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4852 a single list argument's elements from being garbage-collected. */ |
|
4997
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
4853 mapcarX (len, XVECTOR_DATA (result), Qnil, function, nargs - 1, args +1, |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4854 Qmapvector); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4855 RETURN_UNGCPRO (result); |
| 428 | 4856 } |
| 4857 | |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4858 DEFUN ("mapcan", Fmapcan, 2, MANY, 0, /* |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4859 Call FUNCTION on each element of SEQUENCE; chain the results together. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4860 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4861 FUNCTION must normally return a list; the results will be concatenated |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4862 together using `nconc'. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4863 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4864 With optional SEQUENCES, call FUNCTION each time with as many arguments as |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4865 there are SEQUENCES, plus one for the element from SEQUENCE. One element |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4866 from each sequence will be used each time FUNCTION is called, and |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4867 `mapcan' stops calling FUNCTION once the shortest sequence is exhausted. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4868 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4869 arguments: (FUNCTION SEQUENCE &rest SEQUENCES) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4870 */ |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4871 (int nargs, Lisp_Object *args)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4872 { |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4873 Elemcount len = shortest_length_among_sequences (nargs - 1, args + 1); |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4874 Lisp_Object function = args[0], *result = alloca_array (Lisp_Object, len); |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4875 |
|
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4876 mapcarX (len, result, Qnil, function, nargs - 1, args + 1, Qmapcan); |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4877 |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4878 /* #'nconc GCPROs its args in case of signals and error. */ |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4879 return Fnconc (len, result); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4880 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4881 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4882 DEFUN ("mapc", Fmapc, 2, MANY, 0, /* |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4883 Call FUNCTION on each element of SEQUENCE. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4884 |
| 428 | 4885 SEQUENCE may be a list, a vector, a bit vector, or a string. |
| 4886 This function is like `mapcar' but does not accumulate the results, | |
| 4887 which is more efficient if you do not use the results. | |
| 4888 | |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4889 With optional SEQUENCES, call FUNCTION each time with as many arguments as |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4890 there are SEQUENCES, plus one for the elements from SEQUENCE. One element |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4891 from each sequence will be used each time FUNCTION is called, and |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4892 `mapc' stops calling FUNCTION once the shortest sequence is exhausted. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4893 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4894 Return SEQUENCE. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4895 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4896 arguments: (FUNCTION SEQUENCE &rest SEQUENCES) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4897 */ |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4898 (int nargs, Lisp_Object *args)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4899 { |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4900 Elemcount len = shortest_length_among_sequences (nargs - 1, args + 1); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4901 Lisp_Object sequence = args[1]; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4902 struct gcpro gcpro1; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4903 /* We need to GCPRO sequence, because mapcarX will modify the |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4904 elements of the args array handed to it, and this may involve |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4905 elements of sequence getting garbage collected. */ |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4906 GCPRO1 (sequence); |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4907 mapcarX (len, NULL, Qnil, args[0], nargs - 1, args + 1, Qmapc); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4908 RETURN_UNGCPRO (sequence); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4909 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4910 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4911 DEFUN ("map", Fmap, 3, MANY, 0, /* |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4912 Map FUNCTION across one or more sequences, returning a sequence. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4913 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4914 TYPE is the sequence type to return, FUNCTION is the function, SEQUENCE is |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4915 the first argument sequence, SEQUENCES are the other argument sequences. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4916 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4917 FUNCTION will be called with (1+ (length SEQUENCES)) arguments, and must be |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4918 capable of accepting this number of arguments. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4919 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4920 Certain TYPEs are recognised internally by `map', but others are not, and |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4921 `coerce' may throw an error on an attempt to convert to a TYPE it does not |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4922 understand. A null TYPE means do not accumulate any values. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4923 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4924 arguments: (TYPE FUNCTION SEQUENCE &rest SEQUENCES) |
| 428 | 4925 */ |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4926 (int nargs, Lisp_Object *args)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4927 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4928 Lisp_Object type = args[0]; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4929 Lisp_Object function = args[1]; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4930 Lisp_Object result = Qnil; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4931 Lisp_Object *args0 = NULL; |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4932 Elemcount len = shortest_length_among_sequences (nargs - 2, args + 2); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4933 struct gcpro gcpro1; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4934 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4935 if (!NILP (type)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4936 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4937 args0 = alloca_array (Lisp_Object, len); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4938 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4939 |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
4940 mapcarX (len, args0, Qnil, function, nargs - 2, args + 2, Qmap); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4941 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4942 if (EQ (type, Qnil)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4943 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4944 return result; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4945 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4946 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4947 if (EQ (type, Qvector) || EQ (type, Qarray)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4948 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4949 result = Fvector (len, args0); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4950 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4951 else if (EQ (type, Qstring)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4952 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4953 result = Fstring (len, args0); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4954 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4955 else if (EQ (type, Qlist)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4956 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4957 result = Flist (len, args0); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4958 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4959 else if (EQ (type, Qbit_vector)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4960 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4961 result = Fbit_vector (len, args0); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4962 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4963 else |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4964 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4965 result = Flist (len, args0); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4966 GCPRO1 (result); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4967 result = call2 (Qcoerce, result, type); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4968 UNGCPRO; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4969 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4970 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4971 return result; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4972 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4973 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4974 DEFUN ("map-into", Fmap_into, 2, MANY, 0, /* |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4975 Modify RESULT-SEQUENCE using the return values of FUNCTION on SEQUENCES. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4976 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4977 RESULT-SEQUENCE and SEQUENCES can be lists or arrays. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4978 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4979 FUNCTION must accept at least as many arguments as there are SEQUENCES |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4980 \(possibly zero). If RESULT-SEQUENCE and the elements of SEQUENCES are not |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4981 the same length, stop when the shortest is exhausted; any elements of |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4982 RESULT-SEQUENCE beyond that are unmodified. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4983 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4984 Return RESULT-SEQUENCE. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4985 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4986 arguments: (RESULT-SEQUENCE FUNCTION &rest SEQUENCES) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4987 */ |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4988 (int nargs, Lisp_Object *args)) |
| 428 | 4989 { |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4990 Elemcount len; |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4991 Lisp_Object result_sequence = args[0]; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4992 Lisp_Object function = args[1]; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4993 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4994 args[0] = function; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4995 args[1] = result_sequence; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4996 |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
4997 len = shortest_length_among_sequences (nargs - 1, args + 1); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
4998 |
|
4997
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
4999 mapcarX (len, NULL, result_sequence, function, nargs - 2, args + 2, |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5000 Qmap_into); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5001 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5002 return result_sequence; |
| 428 | 5003 } |
|
4997
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5004 |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5005 DEFUN ("some", Fsome, 2, MANY, 0, /* |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5006 Return true if PREDICATE gives non-nil for an element of SEQUENCE. |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5007 |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5008 If so, return the value (possibly multiple) given by PREDICATE. |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5009 |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5010 With optional SEQUENCES, call PREDICATE each time with as many arguments as |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5011 there are SEQUENCES (plus one for the element from SEQUENCE). |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5012 |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5013 See also `find-if', which returns the corresponding element of SEQUENCE, |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5014 rather than the value given by PREDICATE, and accepts bounding index |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5015 keywords. |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5016 |
|
4997
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5017 arguments: (PREDICATE SEQUENCE &rest SEQUENCES) |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5018 */ |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5019 (int nargs, Lisp_Object *args)) |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5020 { |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5021 Lisp_Object result = Qnil, |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5022 result_ptr = STORE_VOID_IN_LISP ((void *) &result); |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
5023 Elemcount len = shortest_length_among_sequences (nargs - 1, args + 1); |
|
4997
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5024 |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5025 mapcarX (len, NULL, result_ptr, args[0], nargs - 1, args +1, Qsome); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5026 |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5027 return result; |
|
4997
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5028 } |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5029 |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5030 DEFUN ("every", Fevery, 2, MANY, 0, /* |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5031 Return true if PREDICATE is true of every element of SEQUENCE. |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5032 |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5033 With optional SEQUENCES, call PREDICATE each time with as many arguments as |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5034 there are SEQUENCES (plus one for the element from SEQUENCE). |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5035 |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5036 In contrast to `some', `every' never returns multiple values. |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5037 |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5038 arguments: (PREDICATE SEQUENCE &rest SEQUENCES) |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5039 */ |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5040 (int nargs, Lisp_Object *args)) |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5041 { |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5042 Lisp_Object result = Qt, result_ptr = STORE_VOID_IN_LISP ((void *) &result); |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
5043 Elemcount len = shortest_length_among_sequences (nargs - 1, args + 1); |
|
4997
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5044 |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5045 mapcarX (len, NULL, result_ptr, args[0], nargs - 1, args +1, Qevery); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5046 |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5047 return result; |
|
4997
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5048 } |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5049 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5050 /* Call FUNCTION with NLISTS arguments repeatedly, each Nth argument |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5051 corresponding to the result of calling (nthcdr ITERATION-COUNT LISTS[N]), |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5052 until that #'nthcdr expression gives nil for some element of LISTS. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5053 |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5054 CALLER is a symbol reflecting the Lisp-visible function that was called, |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5055 and any errors thrown because SEQUENCES was modified will reflect it. |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5056 |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5057 If CALLER is Qmapl, return LISTS[0]. Otherwise, return a list of the |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5058 return values from FUNCTION; if caller is Qmapcan, nconc them together. |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5059 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5060 In contrast to mapcarX, we don't require our callers to check LISTS for |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5061 well-formedness, we signal wrong-type-argument if it's not a list, or |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5062 circular-list if it's circular. */ |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5063 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5064 static Lisp_Object |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5065 maplist (Lisp_Object function, int nlists, Lisp_Object *lists, |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5066 Lisp_Object caller) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5067 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5068 Lisp_Object nconcing[2], accum = Qnil, *args, *tortoises, funcalled; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5069 Lisp_Object result = EQ (caller, Qmapl) ? lists[0] : Qnil; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5070 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5071 int i, j, continuing = (nlists > 0), called_count = 0; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5072 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5073 args = alloca_array (Lisp_Object, nlists + 1); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5074 args[0] = function; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5075 for (i = 1; i <= nlists; ++i) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5076 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5077 args[i] = Qnil; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5078 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5079 |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5080 tortoises = alloca_array (Lisp_Object, nlists); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5081 memcpy (tortoises, lists, nlists * sizeof (Lisp_Object)); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5082 |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5083 if (EQ (caller, Qmapcon)) |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5084 { |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5085 nconcing[0] = Qnil; |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5086 nconcing[1] = Qnil; |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5087 GCPRO4 (args[0], nconcing[0], tortoises[0], result); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5088 gcpro1.nvars = 1; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5089 gcpro2.nvars = 2; |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5090 gcpro3.nvars = nlists; |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5091 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5092 else |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5093 { |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5094 GCPRO3 (args[0], tortoises[0], result); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5095 gcpro1.nvars = 1; |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5096 gcpro2.nvars = nlists; |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5097 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5098 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5099 while (continuing) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5100 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5101 for (j = 0; j < nlists; ++j) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5102 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5103 if (CONSP (lists[j])) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5104 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5105 args[j + 1] = lists[j]; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5106 lists[j] = XCDR (lists[j]); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5107 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5108 else if (NILP (lists[j])) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5109 { |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5110 continuing = 0; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5111 break; |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5112 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5113 else |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5114 { |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5115 lists[j] = wrong_type_argument (Qlistp, lists[j]); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5116 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5117 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5118 if (!continuing) break; |
|
4997
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
5119 funcalled = IGNORE_MULTIPLE_VALUES (Ffuncall (nlists + 1, args)); |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5120 |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5121 if (EQ (caller, Qmapl)) |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5122 { |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5123 DO_NOTHING; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5124 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5125 else if (EQ (caller, Qmapcon)) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5126 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5127 nconcing[1] = funcalled; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5128 accum = bytecode_nconc2 (nconcing); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5129 if (NILP (result)) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5130 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5131 result = accum; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5132 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5133 /* Only check a given stretch of result for well-formedness |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5134 once: */ |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5135 nconcing[0] = funcalled; |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5136 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5137 else if (NILP (accum)) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5138 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5139 accum = result = Fcons (funcalled, Qnil); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5140 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5141 else |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5142 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5143 /* Add to the end, avoiding the need to call nreverse |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5144 once we're done: */ |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5145 XSETCDR (accum, Fcons (funcalled, Qnil)); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5146 accum = XCDR (accum); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5147 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5148 |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5149 if (++called_count > CIRCULAR_LIST_SUSPICION_LENGTH) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5150 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5151 if (called_count & 1) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5152 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5153 for (j = 0; j < nlists; ++j) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5154 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5155 tortoises[j] = XCDR (tortoises[j]); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5156 if (EQ (lists[j], tortoises[j])) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5157 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5158 signal_circular_list_error (lists[j]); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5159 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5160 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5161 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5162 else |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5163 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5164 for (j = 0; j < nlists; ++j) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5165 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5166 if (EQ (lists[j], tortoises[j])) |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5167 { |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5168 signal_circular_list_error (lists[j]); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5169 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5170 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5171 } |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5172 } |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5173 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5174 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5175 RETURN_UNGCPRO (result); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5176 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5177 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5178 DEFUN ("maplist", Fmaplist, 2, MANY, 0, /* |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5179 Call FUNCTION on each sublist of LIST and LISTS. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5180 Like `mapcar', except applies to lists and their cdr's rather than to |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5181 the elements themselves." |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5182 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5183 arguments: (FUNCTION LIST &rest LISTS) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5184 */ |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5185 (int nargs, Lisp_Object *args)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5186 { |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5187 return maplist (args[0], nargs - 1, args + 1, Qmaplist); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5188 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5189 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5190 DEFUN ("mapl", Fmapl, 2, MANY, 0, /* |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5191 Like `maplist', but do not accumulate values returned by the function. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5192 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5193 arguments: (FUNCTION LIST &rest LISTS) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5194 */ |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5195 (int nargs, Lisp_Object *args)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5196 { |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5197 return maplist (args[0], nargs - 1, args + 1, Qmapl); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5198 } |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5199 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5200 DEFUN ("mapcon", Fmapcon, 2, MANY, 0, /* |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5201 Like `maplist', but chains together the values returned by FUNCTION. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5202 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5203 FUNCTION must return a list (unless it happens to be the last |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5204 iteration); the results will be concatenated together using `nconc'. |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5205 |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5206 arguments: (FUNCTION LIST &rest LISTS) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5207 */ |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5208 (int nargs, Lisp_Object *args)) |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5209 { |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
5210 return maplist (args[0], nargs - 1, args + 1, Qmapcon); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
5211 } |
| 428 | 5212 |
| 771 | 5213 /* Extra random functions */ |
| 442 | 5214 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5215 DEFUN ("reduce", Freduce, 2, MANY, 0, /* |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5216 Combine the elements of sequence using FUNCTION, a binary operation. |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5217 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5218 For example, `(reduce #'+ SEQUENCE)' returns the sum of all elements in |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5219 SEQUENCE, and `(reduce #'union SEQUENCE)' returns the union of all elements |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5220 in SEQUENCE. |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5221 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5222 Keywords supported: :start :end :from-end :initial-value :key |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5223 See `remove*' for the meaning of :start, :end, :from-end and :key. |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5224 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5225 :initial-value specifies an element (typically an identity element, such as |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5226 0) that is conceptually prepended to the sequence (or appended, when |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5227 :from-end is given). |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5228 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5229 If the sequence has one element, that element is returned directly. |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5230 If the sequence has no elements, :initial-value is returned if given; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5231 otherwise, FUNCTION is called with no arguments, and its result returned. |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5232 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5233 arguments: (FUNCTION SEQUENCE &key (START 0) (END (length SEQUENCE)) FROM-END INITIAL-VALUE (KEY #'identity)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5234 */ |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5235 (int nargs, Lisp_Object *args)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5236 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5237 Lisp_Object function = args[0], sequence = args[1], accum = Qunbound; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5238 Elemcount starting, ending = EMACS_INT_MAX, ii = 0; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5239 |
|
5277
d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5275
diff
changeset
|
5240 PARSE_KEYWORDS (Freduce, nargs, args, 5, |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5241 (start, end, from_end, initial_value, key), |
|
5277
d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5275
diff
changeset
|
5242 (start = Qzero, initial_value = Qunbound)); |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5243 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5244 CHECK_SEQUENCE (sequence); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5245 CHECK_NATNUM (start); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5246 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5247 CHECK_KEY_ARGUMENT (key); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5248 |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5249 #define KEY(key, item) (EQ (Qidentity, key) ? item : \ |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5250 IGNORE_MULTIPLE_VALUES (call1 (key, item))) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5251 #define CALL2(function, accum, item) \ |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5252 IGNORE_MULTIPLE_VALUES (call2 (function, accum, item)) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5253 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5254 starting = XINT (start); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5255 if (!NILP (end)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5256 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5257 CHECK_NATNUM (end); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5258 ending = XINT (end); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5259 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5260 |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5261 if (!(starting <= ending)) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5262 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5263 check_sequence_range (sequence, start, end, Flength (sequence)); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5264 } |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5265 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5266 if (VECTORP (sequence)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5267 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5268 Lisp_Vector *vv = XVECTOR (sequence); |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5269 struct gcpro gcpro1; |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5270 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5271 check_sequence_range (sequence, start, end, make_int (vv->size)); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5272 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5273 ending = min (ending, vv->size); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5274 |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5275 GCPRO1 (accum); |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5276 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5277 if (!UNBOUNDP (initial_value)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5278 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5279 accum = initial_value; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5280 } |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5281 else if (ending - starting) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5282 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5283 if (NILP (from_end)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5284 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5285 accum = KEY (key, vv->contents[starting]); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5286 starting++; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5287 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5288 else |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5289 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5290 accum = KEY (key, vv->contents[ending - 1]); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5291 ending--; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5292 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5293 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5294 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5295 if (NILP (from_end)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5296 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5297 for (ii = starting; ii < ending; ++ii) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5298 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5299 accum = CALL2 (function, accum, KEY (key, vv->contents[ii])); |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5300 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5301 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5302 else |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5303 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5304 for (ii = ending - 1; ii >= starting; --ii) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5305 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5306 accum = CALL2 (function, KEY (key, vv->contents[ii]), accum); |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5307 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5308 } |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5309 |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5310 UNGCPRO; |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5311 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5312 else if (BIT_VECTORP (sequence)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5313 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5314 Lisp_Bit_Vector *bv = XBIT_VECTOR (sequence); |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5315 struct gcpro gcpro1; |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5316 |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5317 check_sequence_range (sequence, start, end, make_int (bv->size)); |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5318 ending = min (ending, bv->size); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5319 |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5320 GCPRO1 (accum); |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5321 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5322 if (!UNBOUNDP (initial_value)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5323 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5324 accum = initial_value; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5325 } |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5326 else if (ending - starting) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5327 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5328 if (NILP (from_end)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5329 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5330 accum = KEY (key, make_int (bit_vector_bit (bv, starting))); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5331 starting++; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5332 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5333 else |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5334 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5335 accum = KEY (key, make_int (bit_vector_bit (bv, ending - 1))); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5336 ending--; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5337 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5338 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5339 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5340 if (NILP (from_end)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5341 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5342 for (ii = starting; ii < ending; ++ii) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5343 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5344 accum = CALL2 (function, accum, |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5345 KEY (key, make_int (bit_vector_bit (bv, ii)))); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5346 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5347 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5348 else |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5349 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5350 for (ii = ending - 1; ii >= starting; --ii) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5351 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5352 accum = CALL2 (function, KEY (key, |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5353 make_int (bit_vector_bit (bv, |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5354 ii))), |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5355 accum); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5356 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5357 } |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5358 |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5359 UNGCPRO; |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5360 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5361 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5362 else if (STRINGP (sequence)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5363 { |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5364 struct gcpro gcpro1; |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5365 |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5366 GCPRO1 (accum); |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5367 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5368 if (NILP (from_end)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5369 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5370 Bytecount byte_len = XSTRING_LENGTH (sequence); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5371 Bytecount cursor_offset = 0; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5372 const Ibyte *startp = XSTRING_DATA (sequence); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5373 const Ibyte *cursor = startp; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5374 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5375 for (ii = 0; ii != starting && cursor_offset < byte_len; ++ii) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5376 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5377 INC_IBYTEPTR (cursor); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5378 cursor_offset = cursor - startp; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5379 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5380 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5381 if (!UNBOUNDP (initial_value)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5382 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5383 accum = initial_value; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5384 } |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5385 else if (ending - starting && cursor_offset < byte_len) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5386 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5387 accum = KEY (key, make_char (itext_ichar (cursor))); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5388 starting++; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5389 startp = XSTRING_DATA (sequence); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5390 cursor = startp + cursor_offset; |
|
5241
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5391 |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5392 if (byte_len != XSTRING_LENGTH (sequence) |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5393 || !valid_ibyteptr_p (cursor)) |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5394 { |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5395 mapping_interaction_error (Qreduce, sequence); |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5396 } |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5397 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5398 INC_IBYTEPTR (cursor); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5399 cursor_offset = cursor - startp; |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5400 ii++; |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5401 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5402 |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5403 while (cursor_offset < byte_len && ii < ending) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5404 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5405 accum = CALL2 (function, accum, |
|
5241
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5406 KEY (key, make_char (itext_ichar (cursor)))); |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5407 |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5408 startp = XSTRING_DATA (sequence); |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5409 cursor = startp + cursor_offset; |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5410 |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5411 if (byte_len != XSTRING_LENGTH (sequence) |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5412 || !valid_ibyteptr_p (cursor)) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5413 { |
|
5241
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5414 mapping_interaction_error (Qreduce, sequence); |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5415 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5416 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5417 INC_IBYTEPTR (cursor); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5418 cursor_offset = cursor - startp; |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5419 ++ii; |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5420 } |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5421 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5422 if (ii < starting || (ii < ending && !NILP (end))) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5423 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5424 check_sequence_range (sequence, start, end, Flength (sequence)); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5425 } |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5426 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5427 else |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5428 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5429 Elemcount len = string_char_length (sequence); |
|
5241
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5430 Bytecount cursor_offset, byte_len = XSTRING_LENGTH (sequence); |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5431 const Ibyte *cursor; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5432 |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5433 check_sequence_range (sequence, start, end, make_int (len)); |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5434 ending = min (ending, len); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5435 cursor = string_char_addr (sequence, ending - 1); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5436 cursor_offset = cursor - XSTRING_DATA (sequence); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5437 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5438 if (!UNBOUNDP (initial_value)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5439 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5440 accum = initial_value; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5441 } |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5442 else if (ending - starting) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5443 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5444 accum = KEY (key, make_char (itext_ichar (cursor))); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5445 ending--; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5446 if (ending > 0) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5447 { |
|
5241
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5448 cursor = XSTRING_DATA (sequence) + cursor_offset; |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5449 |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5450 if (!valid_ibyteptr_p (cursor)) |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5451 { |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5452 mapping_interaction_error (Qreduce, sequence); |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5453 } |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5454 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5455 DEC_IBYTEPTR (cursor); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5456 cursor_offset = cursor - XSTRING_DATA (sequence); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5457 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5458 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5459 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5460 for (ii = ending - 1; ii >= starting; --ii) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5461 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5462 accum = CALL2 (function, KEY (key, |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5463 make_char (itext_ichar (cursor))), |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5464 accum); |
|
5241
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5465 if (ii > 0) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5466 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5467 cursor = XSTRING_DATA (sequence) + cursor_offset; |
|
5241
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5468 |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5469 if (byte_len != XSTRING_LENGTH (sequence) |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5470 || !valid_ibyteptr_p (cursor)) |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5471 { |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5472 mapping_interaction_error (Qreduce, sequence); |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5473 } |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5474 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5475 DEC_IBYTEPTR (cursor); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5476 cursor_offset = cursor - XSTRING_DATA (sequence); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5477 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5478 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5479 } |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5480 |
|
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5481 UNGCPRO; |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5482 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5483 else if (LISTP (sequence)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5484 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5485 if (NILP (from_end)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5486 { |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5487 struct gcpro gcpro1, gcpro2; |
|
5241
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5488 Lisp_Object tailed = Qnil; |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5489 |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
5490 GCPRO2 (tailed, accum); |
|
5241
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5491 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5492 if (!UNBOUNDP (initial_value)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5493 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5494 accum = initial_value; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5495 } |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5496 else if (ending - starting) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5497 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5498 EXTERNAL_LIST_LOOP_3 (elt, sequence, tail) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5499 { |
|
5241
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5500 /* KEY may amputate the list behind us; make sure what |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5501 remains to be processed is still reachable. */ |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5502 tailed = tail; |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5503 if (ii == starting) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5504 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5505 accum = KEY (key, elt); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5506 starting++; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5507 break; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5508 } |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5509 ++ii; |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5510 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5511 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5512 |
|
5275
5a9aa6c40c9b
Avoid statement-before-declaration problems with strict C89 builds, fns.c
Aidan Kehoe <kehoea@parhasard.net>
parents:
5273
diff
changeset
|
5513 ii = 0; |
|
5a9aa6c40c9b
Avoid statement-before-declaration problems with strict C89 builds, fns.c
Aidan Kehoe <kehoea@parhasard.net>
parents:
5273
diff
changeset
|
5514 |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5515 if (ending - starting) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5516 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5517 EXTERNAL_LIST_LOOP_3 (elt, sequence, tail) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5518 { |
|
5241
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5519 /* KEY or FUNCTION may amputate the list behind us; make |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5520 sure what remains to be processed is still |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5521 reachable. */ |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5522 tailed = tail; |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5523 if (ii >= starting) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5524 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5525 if (ii < ending) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5526 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5527 accum = CALL2 (function, accum, KEY (key, elt)); |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5528 } |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5529 else if (ii == ending) |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5530 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5531 break; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5532 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5533 } |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5534 ++ii; |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5535 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5536 } |
|
5241
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5537 |
|
d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
Aidan Kehoe <kehoea@parhasard.net>
parents:
5227
diff
changeset
|
5538 UNGCPRO; |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5539 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5540 if (ii < starting || (ii < ending && !NILP (end))) |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5541 { |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5542 check_sequence_range (sequence, start, end, Flength (sequence)); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5543 } |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5544 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5545 else |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5546 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5547 Boolint need_accum = 0; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5548 Lisp_Object *subsequence = NULL; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5549 Elemcount counting = 0, len = 0; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5550 struct gcpro gcpro1; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5551 |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5552 len = XINT (Flength (sequence)); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5553 check_sequence_range (sequence, start, end, make_int (len)); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5554 ending = min (ending, len); |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5555 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5556 /* :from-end with a list; make an alloca copy of the relevant list |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5557 data, attempting to go backwards isn't worth the trouble. */ |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5558 if (!UNBOUNDP (initial_value)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5559 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5560 accum = initial_value; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5561 if (ending - starting && starting < ending) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5562 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5563 subsequence = alloca_array (Lisp_Object, ending - starting); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5564 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5565 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5566 else if (ending - starting && starting < ending) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5567 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5568 subsequence = alloca_array (Lisp_Object, ending - starting); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5569 need_accum = 1; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5570 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5571 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5572 if (ending - starting && starting < ending) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5573 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5574 EXTERNAL_LIST_LOOP_3 (elt, sequence, tail) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5575 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5576 if (counting >= starting) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5577 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5578 if (counting < ending) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5579 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5580 subsequence[ii++] = elt; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5581 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5582 else if (counting == ending) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5583 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5584 break; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5585 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5586 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5587 ++counting; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5588 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5589 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5590 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5591 if (subsequence != NULL) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5592 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5593 len = ending - starting; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5594 /* If we could be sure that neither FUNCTION nor KEY modify |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5595 SEQUENCE, this wouldn't be necessary, since all the |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5596 elements of SUBSEQUENCE would definitely always be |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5597 reachable via SEQUENCE. */ |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5598 GCPRO1 (subsequence[0]); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5599 gcpro1.nvars = len; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5600 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5601 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5602 if (need_accum) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5603 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5604 accum = KEY (key, subsequence[len - 1]); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5605 --len; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5606 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5607 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5608 for (ii = len; ii != 0;) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5609 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5610 --ii; |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5611 accum = CALL2 (function, KEY (key, subsequence[ii]), accum); |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5612 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5613 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5614 if (subsequence != NULL) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5615 { |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5616 UNGCPRO; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5617 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5618 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5619 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5620 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5621 /* At this point, if ACCUM is unbound, SEQUENCE has no elements; we |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5622 need to return the result of calling FUNCTION with zero |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5623 arguments. */ |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5624 if (UNBOUNDP (accum)) |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5625 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5626 accum = IGNORE_MULTIPLE_VALUES (call0 (function)); |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5627 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5628 |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5629 return accum; |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5630 } |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
5631 |
| 442 | 5632 DEFUN ("replace-list", Freplace_list, 2, 2, 0, /* |
| 5633 Destructively replace the list OLD with NEW. | |
| 5634 This is like (copy-sequence NEW) except that it reuses the | |
| 5635 conses in OLD as much as possible. If OLD and NEW are the same | |
| 5636 length, no consing will take place. | |
| 5637 */ | |
| 3025 | 5638 (old, new_)) |
| 442 | 5639 { |
| 2367 | 5640 Lisp_Object oldtail = old, prevoldtail = Qnil; |
| 5641 | |
| 3025 | 5642 EXTERNAL_LIST_LOOP_2 (elt, new_) |
| 442 | 5643 { |
| 5644 if (!NILP (oldtail)) | |
| 5645 { | |
| 5646 CHECK_CONS (oldtail); | |
| 2367 | 5647 XCAR (oldtail) = elt; |
| 442 | 5648 } |
| 5649 else if (!NILP (prevoldtail)) | |
| 5650 { | |
| 2367 | 5651 XCDR (prevoldtail) = Fcons (elt, Qnil); |
| 442 | 5652 prevoldtail = XCDR (prevoldtail); |
| 5653 } | |
| 5654 else | |
| 2367 | 5655 old = oldtail = Fcons (elt, Qnil); |
| 442 | 5656 |
| 5657 if (!NILP (oldtail)) | |
| 5658 { | |
| 5659 prevoldtail = oldtail; | |
| 5660 oldtail = XCDR (oldtail); | |
| 5661 } | |
| 5662 } | |
| 5663 | |
| 5664 if (!NILP (prevoldtail)) | |
| 5665 XCDR (prevoldtail) = Qnil; | |
| 5666 else | |
| 5667 old = Qnil; | |
| 5668 | |
| 5669 return old; | |
| 5670 } | |
| 5671 | |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5672 /* This function is the implementation of fill_string_range() and |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5673 replace_string_range(); see the comments for those functions. */ |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5674 static Lisp_Object |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5675 replace_string_range_1 (Lisp_Object dest, Lisp_Object start, Lisp_Object end, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5676 const Ibyte *source, const Ibyte *source_limit, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5677 Lisp_Object item) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5678 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5679 Ibyte *destp = XSTRING_DATA (dest), *p = destp, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5680 *pend = p + XSTRING_LENGTH (dest), *pcursor, item_buf[MAX_ICHAR_LEN]; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5681 Bytecount prefix_bytecount, source_len = source_limit - source; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5682 Charcount ii = 0, starting = XINT (start), ending, len; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5683 Elemcount delta; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5684 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5685 while (ii < starting && p < pend) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5686 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5687 INC_IBYTEPTR (p); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5688 ii++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5689 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5690 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5691 pcursor = p; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5692 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5693 if (NILP (end)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5694 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5695 while (pcursor < pend) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5696 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5697 INC_IBYTEPTR (pcursor); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5698 ii++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5699 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5700 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5701 ending = len = ii; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5702 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5703 else |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5704 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5705 ending = XINT (end); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5706 while (ii < ending && pcursor < pend) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5707 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5708 INC_IBYTEPTR (pcursor); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5709 ii++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5710 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5711 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5712 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5713 if (pcursor == pend) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5714 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5715 /* We have the length, check it for our callers. */ |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5716 check_sequence_range (dest, start, end, make_int (ii)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5717 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5718 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5719 if (!(p == pend || p == pcursor)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5720 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5721 prefix_bytecount = p - destp; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5722 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5723 if (!NILP (item)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5724 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5725 assert (source == NULL && source_limit == NULL); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5726 source_len = set_itext_ichar (item_buf, XCHAR (item)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5727 delta = (source_len * (ending - starting)) - (pcursor - p); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5728 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5729 else |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5730 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5731 assert (source != NULL && source_limit != NULL); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5732 delta = source_len - (pcursor - p); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5733 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5734 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5735 if (delta) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5736 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5737 resize_string (dest, prefix_bytecount, delta); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5738 destp = XSTRING_DATA (dest); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5739 pcursor = destp + prefix_bytecount + (pcursor - p); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5740 p = destp + prefix_bytecount; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5741 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5742 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5743 if (CHARP (item)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5744 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5745 while (starting < ending) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5746 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5747 memcpy (p, item_buf, source_len); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5748 p += source_len; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5749 starting++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5750 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5751 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5752 else |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5753 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5754 while (starting < ending && source < source_limit) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5755 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5756 source_len = itext_copy_ichar (source, p); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5757 p += source_len, source += source_len; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5758 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5759 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5760 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5761 init_string_ascii_begin (dest); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5762 bump_string_modiff (dest); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5763 sledgehammer_check_ascii_begin (dest); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5764 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5765 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5766 return dest; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5767 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5768 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5769 DEFUN ("replace", Freplace, 2, MANY, 0, /* |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5770 Replace the elements of SEQUENCE-ONE with the elements of SEQUENCE-TWO. |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5771 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5772 SEQUENCE-ONE is destructively modified, and returned. Its length is not |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5773 changed. |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5774 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5775 Keywords :start1 and :end1 specify a subsequence of SEQUENCE-ONE, and |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5776 :start2 and :end2 a subsequence of SEQUENCE-TWO. See `search' for more |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5777 information. |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5778 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5779 arguments: (SEQUENCE-ONE SEQUENCE-TWO &key (START1 0) (END1 (length SEQUENCE-ONE)) (START2 0) (END2 (length SEQUENCE-TWO))) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5780 */ |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5781 (int nargs, Lisp_Object *args)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5782 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5783 Lisp_Object sequence1 = args[0], sequence2 = args[1], |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5784 result = sequence1; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5785 Elemcount starting1, ending1 = EMACS_INT_MAX, starting2; |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5786 Elemcount ending2 = EMACS_INT_MAX, counting = 0, startcounting; |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5787 Boolint sequence1_listp, sequence2_listp, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5788 overwriting = EQ (sequence1, sequence2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5789 |
|
5277
d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5275
diff
changeset
|
5790 PARSE_KEYWORDS (Freplace, nargs, args, 4, (start1, end1, start2, end2), |
|
d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5275
diff
changeset
|
5791 (start1 = start2 = Qzero)); |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5792 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5793 CHECK_SEQUENCE (sequence1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5794 CHECK_LISP_WRITEABLE (sequence1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5795 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5796 CHECK_SEQUENCE (sequence2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5797 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5798 CHECK_NATNUM (start1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5799 starting1 = XINT (start1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5800 CHECK_NATNUM (start2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5801 starting2 = XINT (start2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5802 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5803 if (!NILP (end1)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5804 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5805 CHECK_NATNUM (end1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5806 ending1 = XINT (end1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5807 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5808 if (!(starting1 <= ending1)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5809 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5810 args_out_of_range_3 (sequence1, start1, end1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5811 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5812 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5813 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5814 if (!NILP (end2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5815 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5816 CHECK_NATNUM (end2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5817 ending2 = XINT (end2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5818 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5819 if (!(starting2 <= ending2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5820 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5821 args_out_of_range_3 (sequence1, start2, end2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5822 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5823 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5824 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5825 sequence1_listp = LISTP (sequence1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5826 sequence2_listp = LISTP (sequence2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5827 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5828 overwriting = overwriting && starting2 <= starting1; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5829 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5830 if (sequence1_listp && !ZEROP (start1)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5831 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5832 sequence1 = Fnthcdr (start1, sequence1); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5833 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5834 if (NILP (sequence1)) |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5835 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5836 check_sequence_range (args[0], start1, end1, Flength (args[0])); |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5837 /* Give up early here. */ |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5838 return result; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5839 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5840 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5841 ending1 -= starting1; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5842 starting1 = 0; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5843 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5844 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5845 if (sequence2_listp && !ZEROP (start2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5846 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5847 sequence2 = Fnthcdr (start2, sequence2); |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5848 |
|
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5849 if (NILP (sequence2)) |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5850 { |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5851 check_sequence_range (args[1], start1, end1, Flength (args[1])); |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5852 /* Nothing available to replace sequence1's contents. */ |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5853 return result; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5854 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5855 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5856 ending2 -= starting2; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5857 starting2 = 0; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5858 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5859 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5860 if (overwriting) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5861 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5862 if (EQ (start1, start2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5863 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5864 return result; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5865 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5866 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5867 /* Our ranges may overlap. Save the data that might be overwritten. */ |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5868 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5869 if (CONSP (sequence2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5870 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5871 Elemcount len = XINT (Flength (sequence2)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5872 Lisp_Object *subsequence |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5873 = alloca_array (Lisp_Object, min (ending2, len)); |
|
5272
66dbef5f8076
Be better about bounds-checking, #'subseq, #'fill; add same, #'reduce.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5262
diff
changeset
|
5874 Elemcount ii = 0; |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5875 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5876 LIST_LOOP_2 (elt, sequence2) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5877 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5878 if (counting == ending2) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5879 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5880 break; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5881 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5882 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5883 subsequence[ii++] = elt; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5884 counting++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5885 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5886 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5887 check_sequence_range (sequence1, start1, end1, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5888 /* The XINT (start2) is intentional here; we |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5889 called #'length after doing (nthcdr |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5890 start2 sequence2). */ |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5891 make_int (XINT (start2) + len)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5892 check_sequence_range (sequence2, start2, end2, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5893 make_int (XINT (start2) + len)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5894 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5895 while (starting1 < ending1 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5896 && starting2 < ending2 && !NILP (sequence1)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5897 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5898 XSETCAR (sequence1, subsequence[starting2]); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5899 sequence1 = XCDR (sequence1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5900 starting1++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5901 starting2++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5902 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5903 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5904 else if (STRINGP (sequence2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5905 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5906 Ibyte *p = XSTRING_DATA (sequence2), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5907 *pend = p + XSTRING_LENGTH (sequence2), *pcursor, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5908 *staging; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5909 Bytecount ii = 0; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5910 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5911 while (ii < starting2 && p < pend) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5912 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5913 INC_IBYTEPTR (p); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5914 ii++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5915 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5916 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5917 pcursor = p; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5918 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5919 while (ii < ending2 && starting1 < ending1 && pcursor < pend) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5920 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5921 INC_IBYTEPTR (pcursor); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5922 starting1++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5923 ii++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5924 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5925 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5926 if (pcursor == pend) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5927 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5928 check_sequence_range (sequence1, start1, end1, make_int (ii)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5929 check_sequence_range (sequence2, start2, end2, make_int (ii)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5930 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5931 else |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5932 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5933 assert ((pcursor - p) > 0); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5934 staging = alloca_ibytes (pcursor - p); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5935 memcpy (staging, p, pcursor - p); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5936 replace_string_range (result, start1, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5937 make_int (starting1), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5938 staging, staging + (pcursor - p)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5939 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5940 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5941 else |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5942 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5943 Elemcount seq_len = XINT (Flength (sequence2)), ii = 0, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5944 subseq_len = min (min (ending1 - starting1, seq_len - starting1), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5945 min (ending2 - starting2, seq_len - starting2)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5946 Lisp_Object *subsequence = alloca_array (Lisp_Object, subseq_len); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5947 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5948 check_sequence_range (sequence1, start1, end1, make_int (seq_len)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5949 check_sequence_range (sequence2, start2, end2, make_int (seq_len)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5950 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5951 while (starting2 < ending2 && ii < seq_len) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5952 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5953 subsequence[ii] = Faref (sequence2, make_int (starting2)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5954 ii++, starting2++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5955 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5956 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5957 ii = 0; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5958 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5959 while (starting1 < ending1 && ii < seq_len) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5960 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5961 Faset (sequence1, make_int (starting1), subsequence[ii]); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5962 ii++, starting1++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5963 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5964 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5965 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5966 else if (sequence1_listp && sequence2_listp) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5967 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5968 Lisp_Object sequence1_tortoise = sequence1, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5969 sequence2_tortoise = sequence2; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5970 Elemcount shortest_len = 0; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5971 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5972 counting = startcounting = min (ending1, ending2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5973 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5974 while (counting-- > 0 && !NILP (sequence1) && !NILP (sequence2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5975 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5976 XSETCAR (sequence1, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5977 CONSP (sequence2) ? XCAR (sequence2) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5978 : Fcar (sequence2)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5979 sequence1 = CONSP (sequence1) ? XCDR (sequence1) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5980 : Fcdr (sequence1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5981 sequence2 = CONSP (sequence2) ? XCDR (sequence2) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5982 : Fcdr (sequence2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5983 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5984 shortest_len++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5985 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5986 if (startcounting - counting > CIRCULAR_LIST_SUSPICION_LENGTH) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5987 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5988 if (counting & 1) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5989 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5990 sequence1_tortoise = XCDR (sequence1_tortoise); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5991 sequence2_tortoise = XCDR (sequence2_tortoise); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5992 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5993 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5994 if (EQ (sequence1, sequence1_tortoise)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5995 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5996 signal_circular_list_error (sequence1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5997 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5998 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
5999 if (EQ (sequence2, sequence2_tortoise)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6000 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6001 signal_circular_list_error (sequence2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6002 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6003 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6004 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6005 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6006 if (NILP (sequence1)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6007 { |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
6008 check_sequence_range (args[0], start1, end1, |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6009 make_int (XINT (start1) + shortest_len)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6010 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6011 else if (NILP (sequence2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6012 { |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
6013 check_sequence_range (args[1], start2, end2, |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6014 make_int (XINT (start2) + shortest_len)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6015 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6016 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6017 else if (sequence1_listp) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6018 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6019 if (STRINGP (sequence2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6020 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6021 Ibyte *s2_data = XSTRING_DATA (sequence2), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6022 *s2_end = s2_data + XSTRING_LENGTH (sequence2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6023 Elemcount char_count = 0; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6024 Lisp_Object character; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6025 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6026 while (char_count < starting2 && s2_data < s2_end) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6027 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6028 INC_IBYTEPTR (s2_data); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6029 char_count++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6030 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6031 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6032 while (starting1 < ending1 && starting2 < ending2 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6033 && s2_data < s2_end && !NILP (sequence1)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6034 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6035 character = make_char (itext_ichar (s2_data)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6036 CONSP (sequence1) ? |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6037 XSETCAR (sequence1, character) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6038 : Fsetcar (sequence1, character); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6039 sequence1 = XCDR (sequence1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6040 starting1++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6041 starting2++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6042 char_count++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6043 INC_IBYTEPTR (s2_data); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6044 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6045 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6046 if (NILP (sequence1)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6047 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6048 check_sequence_range (sequence1, start1, end1, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6049 make_int (XINT (start1) + starting1)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6050 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6051 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6052 if (s2_data == s2_end) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6053 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6054 check_sequence_range (sequence2, start2, end2, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6055 make_int (char_count)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6056 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6057 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6058 else |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6059 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6060 Elemcount len2 = XINT (Flength (sequence2)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6061 check_sequence_range (sequence2, start2, end2, make_int (len2)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6062 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6063 ending2 = min (ending2, len2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6064 while (starting2 < ending2 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6065 && starting1 < ending1 && !NILP (sequence1)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6066 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6067 CHECK_CONS (sequence1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6068 XSETCAR (sequence1, Faref (sequence2, make_int (starting2))); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6069 sequence1 = XCDR (sequence1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6070 starting1++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6071 starting2++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6072 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6073 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6074 if (NILP (sequence1)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6075 { |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
6076 check_sequence_range (args[0], start1, end1, |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6077 make_int (XINT (start1) + starting1)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6078 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6079 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6080 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6081 else if (sequence2_listp) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6082 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6083 if (STRINGP (sequence1)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6084 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6085 Elemcount ii = 0, count, len = string_char_length (sequence1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6086 Ibyte *staging, *cursor; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6087 Lisp_Object obj; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6088 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6089 check_sequence_range (sequence1, start1, end1, make_int (len)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6090 ending1 = min (ending1, len); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6091 count = ending1 - starting1; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6092 staging = cursor = alloca_ibytes (count * MAX_ICHAR_LEN); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6093 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6094 while (ii < count && !NILP (sequence2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6095 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6096 obj = CONSP (sequence2) ? XCAR (sequence2) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6097 : Fcar (sequence2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6098 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6099 CHECK_CHAR_COERCE_INT (obj); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6100 cursor += set_itext_ichar (cursor, XCHAR (obj)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6101 ii++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6102 sequence2 = XCDR (sequence2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6103 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6104 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6105 if (NILP (sequence2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6106 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6107 check_sequence_range (sequence2, start2, end2, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6108 make_int (XINT (start2) + ii)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6109 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6110 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6111 replace_string_range (result, start1, make_int (XINT (start1) + ii), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6112 staging, cursor); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6113 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6114 else |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6115 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6116 Elemcount len = XINT (Flength (sequence1)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6117 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6118 check_sequence_range (sequence1, start2, end1, make_int (len)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6119 ending1 = min (ending2, min (ending1, len)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6120 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6121 while (starting1 < ending1 && !NILP (sequence2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6122 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6123 Faset (sequence1, make_int (starting1), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6124 CONSP (sequence2) ? XCAR (sequence2) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6125 : Fcar (sequence2)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6126 sequence2 = XCDR (sequence2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6127 starting1++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6128 starting2++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6129 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6130 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6131 if (NILP (sequence2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6132 { |
|
5303
4c4085177ca5
Fix some bugs in fns.c, discovered in passing while doing other work.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5302
diff
changeset
|
6133 check_sequence_range (args[1], start2, end2, |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6134 make_int (XINT (start2) + starting2)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6135 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6136 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6137 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6138 else |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6139 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6140 if (STRINGP (sequence1) && STRINGP (sequence2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6141 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6142 Ibyte *p2 = XSTRING_DATA (sequence2), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6143 *p2end = p2 + XSTRING_LENGTH (sequence2), *p2cursor; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6144 Charcount ii = 0, len1 = string_char_length (sequence1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6145 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6146 while (ii < starting2 && p2 < p2end) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6147 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6148 INC_IBYTEPTR (p2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6149 ii++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6150 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6151 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6152 p2cursor = p2; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6153 ending1 = min (ending1, len1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6154 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6155 while (ii < ending2 && starting1 < ending1 && p2cursor < p2end) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6156 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6157 INC_IBYTEPTR (p2cursor); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6158 ii++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6159 starting1++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6160 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6161 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6162 if (p2cursor == p2end) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6163 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6164 check_sequence_range (sequence2, start2, end2, make_int (ii)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6165 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6166 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6167 /* This isn't great; any error message won't necessarily reflect |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6168 the END1 that was supplied to #'replace. */ |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6169 replace_string_range (result, start1, make_int (starting1), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6170 p2, p2cursor); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6171 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6172 else if (STRINGP (sequence1)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6173 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6174 Ibyte *staging, *cursor; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6175 Elemcount count, len1 = string_char_length (sequence1); |
|
5262
75bcb5bef459
Replace a doubled semi-colon with a single semi-colon, fns.c, for VS6's sake.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5261
diff
changeset
|
6176 Elemcount len2 = XINT (Flength (sequence2)), ii = 0; |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6177 Lisp_Object obj; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6178 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6179 check_sequence_range (sequence1, start1, end1, make_int (len1)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6180 check_sequence_range (sequence2, start2, end2, make_int (len2)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6181 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6182 ending1 = min (ending1, len1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6183 ending2 = min (ending2, len2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6184 count = min (ending1 - starting1, ending2 - starting2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6185 staging = cursor = alloca_ibytes (count * MAX_ICHAR_LEN); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6186 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6187 ii = 0; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6188 while (ii < count) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6189 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6190 obj = Faref (sequence2, make_int (starting2)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6191 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6192 CHECK_CHAR_COERCE_INT (obj); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6193 cursor += set_itext_ichar (cursor, XCHAR (obj)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6194 starting2++, ii++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6195 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6196 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6197 replace_string_range (result, start1, |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6198 make_int (XINT (start1) + count), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6199 staging, cursor); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6200 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6201 else if (STRINGP (sequence2)) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6202 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6203 Ibyte *p2 = XSTRING_DATA (sequence2), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6204 *p2end = p2 + XSTRING_LENGTH (sequence2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6205 Elemcount len1 = XINT (Flength (sequence1)), ii = 0; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6206 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6207 check_sequence_range (sequence1, start1, end1, make_int (len1)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6208 ending1 = min (ending1, len1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6209 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6210 while (ii < starting2 && p2 < p2end) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6211 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6212 INC_IBYTEPTR (p2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6213 ii++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6214 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6215 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6216 while (p2 < p2end && starting1 < ending1 && starting2 < ending2) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6217 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6218 Faset (sequence1, make_int (starting1), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6219 make_char (itext_ichar (p2))); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6220 INC_IBYTEPTR (p2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6221 starting1++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6222 starting2++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6223 ii++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6224 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6225 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6226 if (p2 == p2end) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6227 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6228 check_sequence_range (sequence2, start2, end2, make_int (ii)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6229 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6230 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6231 else |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6232 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6233 Elemcount len1 = XINT (Flength (sequence1)), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6234 len2 = XINT (Flength (sequence2)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6235 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6236 check_sequence_range (sequence1, start1, end1, make_int (len1)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6237 check_sequence_range (sequence2, start2, end2, make_int (len2)); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6238 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6239 ending1 = min (ending1, len1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6240 ending2 = min (ending2, len2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6241 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6242 while (starting1 < ending1 && starting2 < ending2) |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6243 { |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6244 Faset (sequence1, make_int (starting1), |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6245 Faref (sequence2, make_int (starting2))); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6246 starting1++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6247 starting2++; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6248 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6249 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6250 } |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6251 |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6252 return result; |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6253 } |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
6254 |
| 771 | 6255 Lisp_Object |
| 2367 | 6256 add_suffix_to_symbol (Lisp_Object symbol, const Ascbyte *ascii_string) |
| 771 | 6257 { |
| 6258 return Fintern (concat2 (Fsymbol_name (symbol), | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
6259 build_ascstring (ascii_string)), |
| 771 | 6260 Qnil); |
| 6261 } | |
| 6262 | |
| 6263 Lisp_Object | |
| 2367 | 6264 add_prefix_to_symbol (const Ascbyte *ascii_string, Lisp_Object symbol) |
| 771 | 6265 { |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
6266 return Fintern (concat2 (build_ascstring (ascii_string), |
| 771 | 6267 Fsymbol_name (symbol)), |
| 6268 Qnil); | |
| 6269 } | |
| 6270 | |
| 442 | 6271 |
| 428 | 6272 /* #### this function doesn't belong in this file! */ |
| 6273 | |
| 442 | 6274 #ifdef HAVE_GETLOADAVG |
| 6275 #ifdef HAVE_SYS_LOADAVG_H | |
| 6276 #include <sys/loadavg.h> | |
| 6277 #endif | |
| 6278 #else | |
| 6279 int getloadavg (double loadavg[], int nelem); /* Defined in getloadavg.c */ | |
| 6280 #endif | |
| 6281 | |
| 428 | 6282 DEFUN ("load-average", Fload_average, 0, 1, 0, /* |
| 6283 Return list of 1 minute, 5 minute and 15 minute load averages. | |
| 6284 Each of the three load averages is multiplied by 100, | |
| 6285 then converted to integer. | |
| 6286 | |
| 6287 When USE-FLOATS is non-nil, floats will be used instead of integers. | |
| 6288 These floats are not multiplied by 100. | |
| 6289 | |
| 6290 If the 5-minute or 15-minute load averages are not available, return a | |
| 6291 shortened list, containing only those averages which are available. | |
| 6292 | |
| 6293 On some systems, this won't work due to permissions on /dev/kmem, | |
| 6294 in which case you can't use this. | |
| 6295 */ | |
| 6296 (use_floats)) | |
| 6297 { | |
| 6298 double load_ave[3]; | |
| 6299 int loads = getloadavg (load_ave, countof (load_ave)); | |
| 6300 Lisp_Object ret = Qnil; | |
| 6301 | |
| 6302 if (loads == -2) | |
| 563 | 6303 signal_error (Qunimplemented, |
| 6304 "load-average not implemented for this operating system", | |
| 6305 Qunbound); | |
| 428 | 6306 else if (loads < 0) |
| 563 | 6307 invalid_operation ("Could not get load-average", lisp_strerror (errno)); |
| 428 | 6308 |
| 6309 while (loads-- > 0) | |
| 6310 { | |
| 6311 Lisp_Object load = (NILP (use_floats) ? | |
| 6312 make_int ((int) (100.0 * load_ave[loads])) | |
| 6313 : make_float (load_ave[loads])); | |
| 6314 ret = Fcons (load, ret); | |
| 6315 } | |
| 6316 return ret; | |
| 6317 } | |
| 6318 | |
| 6319 | |
| 6320 Lisp_Object Vfeatures; | |
| 6321 | |
| 6322 DEFUN ("featurep", Ffeaturep, 1, 1, 0, /* | |
| 6323 Return non-nil if feature FEXP is present in this Emacs. | |
| 6324 Use this to conditionalize execution of lisp code based on the | |
| 6325 presence or absence of emacs or environment extensions. | |
| 6326 FEXP can be a symbol, a number, or a list. | |
| 6327 If it is a symbol, that symbol is looked up in the `features' variable, | |
| 6328 and non-nil will be returned if found. | |
| 6329 If it is a number, the function will return non-nil if this Emacs | |
| 6330 has an equal or greater version number than FEXP. | |
| 6331 If it is a list whose car is the symbol `and', it will return | |
| 6332 non-nil if all the features in its cdr are non-nil. | |
| 6333 If it is a list whose car is the symbol `or', it will return non-nil | |
| 6334 if any of the features in its cdr are non-nil. | |
| 6335 If it is a list whose car is the symbol `not', it will return | |
| 6336 non-nil if the feature is not present. | |
| 6337 | |
| 6338 Examples: | |
| 6339 | |
| 6340 (featurep 'xemacs) | |
| 6341 => ; Non-nil on XEmacs. | |
| 6342 | |
| 6343 (featurep '(and xemacs gnus)) | |
| 6344 => ; Non-nil on XEmacs with Gnus loaded. | |
| 6345 | |
| 6346 (featurep '(or tty-frames (and emacs 19.30))) | |
| 6347 => ; Non-nil if this Emacs supports TTY frames. | |
| 6348 | |
| 6349 (featurep '(or (and xemacs 19.15) (and emacs 19.34))) | |
| 6350 => ; Non-nil on XEmacs 19.15 and later, or FSF Emacs 19.34 and later. | |
| 6351 | |
| 442 | 6352 (featurep '(and xemacs 21.02)) |
| 6353 => ; Non-nil on XEmacs 21.2 and later. | |
| 6354 | |
| 428 | 6355 NOTE: The advanced arguments of this function (anything other than a |
| 6356 symbol) are not yet supported by FSF Emacs. If you feel they are useful | |
| 6357 for supporting multiple Emacs variants, lobby Richard Stallman at | |
| 442 | 6358 <bug-gnu-emacs@gnu.org>. |
| 428 | 6359 */ |
| 6360 (fexp)) | |
| 6361 { | |
| 6362 #ifndef FEATUREP_SYNTAX | |
| 6363 CHECK_SYMBOL (fexp); | |
| 6364 return NILP (Fmemq (fexp, Vfeatures)) ? Qnil : Qt; | |
| 6365 #else /* FEATUREP_SYNTAX */ | |
| 6366 static double featurep_emacs_version; | |
| 6367 | |
| 6368 /* Brute force translation from Erik Naggum's lisp function. */ | |
| 6369 if (SYMBOLP (fexp)) | |
| 6370 { | |
| 6371 /* Original definition */ | |
| 6372 return NILP (Fmemq (fexp, Vfeatures)) ? Qnil : Qt; | |
| 6373 } | |
| 6374 else if (INTP (fexp) || FLOATP (fexp)) | |
| 6375 { | |
| 6376 double d = extract_float (fexp); | |
| 6377 | |
| 6378 if (featurep_emacs_version == 0.0) | |
| 6379 { | |
| 6380 featurep_emacs_version = XINT (Vemacs_major_version) + | |
| 6381 (XINT (Vemacs_minor_version) / 100.0); | |
| 6382 } | |
| 6383 return featurep_emacs_version >= d ? Qt : Qnil; | |
| 6384 } | |
| 6385 else if (CONSP (fexp)) | |
| 6386 { | |
| 6387 Lisp_Object tem = XCAR (fexp); | |
| 6388 if (EQ (tem, Qnot)) | |
| 6389 { | |
| 6390 Lisp_Object negate; | |
| 6391 | |
| 6392 tem = XCDR (fexp); | |
| 6393 negate = Fcar (tem); | |
| 6394 if (!NILP (tem)) | |
| 6395 return NILP (call1 (Qfeaturep, negate)) ? Qt : Qnil; | |
| 6396 else | |
| 6397 return Fsignal (Qinvalid_read_syntax, list1 (tem)); | |
| 6398 } | |
| 6399 else if (EQ (tem, Qand)) | |
| 6400 { | |
| 6401 tem = XCDR (fexp); | |
| 6402 /* Use Fcar/Fcdr for error-checking. */ | |
| 6403 while (!NILP (tem) && !NILP (call1 (Qfeaturep, Fcar (tem)))) | |
| 6404 { | |
| 6405 tem = Fcdr (tem); | |
| 6406 } | |
| 6407 return NILP (tem) ? Qt : Qnil; | |
| 6408 } | |
| 6409 else if (EQ (tem, Qor)) | |
| 6410 { | |
| 6411 tem = XCDR (fexp); | |
| 6412 /* Use Fcar/Fcdr for error-checking. */ | |
| 6413 while (!NILP (tem) && NILP (call1 (Qfeaturep, Fcar (tem)))) | |
| 6414 { | |
| 6415 tem = Fcdr (tem); | |
| 6416 } | |
| 6417 return NILP (tem) ? Qnil : Qt; | |
| 6418 } | |
| 6419 else | |
| 6420 { | |
| 6421 return Fsignal (Qinvalid_read_syntax, list1 (XCDR (fexp))); | |
| 6422 } | |
| 6423 } | |
| 6424 else | |
| 6425 { | |
| 6426 return Fsignal (Qinvalid_read_syntax, list1 (fexp)); | |
| 6427 } | |
| 6428 } | |
| 6429 #endif /* FEATUREP_SYNTAX */ | |
| 6430 | |
| 6431 DEFUN ("provide", Fprovide, 1, 1, 0, /* | |
| 6432 Announce that FEATURE is a feature of the current Emacs. | |
| 6433 This function updates the value of the variable `features'. | |
| 6434 */ | |
| 6435 (feature)) | |
| 6436 { | |
| 6437 Lisp_Object tem; | |
| 6438 CHECK_SYMBOL (feature); | |
| 6439 if (!NILP (Vautoload_queue)) | |
| 6440 Vautoload_queue = Fcons (Fcons (Vfeatures, Qnil), Vautoload_queue); | |
| 6441 tem = Fmemq (feature, Vfeatures); | |
| 6442 if (NILP (tem)) | |
| 6443 Vfeatures = Fcons (feature, Vfeatures); | |
| 6444 LOADHIST_ATTACH (Fcons (Qprovide, feature)); | |
| 6445 return feature; | |
| 6446 } | |
| 6447 | |
| 1067 | 6448 DEFUN ("require", Frequire, 1, 3, 0, /* |
| 3842 | 6449 Ensure that FEATURE is present in the Lisp environment. |
| 6450 FEATURE is a symbol naming a collection of resources (functions, etc). | |
| 6451 Optional FILENAME is a library from which to load resources; it defaults to | |
| 6452 the print name of FEATURE. | |
| 6453 Optional NOERROR, if non-nil, causes require to return nil rather than signal | |
| 6454 `file-error' if loading the library fails. | |
| 6455 | |
| 6456 If feature FEATURE is present in `features', update `load-history' to reflect | |
| 6457 the require and return FEATURE. Otherwise, try to load it from a library. | |
| 6458 The normal messages at start and end of loading are suppressed. | |
| 6459 If the library is successfully loaded and it calls `(provide FEATURE)', add | |
| 6460 FEATURE to `features', update `load-history' and return FEATURE. | |
| 6461 If the load succeeds but FEATURE is not provided by the library, signal | |
| 6462 `invalid-state'. | |
| 6463 | |
| 6464 The byte-compiler treats top-level calls to `require' specially, by evaluating | |
| 6465 them at compile time (and then compiling them normally). Thus a library may | |
| 6466 request that definitions that should be inlined such as macros and defsubsts | |
| 6467 be loaded into its compilation environment. Achieving this in other contexts | |
| 6468 requires an explicit \(eval-and-compile ...\) block. | |
| 428 | 6469 */ |
| 1067 | 6470 (feature, filename, noerror)) |
| 428 | 6471 { |
| 6472 Lisp_Object tem; | |
| 6473 CHECK_SYMBOL (feature); | |
| 6474 tem = Fmemq (feature, Vfeatures); | |
| 6475 LOADHIST_ATTACH (Fcons (Qrequire, feature)); | |
| 6476 if (!NILP (tem)) | |
| 6477 return feature; | |
| 6478 else | |
| 6479 { | |
| 6480 int speccount = specpdl_depth (); | |
| 6481 | |
| 6482 /* Value saved here is to be restored into Vautoload_queue */ | |
| 6483 record_unwind_protect (un_autoload, Vautoload_queue); | |
| 6484 Vautoload_queue = Qt; | |
| 6485 | |
| 1067 | 6486 tem = call4 (Qload, NILP (filename) ? Fsymbol_name (feature) : filename, |
| 1261 | 6487 noerror, Qrequire, Qnil); |
| 1067 | 6488 /* If load failed entirely, return nil. */ |
| 6489 if (NILP (tem)) | |
| 6490 return unbind_to_1 (speccount, Qnil); | |
| 428 | 6491 |
| 6492 tem = Fmemq (feature, Vfeatures); | |
| 6493 if (NILP (tem)) | |
| 563 | 6494 invalid_state ("Required feature was not provided", feature); |
| 428 | 6495 |
| 6496 /* Once loading finishes, don't undo it. */ | |
| 6497 Vautoload_queue = Qt; | |
| 771 | 6498 return unbind_to_1 (speccount, feature); |
| 428 | 6499 } |
| 6500 } | |
| 6501 | |
| 6502 /* base64 encode/decode functions. | |
| 6503 | |
| 6504 Originally based on code from GNU recode. Ported to FSF Emacs by | |
| 6505 Lars Magne Ingebrigtsen and Karl Heuer. Ported to XEmacs and | |
| 6506 subsequently heavily hacked by Hrvoje Niksic. */ | |
| 6507 | |
| 6508 #define MIME_LINE_LENGTH 72 | |
| 6509 | |
| 6510 #define IS_ASCII(Character) \ | |
| 6511 ((Character) < 128) | |
| 6512 #define IS_BASE64(Character) \ | |
| 6513 (IS_ASCII (Character) && base64_char_to_value[Character] >= 0) | |
| 6514 | |
| 6515 /* Table of characters coding the 64 values. */ | |
|
5000
44d7bde26046
fix compile errors, fix revert-buffer bug on binary/Latin 1 files, Mule-ize some files
Ben Wing <ben@xemacs.org>
parents:
4966
diff
changeset
|
6516 static Ascbyte base64_value_to_char[64] = |
| 428 | 6517 { |
| 6518 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', /* 0- 9 */ | |
| 6519 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', /* 10-19 */ | |
| 6520 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', /* 20-29 */ | |
| 6521 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', /* 30-39 */ | |
| 6522 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', /* 40-49 */ | |
| 6523 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', /* 50-59 */ | |
| 6524 '8', '9', '+', '/' /* 60-63 */ | |
| 6525 }; | |
| 6526 | |
| 6527 /* Table of base64 values for first 128 characters. */ | |
| 6528 static short base64_char_to_value[128] = | |
| 6529 { | |
| 6530 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0- 9 */ | |
| 6531 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 10- 19 */ | |
| 6532 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 20- 29 */ | |
| 6533 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 30- 39 */ | |
| 6534 -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, /* 40- 49 */ | |
| 6535 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, /* 50- 59 */ | |
| 6536 -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, /* 60- 69 */ | |
| 6537 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* 70- 79 */ | |
| 6538 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, /* 80- 89 */ | |
| 6539 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, /* 90- 99 */ | |
| 6540 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, /* 100-109 */ | |
| 6541 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, /* 110-119 */ | |
| 6542 49, 50, 51, -1, -1, -1, -1, -1 /* 120-127 */ | |
| 6543 }; | |
| 6544 | |
| 6545 /* The following diagram shows the logical steps by which three octets | |
| 6546 get transformed into four base64 characters. | |
| 6547 | |
| 6548 .--------. .--------. .--------. | |
| 6549 |aaaaaabb| |bbbbcccc| |ccdddddd| | |
| 6550 `--------' `--------' `--------' | |
| 6551 6 2 4 4 2 6 | |
| 6552 .--------+--------+--------+--------. | |
| 6553 |00aaaaaa|00bbbbbb|00cccccc|00dddddd| | |
| 6554 `--------+--------+--------+--------' | |
| 6555 | |
| 6556 .--------+--------+--------+--------. | |
| 6557 |AAAAAAAA|BBBBBBBB|CCCCCCCC|DDDDDDDD| | |
| 6558 `--------+--------+--------+--------' | |
| 6559 | |
| 6560 The octets are divided into 6 bit chunks, which are then encoded into | |
| 6561 base64 characters. */ | |
| 6562 | |
|
5000
44d7bde26046
fix compile errors, fix revert-buffer bug on binary/Latin 1 files, Mule-ize some files
Ben Wing <ben@xemacs.org>
parents:
4966
diff
changeset
|
6563 static DECLARE_DOESNT_RETURN (base64_conversion_error (const Ascbyte *, |
| 2268 | 6564 Lisp_Object)); |
| 6565 | |
| 575 | 6566 static DOESNT_RETURN |
|
5000
44d7bde26046
fix compile errors, fix revert-buffer bug on binary/Latin 1 files, Mule-ize some files
Ben Wing <ben@xemacs.org>
parents:
4966
diff
changeset
|
6567 base64_conversion_error (const Ascbyte *reason, Lisp_Object frob) |
| 563 | 6568 { |
| 6569 signal_error (Qbase64_conversion_error, reason, frob); | |
| 6570 } | |
| 6571 | |
| 6572 #define ADVANCE_INPUT(c, stream) \ | |
| 867 | 6573 ((ec = Lstream_get_ichar (stream)) == -1 ? 0 : \ |
| 563 | 6574 ((ec > 255) ? \ |
| 6575 (base64_conversion_error ("Non-ascii character in base64 input", \ | |
| 6576 make_char (ec)), 0) \ | |
| 867 | 6577 : (c = (Ibyte)ec), 1)) |
| 665 | 6578 |
| 6579 static Bytebpos | |
| 867 | 6580 base64_encode_1 (Lstream *istream, Ibyte *to, int line_break) |
| 428 | 6581 { |
| 6582 EMACS_INT counter = 0; | |
| 867 | 6583 Ibyte *e = to; |
| 6584 Ichar ec; | |
| 428 | 6585 unsigned int value; |
| 6586 | |
| 6587 while (1) | |
| 6588 { | |
| 1204 | 6589 Ibyte c = 0; |
| 428 | 6590 if (!ADVANCE_INPUT (c, istream)) |
| 6591 break; | |
| 6592 | |
| 6593 /* Wrap line every 76 characters. */ | |
| 6594 if (line_break) | |
| 6595 { | |
| 6596 if (counter < MIME_LINE_LENGTH / 4) | |
| 6597 counter++; | |
| 6598 else | |
| 6599 { | |
| 6600 *e++ = '\n'; | |
| 6601 counter = 1; | |
| 6602 } | |
| 6603 } | |
| 6604 | |
| 6605 /* Process first byte of a triplet. */ | |
| 6606 *e++ = base64_value_to_char[0x3f & c >> 2]; | |
| 6607 value = (0x03 & c) << 4; | |
| 6608 | |
| 6609 /* Process second byte of a triplet. */ | |
| 6610 if (!ADVANCE_INPUT (c, istream)) | |
| 6611 { | |
| 6612 *e++ = base64_value_to_char[value]; | |
| 6613 *e++ = '='; | |
| 6614 *e++ = '='; | |
| 6615 break; | |
| 6616 } | |
| 6617 | |
| 6618 *e++ = base64_value_to_char[value | (0x0f & c >> 4)]; | |
| 6619 value = (0x0f & c) << 2; | |
| 6620 | |
| 6621 /* Process third byte of a triplet. */ | |
| 6622 if (!ADVANCE_INPUT (c, istream)) | |
| 6623 { | |
| 6624 *e++ = base64_value_to_char[value]; | |
| 6625 *e++ = '='; | |
| 6626 break; | |
| 6627 } | |
| 6628 | |
| 6629 *e++ = base64_value_to_char[value | (0x03 & c >> 6)]; | |
| 6630 *e++ = base64_value_to_char[0x3f & c]; | |
| 6631 } | |
| 6632 | |
| 6633 return e - to; | |
| 6634 } | |
| 6635 #undef ADVANCE_INPUT | |
| 6636 | |
| 6637 /* Get next character from the stream, except that non-base64 | |
| 6638 characters are ignored. This is in accordance with rfc2045. EC | |
| 867 | 6639 should be an Ichar, so that it can hold -1 as the value for EOF. */ |
| 428 | 6640 #define ADVANCE_INPUT_IGNORE_NONBASE64(ec, stream, streampos) do { \ |
| 867 | 6641 ec = Lstream_get_ichar (stream); \ |
| 428 | 6642 ++streampos; \ |
| 6643 /* IS_BASE64 may not be called with negative arguments so check for \ | |
| 6644 EOF first. */ \ | |
| 6645 if (ec < 0 || IS_BASE64 (ec) || ec == '=') \ | |
| 6646 break; \ | |
| 6647 } while (1) | |
| 6648 | |
| 6649 #define STORE_BYTE(pos, val, ccnt) do { \ | |
|
5000
44d7bde26046
fix compile errors, fix revert-buffer bug on binary/Latin 1 files, Mule-ize some files
Ben Wing <ben@xemacs.org>
parents:
4966
diff
changeset
|
6650 pos += set_itext_ichar (pos, (Ichar)((Binbyte)(val))); \ |
| 428 | 6651 ++ccnt; \ |
| 6652 } while (0) | |
| 6653 | |
| 665 | 6654 static Bytebpos |
| 867 | 6655 base64_decode_1 (Lstream *istream, Ibyte *to, Charcount *ccptr) |
| 428 | 6656 { |
| 6657 Charcount ccnt = 0; | |
| 867 | 6658 Ibyte *e = to; |
| 428 | 6659 EMACS_INT streampos = 0; |
| 6660 | |
| 6661 while (1) | |
| 6662 { | |
| 867 | 6663 Ichar ec; |
| 428 | 6664 unsigned long value; |
| 6665 | |
| 6666 /* Process first byte of a quadruplet. */ | |
| 6667 ADVANCE_INPUT_IGNORE_NONBASE64 (ec, istream, streampos); | |
| 6668 if (ec < 0) | |
| 6669 break; | |
| 6670 if (ec == '=') | |
| 563 | 6671 base64_conversion_error ("Illegal `=' character while decoding base64", |
| 6672 make_int (streampos)); | |
| 428 | 6673 value = base64_char_to_value[ec] << 18; |
| 6674 | |
| 6675 /* Process second byte of a quadruplet. */ | |
| 6676 ADVANCE_INPUT_IGNORE_NONBASE64 (ec, istream, streampos); | |
| 6677 if (ec < 0) | |
| 563 | 6678 base64_conversion_error ("Premature EOF while decoding base64", |
| 6679 Qunbound); | |
| 428 | 6680 if (ec == '=') |
| 563 | 6681 base64_conversion_error ("Illegal `=' character while decoding base64", |
| 6682 make_int (streampos)); | |
| 428 | 6683 value |= base64_char_to_value[ec] << 12; |
| 6684 STORE_BYTE (e, value >> 16, ccnt); | |
| 6685 | |
| 6686 /* Process third byte of a quadruplet. */ | |
| 6687 ADVANCE_INPUT_IGNORE_NONBASE64 (ec, istream, streampos); | |
| 6688 if (ec < 0) | |
| 563 | 6689 base64_conversion_error ("Premature EOF while decoding base64", |
| 6690 Qunbound); | |
| 428 | 6691 |
| 6692 if (ec == '=') | |
| 6693 { | |
| 6694 ADVANCE_INPUT_IGNORE_NONBASE64 (ec, istream, streampos); | |
| 6695 if (ec < 0) | |
| 563 | 6696 base64_conversion_error ("Premature EOF while decoding base64", |
| 6697 Qunbound); | |
| 428 | 6698 if (ec != '=') |
| 563 | 6699 base64_conversion_error |
| 6700 ("Padding `=' expected but not found while decoding base64", | |
| 6701 make_int (streampos)); | |
| 428 | 6702 continue; |
| 6703 } | |
| 6704 | |
| 6705 value |= base64_char_to_value[ec] << 6; | |
| 6706 STORE_BYTE (e, 0xff & value >> 8, ccnt); | |
| 6707 | |
| 6708 /* Process fourth byte of a quadruplet. */ | |
| 6709 ADVANCE_INPUT_IGNORE_NONBASE64 (ec, istream, streampos); | |
| 6710 if (ec < 0) | |
| 563 | 6711 base64_conversion_error ("Premature EOF while decoding base64", |
| 6712 Qunbound); | |
| 428 | 6713 if (ec == '=') |
| 6714 continue; | |
| 6715 | |
| 6716 value |= base64_char_to_value[ec]; | |
| 6717 STORE_BYTE (e, 0xff & value, ccnt); | |
| 6718 } | |
| 6719 | |
| 6720 *ccptr = ccnt; | |
| 6721 return e - to; | |
| 6722 } | |
| 6723 #undef ADVANCE_INPUT | |
| 6724 #undef ADVANCE_INPUT_IGNORE_NONBASE64 | |
| 6725 #undef STORE_BYTE | |
| 6726 | |
| 6727 DEFUN ("base64-encode-region", Fbase64_encode_region, 2, 3, "r", /* | |
| 444 | 6728 Base64-encode the region between START and END. |
| 428 | 6729 Return the length of the encoded text. |
| 6730 Optional third argument NO-LINE-BREAK means do not break long lines | |
| 6731 into shorter lines. | |
| 6732 */ | |
| 444 | 6733 (start, end, no_line_break)) |
| 428 | 6734 { |
| 867 | 6735 Ibyte *encoded; |
| 665 | 6736 Bytebpos encoded_length; |
| 428 | 6737 Charcount allength, length; |
| 6738 struct buffer *buf = current_buffer; | |
| 665 | 6739 Charbpos begv, zv, old_pt = BUF_PT (buf); |
| 428 | 6740 Lisp_Object input; |
| 851 | 6741 int speccount = specpdl_depth (); |
| 428 | 6742 |
| 444 | 6743 get_buffer_range_char (buf, start, end, &begv, &zv, 0); |
| 428 | 6744 barf_if_buffer_read_only (buf, begv, zv); |
| 6745 | |
| 6746 /* We need to allocate enough room for encoding the text. | |
| 6747 We need 33 1/3% more space, plus a newline every 76 | |
| 6748 characters, and then we round up. */ | |
| 6749 length = zv - begv; | |
| 6750 allength = length + length/3 + 1; | |
| 6751 allength += allength / MIME_LINE_LENGTH + 1 + 6; | |
| 6752 | |
| 6753 input = make_lisp_buffer_input_stream (buf, begv, zv, 0); | |
| 867 | 6754 /* We needn't multiply allength with MAX_ICHAR_LEN because all the |
| 428 | 6755 base64 characters will be single-byte. */ |
| 867 | 6756 encoded = (Ibyte *) MALLOC_OR_ALLOCA (allength); |
| 428 | 6757 encoded_length = base64_encode_1 (XLSTREAM (input), encoded, |
| 6758 NILP (no_line_break)); | |
|
5050
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
5002
diff
changeset
|
6759 assert (encoded_length <= allength); |
| 428 | 6760 Lstream_delete (XLSTREAM (input)); |
| 6761 | |
| 6762 /* Now we have encoded the region, so we insert the new contents | |
| 6763 and delete the old. (Insert first in order to preserve markers.) */ | |
| 6764 buffer_insert_raw_string_1 (buf, begv, encoded, encoded_length, 0); | |
| 851 | 6765 unbind_to (speccount); |
| 428 | 6766 buffer_delete_range (buf, begv + encoded_length, zv + encoded_length, 0); |
| 6767 | |
| 6768 /* Simulate FSF Emacs implementation of this function: if point was | |
| 6769 in the region, place it at the beginning. */ | |
| 6770 if (old_pt >= begv && old_pt < zv) | |
| 6771 BUF_SET_PT (buf, begv); | |
| 6772 | |
| 6773 /* We return the length of the encoded text. */ | |
| 6774 return make_int (encoded_length); | |
| 6775 } | |
| 6776 | |
| 6777 DEFUN ("base64-encode-string", Fbase64_encode_string, 1, 2, 0, /* | |
| 6778 Base64 encode STRING and return the result. | |
| 444 | 6779 Optional argument NO-LINE-BREAK means do not break long lines |
| 6780 into shorter lines. | |
| 428 | 6781 */ |
| 6782 (string, no_line_break)) | |
| 6783 { | |
| 6784 Charcount allength, length; | |
| 665 | 6785 Bytebpos encoded_length; |
| 867 | 6786 Ibyte *encoded; |
| 428 | 6787 Lisp_Object input, result; |
| 6788 int speccount = specpdl_depth(); | |
| 6789 | |
| 6790 CHECK_STRING (string); | |
| 6791 | |
| 826 | 6792 length = string_char_length (string); |
| 428 | 6793 allength = length + length/3 + 1; |
| 6794 allength += allength / MIME_LINE_LENGTH + 1 + 6; | |
| 6795 | |
| 6796 input = make_lisp_string_input_stream (string, 0, -1); | |
| 867 | 6797 encoded = (Ibyte *) MALLOC_OR_ALLOCA (allength); |
| 428 | 6798 encoded_length = base64_encode_1 (XLSTREAM (input), encoded, |
| 6799 NILP (no_line_break)); | |
|
5050
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
5002
diff
changeset
|
6800 assert (encoded_length <= allength); |
| 428 | 6801 Lstream_delete (XLSTREAM (input)); |
| 6802 result = make_string (encoded, encoded_length); | |
| 851 | 6803 unbind_to (speccount); |
| 428 | 6804 return result; |
| 6805 } | |
| 6806 | |
| 6807 DEFUN ("base64-decode-region", Fbase64_decode_region, 2, 2, "r", /* | |
| 444 | 6808 Base64-decode the region between START and END. |
| 428 | 6809 Return the length of the decoded text. |
| 6810 If the region can't be decoded, return nil and don't modify the buffer. | |
| 6811 Characters out of the base64 alphabet are ignored. | |
| 6812 */ | |
| 444 | 6813 (start, end)) |
| 428 | 6814 { |
| 6815 struct buffer *buf = current_buffer; | |
| 665 | 6816 Charbpos begv, zv, old_pt = BUF_PT (buf); |
| 867 | 6817 Ibyte *decoded; |
| 665 | 6818 Bytebpos decoded_length; |
| 428 | 6819 Charcount length, cc_decoded_length; |
| 6820 Lisp_Object input; | |
| 6821 int speccount = specpdl_depth(); | |
| 6822 | |
| 444 | 6823 get_buffer_range_char (buf, start, end, &begv, &zv, 0); |
| 428 | 6824 barf_if_buffer_read_only (buf, begv, zv); |
| 6825 | |
| 6826 length = zv - begv; | |
| 6827 | |
| 6828 input = make_lisp_buffer_input_stream (buf, begv, zv, 0); | |
| 6829 /* We need to allocate enough room for decoding the text. */ | |
| 867 | 6830 decoded = (Ibyte *) MALLOC_OR_ALLOCA (length * MAX_ICHAR_LEN); |
| 428 | 6831 decoded_length = base64_decode_1 (XLSTREAM (input), decoded, &cc_decoded_length); |
|
5050
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
5002
diff
changeset
|
6832 assert (decoded_length <= length * MAX_ICHAR_LEN); |
| 428 | 6833 Lstream_delete (XLSTREAM (input)); |
| 6834 | |
| 6835 /* Now we have decoded the region, so we insert the new contents | |
| 6836 and delete the old. (Insert first in order to preserve markers.) */ | |
| 6837 BUF_SET_PT (buf, begv); | |
| 6838 buffer_insert_raw_string_1 (buf, begv, decoded, decoded_length, 0); | |
| 851 | 6839 unbind_to (speccount); |
| 428 | 6840 buffer_delete_range (buf, begv + cc_decoded_length, |
| 6841 zv + cc_decoded_length, 0); | |
| 6842 | |
| 6843 /* Simulate FSF Emacs implementation of this function: if point was | |
| 6844 in the region, place it at the beginning. */ | |
| 6845 if (old_pt >= begv && old_pt < zv) | |
| 6846 BUF_SET_PT (buf, begv); | |
| 6847 | |
| 6848 return make_int (cc_decoded_length); | |
| 6849 } | |
| 6850 | |
| 6851 DEFUN ("base64-decode-string", Fbase64_decode_string, 1, 1, 0, /* | |
| 6852 Base64-decode STRING and return the result. | |
| 6853 Characters out of the base64 alphabet are ignored. | |
| 6854 */ | |
| 6855 (string)) | |
| 6856 { | |
| 867 | 6857 Ibyte *decoded; |
| 665 | 6858 Bytebpos decoded_length; |
| 428 | 6859 Charcount length, cc_decoded_length; |
| 6860 Lisp_Object input, result; | |
| 6861 int speccount = specpdl_depth(); | |
| 6862 | |
| 6863 CHECK_STRING (string); | |
| 6864 | |
| 826 | 6865 length = string_char_length (string); |
| 428 | 6866 /* We need to allocate enough room for decoding the text. */ |
| 867 | 6867 decoded = (Ibyte *) MALLOC_OR_ALLOCA (length * MAX_ICHAR_LEN); |
| 428 | 6868 |
| 6869 input = make_lisp_string_input_stream (string, 0, -1); | |
| 6870 decoded_length = base64_decode_1 (XLSTREAM (input), decoded, | |
| 6871 &cc_decoded_length); | |
|
5050
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
5002
diff
changeset
|
6872 assert (decoded_length <= length * MAX_ICHAR_LEN); |
| 428 | 6873 Lstream_delete (XLSTREAM (input)); |
| 6874 | |
| 6875 result = make_string (decoded, decoded_length); | |
| 851 | 6876 unbind_to (speccount); |
| 428 | 6877 return result; |
| 6878 } | |
| 6879 | |
| 6880 Lisp_Object Qyes_or_no_p; | |
| 6881 | |
| 6882 void | |
| 6883 syms_of_fns (void) | |
| 6884 { | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3025
diff
changeset
|
6885 INIT_LISP_OBJECT (bit_vector); |
| 442 | 6886 |
| 563 | 6887 DEFSYMBOL (Qstring_lessp); |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
6888 DEFSYMBOL (Qsort); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
6889 DEFSYMBOL (Qmerge); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
6890 DEFSYMBOL (Qfill); |
| 563 | 6891 DEFSYMBOL (Qidentity); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
6892 DEFSYMBOL (Qvector); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
6893 DEFSYMBOL (Qarray); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
6894 DEFSYMBOL (Qstring); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
6895 DEFSYMBOL (Qlist); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
6896 DEFSYMBOL (Qbit_vector); |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
6897 defsymbol (&QsortX, "sort*"); |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
6898 DEFSYMBOL (Qreduce); |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6899 DEFSYMBOL (Qreplace); |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
6900 |
|
5253
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
6901 DEFSYMBOL (Qmapconcat); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
6902 defsymbol (&QmapcarX, "mapcar*"); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
6903 DEFSYMBOL (Qmapvector); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
6904 DEFSYMBOL (Qmapcan); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
6905 DEFSYMBOL (Qmapc); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
6906 DEFSYMBOL (Qmap); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
6907 DEFSYMBOL (Qmap_into); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
6908 DEFSYMBOL (Qsome); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
6909 DEFSYMBOL (Qevery); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
6910 DEFSYMBOL (Qmaplist); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
6911 DEFSYMBOL (Qmapl); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
6912 DEFSYMBOL (Qmapcon); |
|
b6a398dbb403
Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist()
Aidan Kehoe <kehoea@parhasard.net>
parents:
5241
diff
changeset
|
6913 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
6914 DEFKEYWORD (Q_from_end); |
|
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
6915 DEFKEYWORD (Q_initial_value); |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6916 DEFKEYWORD (Q_start1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6917 DEFKEYWORD (Q_start2); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6918 DEFKEYWORD (Q_end1); |
|
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
6919 DEFKEYWORD (Q_end2); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
6920 |
| 563 | 6921 DEFSYMBOL (Qyes_or_no_p); |
| 6922 | |
| 6923 DEFERROR_STANDARD (Qbase64_conversion_error, Qconversion_error); | |
| 428 | 6924 |
| 6925 DEFSUBR (Fidentity); | |
| 6926 DEFSUBR (Frandom); | |
| 6927 DEFSUBR (Flength); | |
| 6928 DEFSUBR (Fsafe_length); | |
|
5273
799742b751c8
Accept circular lists where that is useful in #'mapcar*, #'map* and friends.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5272
diff
changeset
|
6929 DEFSUBR (Flist_length); |
| 428 | 6930 DEFSUBR (Fstring_equal); |
| 801 | 6931 DEFSUBR (Fcompare_strings); |
| 428 | 6932 DEFSUBR (Fstring_lessp); |
| 6933 DEFSUBR (Fstring_modified_tick); | |
| 6934 DEFSUBR (Fappend); | |
| 6935 DEFSUBR (Fconcat); | |
| 6936 DEFSUBR (Fvconcat); | |
| 6937 DEFSUBR (Fbvconcat); | |
| 6938 DEFSUBR (Fcopy_list); | |
| 6939 DEFSUBR (Fcopy_sequence); | |
| 6940 DEFSUBR (Fcopy_alist); | |
| 6941 DEFSUBR (Fcopy_tree); | |
| 6942 DEFSUBR (Fsubseq); | |
| 6943 DEFSUBR (Fnthcdr); | |
| 6944 DEFSUBR (Fnth); | |
| 6945 DEFSUBR (Felt); | |
| 6946 DEFSUBR (Flast); | |
| 6947 DEFSUBR (Fbutlast); | |
| 6948 DEFSUBR (Fnbutlast); | |
| 6949 DEFSUBR (Fmember); | |
| 6950 DEFSUBR (Fold_member); | |
| 6951 DEFSUBR (Fmemq); | |
| 6952 DEFSUBR (Fold_memq); | |
| 6953 DEFSUBR (Fassoc); | |
| 6954 DEFSUBR (Fold_assoc); | |
| 6955 DEFSUBR (Fassq); | |
| 6956 DEFSUBR (Fold_assq); | |
| 6957 DEFSUBR (Frassoc); | |
| 6958 DEFSUBR (Fold_rassoc); | |
| 6959 DEFSUBR (Frassq); | |
| 6960 DEFSUBR (Fold_rassq); | |
| 6961 DEFSUBR (Fdelete); | |
| 6962 DEFSUBR (Fold_delete); | |
| 6963 DEFSUBR (Fdelq); | |
| 6964 DEFSUBR (Fold_delq); | |
| 6965 DEFSUBR (Fremassoc); | |
| 6966 DEFSUBR (Fremassq); | |
| 6967 DEFSUBR (Fremrassoc); | |
| 6968 DEFSUBR (Fremrassq); | |
| 6969 DEFSUBR (Fnreverse); | |
| 6970 DEFSUBR (Freverse); | |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
6971 DEFSUBR (FsortX); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
6972 Ffset (intern ("sort"), QsortX); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
6973 DEFSUBR (Fmerge); |
| 428 | 6974 DEFSUBR (Fplists_eq); |
| 6975 DEFSUBR (Fplists_equal); | |
| 6976 DEFSUBR (Flax_plists_eq); | |
| 6977 DEFSUBR (Flax_plists_equal); | |
| 6978 DEFSUBR (Fplist_get); | |
| 6979 DEFSUBR (Fplist_put); | |
| 6980 DEFSUBR (Fplist_remprop); | |
| 6981 DEFSUBR (Fplist_member); | |
| 6982 DEFSUBR (Fcheck_valid_plist); | |
| 6983 DEFSUBR (Fvalid_plist_p); | |
| 6984 DEFSUBR (Fcanonicalize_plist); | |
| 6985 DEFSUBR (Flax_plist_get); | |
| 6986 DEFSUBR (Flax_plist_put); | |
| 6987 DEFSUBR (Flax_plist_remprop); | |
| 6988 DEFSUBR (Flax_plist_member); | |
| 6989 DEFSUBR (Fcanonicalize_lax_plist); | |
| 6990 DEFSUBR (Fdestructive_alist_to_plist); | |
| 6991 DEFSUBR (Fget); | |
| 6992 DEFSUBR (Fput); | |
| 6993 DEFSUBR (Fremprop); | |
| 6994 DEFSUBR (Fobject_plist); | |
|
5255
b5611afbcc76
Support process plists, for greater GNU compatibility.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5253
diff
changeset
|
6995 DEFSUBR (Fobject_setplist); |
| 428 | 6996 DEFSUBR (Fequal); |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4797
diff
changeset
|
6997 DEFSUBR (Fequalp); |
| 428 | 6998 DEFSUBR (Fold_equal); |
|
5182
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
6999 DEFSUBR (Ffill); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
7000 Ffset (intern ("fillarray"), Qfill); |
|
2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5128
diff
changeset
|
7001 |
| 428 | 7002 DEFSUBR (Fnconc); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
7003 DEFSUBR (FmapcarX); |
| 428 | 7004 DEFSUBR (Fmapvector); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
7005 DEFSUBR (Fmapcan); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
7006 DEFSUBR (Fmapc); |
| 428 | 7007 DEFSUBR (Fmapconcat); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
7008 DEFSUBR (Fmap); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
7009 DEFSUBR (Fmap_into); |
|
4997
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
7010 DEFSUBR (Fsome); |
|
8800b5350a13
Move #'some, #'every to C, implementing them with mapcarX.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4996
diff
changeset
|
7011 DEFSUBR (Fevery); |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
7012 Ffset (intern ("mapc-internal"), Fsymbol_function (intern ("mapc"))); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
7013 Ffset (intern ("mapcar"), Fsymbol_function (intern ("mapcar*"))); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
7014 DEFSUBR (Fmaplist); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
7015 DEFSUBR (Fmapl); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
7016 DEFSUBR (Fmapcon); |
|
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4797
diff
changeset
|
7017 |
|
5227
fbd1485af104
Move #'reduce to fns.c from cl-seq.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5224
diff
changeset
|
7018 DEFSUBR (Freduce); |
| 442 | 7019 DEFSUBR (Freplace_list); |
|
5261
69f687b3ba9d
Move #'replace to C, add bounds-checking to it and to #'fill.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5255
diff
changeset
|
7020 DEFSUBR (Freplace); |
| 428 | 7021 DEFSUBR (Fload_average); |
| 7022 DEFSUBR (Ffeaturep); | |
| 7023 DEFSUBR (Frequire); | |
| 7024 DEFSUBR (Fprovide); | |
| 7025 DEFSUBR (Fbase64_encode_region); | |
| 7026 DEFSUBR (Fbase64_encode_string); | |
| 7027 DEFSUBR (Fbase64_decode_region); | |
| 7028 DEFSUBR (Fbase64_decode_string); | |
| 771 | 7029 |
|
5224
35c2b7e9c03f
Add #'substring-no-properties, omitting any extent data.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5191
diff
changeset
|
7030 DEFSUBR (Fsubstring_no_properties); |
| 771 | 7031 DEFSUBR (Fsplit_string_by_char); |
| 7032 DEFSUBR (Fsplit_path); /* #### */ | |
| 7033 } | |
| 7034 | |
| 7035 void | |
| 7036 vars_of_fns (void) | |
| 7037 { | |
| 7038 DEFVAR_LISP ("path-separator", &Vpath_separator /* | |
| 7039 The directory separator in search paths, as a string. | |
| 7040 */ ); | |
| 7041 { | |
|
5000
44d7bde26046
fix compile errors, fix revert-buffer bug on binary/Latin 1 files, Mule-ize some files
Ben Wing <ben@xemacs.org>
parents:
4966
diff
changeset
|
7042 Ascbyte c = SEPCHAR; |
| 867 | 7043 Vpath_separator = make_string ((Ibyte *) &c, 1); |
| 771 | 7044 } |
| 428 | 7045 } |
| 7046 | |
| 7047 void | |
| 7048 init_provide_once (void) | |
| 7049 { | |
| 7050 DEFVAR_LISP ("features", &Vfeatures /* | |
| 7051 A list of symbols which are the features of the executing emacs. | |
| 7052 Used by `featurep' and `require', and altered by `provide'. | |
| 7053 */ ); | |
| 7054 Vfeatures = Qnil; | |
| 7055 | |
| 7056 Fprovide (intern ("base64")); | |
| 7057 } |