annotate src/fns.c @ 62871:72f9770b91d4

*** empty log message ***
author Richard M. Stallman <rms@gnu.org>
date Sun, 29 May 2005 14:38:52 +0000
parents 100b8f001349
children c698dd8981bd 5b029ff3b08d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Random utility Lisp functions.
61433
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
2 Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
3 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 This file is part of GNU Emacs.
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 GNU Emacs is free software; you can redistribute it and/or modify
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 it under the terms of the GNU General Public License as published by
10405
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
9 the Free Software Foundation; either version 2, or (at your option)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 any later version.
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 GNU General Public License for more details.
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 along with GNU Emacs; see the file COPYING. If not, write to
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14097
diff changeset
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14097
diff changeset
20 Boston, MA 02111-1307, USA. */
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 4616
diff changeset
22 #include <config.h>
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21383
diff changeset
24 #ifdef HAVE_UNISTD_H
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21383
diff changeset
25 #include <unistd.h>
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21383
diff changeset
26 #endif
21841
12c75f0ef578 Include <time.h> for time.
Andreas Schwab <schwab@suse.de>
parents: 21810
diff changeset
27 #include <time.h>
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21383
diff changeset
28
59146
9bde7721ad0f * dispextern.h: Change HAVE_CARBON to MAC_OS.
Steven Tamm <steventamm@mac.com>
parents: 58623
diff changeset
29 #ifndef MAC_OS
9bde7721ad0f * dispextern.h: Change HAVE_CARBON to MAC_OS.
Steven Tamm <steventamm@mac.com>
parents: 58623
diff changeset
30 /* On Mac OS, defining this conflicts with precompiled headers. */
50301
c0f3ec529c05 Allow building on Mac OS X again after Kim's merging of display code.
Andrew Choi <akochoi@shaw.ca>
parents: 49915
diff changeset
31
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32 /* Note on some machines this defines `vector' as a typedef,
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 so make sure we don't use that name in this file. */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
34 #undef vector
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
35 #define vector *****
50301
c0f3ec529c05 Allow building on Mac OS X again after Kim's merging of display code.
Andrew Choi <akochoi@shaw.ca>
parents: 49915
diff changeset
36
c0f3ec529c05 Allow building on Mac OS X again after Kim's merging of display code.
Andrew Choi <akochoi@shaw.ca>
parents: 49915
diff changeset
37 #endif /* ! MAC_OSX */
c0f3ec529c05 Allow building on Mac OS X again after Kim's merging of display code.
Andrew Choi <akochoi@shaw.ca>
parents: 49915
diff changeset
38
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
39 #include "lisp.h"
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
40 #include "commands.h"
17182
47bfc66eb7f1 (map_char_table): Handle multibyte characters.
Kenichi Handa <handa@m17n.org>
parents: 17063
diff changeset
41 #include "charset.h"
49081
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
42 #include "coding.h"
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43 #include "buffer.h"
1513
7381accd610d * fns.c: #include keyboard.h.
Jim Blandy <jimb@redhat.com>
parents: 1194
diff changeset
44 #include "keyboard.h"
39697
0b986bb45526 Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39682
diff changeset
45 #include "keymap.h"
4004
71541ea16adf * fns.c (Fsubstring, concat): Pass all six arguments to
Jim Blandy <jimb@redhat.com>
parents: 3379
diff changeset
46 #include "intervals.h"
16561
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
47 #include "frame.h"
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
48 #include "window.h"
37319
b481b8cc3923 Include blockinput.h.
Gerd Moellmann <gerd@gnu.org>
parents: 37317
diff changeset
49 #include "blockinput.h"
21810
15f5abff4d9b [HAVE_MENUS]: Include xterm.h only if HAVE_X_WINDOWS.
Richard M. Stallman <rms@gnu.org>
parents: 21791
diff changeset
50 #if defined (HAVE_MENUS) && defined (HAVE_X_WINDOWS)
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21383
diff changeset
51 #include "xterm.h"
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21383
diff changeset
52 #endif
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
53
12062
9d84af59f868 (NULL): Define if not defined.
Karl Heuer <kwzh@gnu.org>
parents: 12008
diff changeset
54 #ifndef NULL
49081
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
55 #define NULL ((POINTER_TYPE *)0)
12062
9d84af59f868 (NULL): Define if not defined.
Karl Heuer <kwzh@gnu.org>
parents: 12008
diff changeset
56 #endif
9d84af59f868 (NULL): Define if not defined.
Karl Heuer <kwzh@gnu.org>
parents: 12008
diff changeset
57
18531
35a263e545b3 (Fy_or_n_p, Fyes_or_no_p): Obey use_dialog_box.
Richard M. Stallman <rms@gnu.org>
parents: 18421
diff changeset
58 /* Nonzero enables use of dialog boxes for questions
35a263e545b3 (Fy_or_n_p, Fyes_or_no_p): Obey use_dialog_box.
Richard M. Stallman <rms@gnu.org>
parents: 18421
diff changeset
59 asked by mouse commands. */
35a263e545b3 (Fy_or_n_p, Fyes_or_no_p): Obey use_dialog_box.
Richard M. Stallman <rms@gnu.org>
parents: 18421
diff changeset
60 int use_dialog_box;
35a263e545b3 (Fy_or_n_p, Fyes_or_no_p): Obey use_dialog_box.
Richard M. Stallman <rms@gnu.org>
parents: 18421
diff changeset
61
53189
2c1d6f1a791e Add variable use-file-dialog to control use of file dialogs.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53159
diff changeset
62 /* Nonzero enables use of a file dialog for file name
2c1d6f1a791e Add variable use-file-dialog to control use of file dialogs.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53159
diff changeset
63 questions asked by mouse commands. */
2c1d6f1a791e Add variable use-file-dialog to control use of file dialogs.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53159
diff changeset
64 int use_file_dialog;
2c1d6f1a791e Add variable use-file-dialog to control use of file dialogs.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53159
diff changeset
65
16561
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
66 extern int minibuffer_auto_raise;
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
67 extern Lisp_Object minibuf_window;
49081
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
68 extern Lisp_Object Vlocale_coding_system;
61622
aef105b11011 (Vloads_in_progress): Remove extern.
Lute Kamstra <lute@gnu.org>
parents: 61433
diff changeset
69 extern int load_in_progress;
16561
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
70
2546
c8cd694d70eb (provide, require): Put appropriately-marked
Richard M. Stallman <rms@gnu.org>
parents: 2525
diff changeset
71 Lisp_Object Qstring_lessp, Qprovide, Qrequire;
4456
cbfcf187b5da (Fyes_or_no_p): Use Qyes_or_no_p_history.
Richard M. Stallman <rms@gnu.org>
parents: 4004
diff changeset
72 Lisp_Object Qyes_or_no_p_history;
14456
fb11ccbe5c7c (Qcursor_in_echo_area): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14392
diff changeset
73 Lisp_Object Qcursor_in_echo_area;
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
74 Lisp_Object Qwidget_type;
49081
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
75 Lisp_Object Qcodeset, Qdays, Qmonths, Qpaper;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
76
23051
18ed8d6b11e5 (Fy_or_n_p): Bind input-method-function to nil.
Richard M. Stallman <rms@gnu.org>
parents: 22853
diff changeset
77 extern Lisp_Object Qinput_method_function;
18ed8d6b11e5 (Fy_or_n_p): Bind input-method-function to nil.
Richard M. Stallman <rms@gnu.org>
parents: 22853
diff changeset
78
9927
05aa745fc829 (internal_equal): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents: 9439
diff changeset
79 static int internal_equal ();
21580
061d5d4f7967 (time): Declare it only if not HAVE_UNISTD_H.
Richard M. Stallman <rms@gnu.org>
parents: 21577
diff changeset
80
061d5d4f7967 (time): Declare it only if not HAVE_UNISTD_H.
Richard M. Stallman <rms@gnu.org>
parents: 21577
diff changeset
81 extern long get_random ();
061d5d4f7967 (time): Declare it only if not HAVE_UNISTD_H.
Richard M. Stallman <rms@gnu.org>
parents: 21577
diff changeset
82 extern void seed_random ();
061d5d4f7967 (time): Declare it only if not HAVE_UNISTD_H.
Richard M. Stallman <rms@gnu.org>
parents: 21577
diff changeset
83
061d5d4f7967 (time): Declare it only if not HAVE_UNISTD_H.
Richard M. Stallman <rms@gnu.org>
parents: 21577
diff changeset
84 #ifndef HAVE_UNISTD_H
061d5d4f7967 (time): Declare it only if not HAVE_UNISTD_H.
Richard M. Stallman <rms@gnu.org>
parents: 21577
diff changeset
85 extern long time ();
061d5d4f7967 (time): Declare it only if not HAVE_UNISTD_H.
Richard M. Stallman <rms@gnu.org>
parents: 21577
diff changeset
86 #endif
399
21aa17a1560d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 350
diff changeset
87
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
88 DEFUN ("identity", Fidentity, Sidentity, 1, 1, 0,
41006
fd83ec62a495 Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 40985
diff changeset
89 doc: /* Return the argument unchanged. */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
90 (arg)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91 Lisp_Object arg;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
92 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
93 return arg;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
94 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
95
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
96 DEFUN ("random", Frandom, Srandom, 0, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
97 doc: /* Return a pseudo-random number.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
98 All integers representable in Lisp are equally likely.
53255
3b437add35b6 (Frandom, Fstring_make_multibyte): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53189
diff changeset
99 On most systems, this is 29 bits' worth.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
100 With positive integer argument N, return random number in interval [0,N).
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
101 With argument t, set the random number seed from the current time and pid. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
102 (n)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
103 Lisp_Object n;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
104 {
12008
637671248a31 (Frandom): Use EMACS_INT, not int.
Karl Heuer <kwzh@gnu.org>
parents: 11539
diff changeset
105 EMACS_INT val;
637671248a31 (Frandom): Use EMACS_INT, not int.
Karl Heuer <kwzh@gnu.org>
parents: 11539
diff changeset
106 Lisp_Object lispy_val;
6376
3fe339cf2dde (Frandom): Eliminate bias in random number generator.
Karl Heuer <kwzh@gnu.org>
parents: 6344
diff changeset
107 unsigned long denominator;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
108
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
109 if (EQ (n, Qt))
12008
637671248a31 (Frandom): Use EMACS_INT, not int.
Karl Heuer <kwzh@gnu.org>
parents: 11539
diff changeset
110 seed_random (getpid () + time (NULL));
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
111 if (NATNUMP (n) && XFASTINT (n) != 0)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
112 {
10411
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
113 /* Try to take our random number from the higher bits of VAL,
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
114 not the lower, since (says Gentzel) the low bits of `random'
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
115 are less random than the higher ones. We do this by using the
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
116 quotient rather than the remainder. At the high end of the RNG
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
117 it's possible to get a quotient larger than n; discarding
10411
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
118 these values eliminates the bias that would otherwise appear
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
119 when using a large n. */
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
120 denominator = ((unsigned long)1 << VALBITS) / XFASTINT (n);
10411
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
121 do
10485
40c59e55775a (Frandom): Call seed_random and get_random.
Karl Heuer <kwzh@gnu.org>
parents: 10411
diff changeset
122 val = get_random () / denominator;
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
123 while (val >= XFASTINT (n));
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
124 }
6376
3fe339cf2dde (Frandom): Eliminate bias in random number generator.
Karl Heuer <kwzh@gnu.org>
parents: 6344
diff changeset
125 else
10485
40c59e55775a (Frandom): Call seed_random and get_random.
Karl Heuer <kwzh@gnu.org>
parents: 10411
diff changeset
126 val = get_random ();
12008
637671248a31 (Frandom): Use EMACS_INT, not int.
Karl Heuer <kwzh@gnu.org>
parents: 11539
diff changeset
127 XSETINT (lispy_val, val);
637671248a31 (Frandom): Use EMACS_INT, not int.
Karl Heuer <kwzh@gnu.org>
parents: 11539
diff changeset
128 return lispy_val;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
129 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
130
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
131 /* Random data-structure functions */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
132
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
133 DEFUN ("length", Flength, Slength, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
134 doc: /* Return the length of vector, list or string SEQUENCE.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
135 A byte-code function object is also allowed.
47762
aa5414c0e056 (Flength): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents: 46425
diff changeset
136 If the string contains multibyte characters, this is not necessarily
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
137 the number of bytes in the string; it is the number of characters.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
138 To get the number of bytes, use `string-bytes'. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
139 (sequence)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
140 register Lisp_Object sequence;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
141 {
34961
d033c08f2ac6 (Flength): Remove unused variable `tail'.
Eli Zaretskii <eliz@gnu.org>
parents: 34722
diff changeset
142 register Lisp_Object val;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
143 register int i;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
144
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
145 retry:
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
146 if (STRINGP (sequence))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
147 XSETFASTINT (val, SCHARS (sequence));
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
148 else if (VECTORP (sequence))
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
149 XSETFASTINT (val, XVECTOR (sequence)->size);
50461
6a4e89f0d078 (Flength): Return SUB_CHAR_TABLE_ORDINARY_SLOTS for sub char tables.
Juanma Barranquero <lekktu@gmail.com>
parents: 50301
diff changeset
150 else if (SUB_CHAR_TABLE_P (sequence))
6a4e89f0d078 (Flength): Return SUB_CHAR_TABLE_ORDINARY_SLOTS for sub char tables.
Juanma Barranquero <lekktu@gmail.com>
parents: 50301
diff changeset
151 XSETFASTINT (val, SUB_CHAR_TABLE_ORDINARY_SLOTS);
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
152 else if (CHAR_TABLE_P (sequence))
26856
c629af522c09 (Flength): The length of char-table is MAX_CHAR.
Kenichi Handa <handa@m17n.org>
parents: 26596
diff changeset
153 XSETFASTINT (val, MAX_CHAR);
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
154 else if (BOOL_VECTOR_P (sequence))
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
155 XSETFASTINT (val, XBOOL_VECTOR (sequence)->size);
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
156 else if (COMPILEDP (sequence))
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
157 XSETFASTINT (val, XVECTOR (sequence)->size & PSEUDOVECTOR_SIZE_MASK);
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
158 else if (CONSP (sequence))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
159 {
26256
144cf26f35e1 (Flength): Unroll loop over lists.
Gerd Moellmann <gerd@gnu.org>
parents: 26230
diff changeset
160 i = 0;
144cf26f35e1 (Flength): Unroll loop over lists.
Gerd Moellmann <gerd@gnu.org>
parents: 26230
diff changeset
161 while (CONSP (sequence))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
162 {
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
163 sequence = XCDR (sequence);
26256
144cf26f35e1 (Flength): Unroll loop over lists.
Gerd Moellmann <gerd@gnu.org>
parents: 26230
diff changeset
164 ++i;
144cf26f35e1 (Flength): Unroll loop over lists.
Gerd Moellmann <gerd@gnu.org>
parents: 26230
diff changeset
165
144cf26f35e1 (Flength): Unroll loop over lists.
Gerd Moellmann <gerd@gnu.org>
parents: 26230
diff changeset
166 if (!CONSP (sequence))
144cf26f35e1 (Flength): Unroll loop over lists.
Gerd Moellmann <gerd@gnu.org>
parents: 26230
diff changeset
167 break;
144cf26f35e1 (Flength): Unroll loop over lists.
Gerd Moellmann <gerd@gnu.org>
parents: 26230
diff changeset
168
144cf26f35e1 (Flength): Unroll loop over lists.
Gerd Moellmann <gerd@gnu.org>
parents: 26230
diff changeset
169 sequence = XCDR (sequence);
144cf26f35e1 (Flength): Unroll loop over lists.
Gerd Moellmann <gerd@gnu.org>
parents: 26230
diff changeset
170 ++i;
144cf26f35e1 (Flength): Unroll loop over lists.
Gerd Moellmann <gerd@gnu.org>
parents: 26230
diff changeset
171 QUIT;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
172 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
173
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
174 if (!NILP (sequence))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
175 wrong_type_argument (Qlistp, sequence);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
176
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
177 val = make_number (i);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
178 }
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
179 else if (NILP (sequence))
9965
f68eab303ddb (Flength): Don't call Farray_length, just use size field.
Karl Heuer <kwzh@gnu.org>
parents: 9927
diff changeset
180 XSETFASTINT (val, 0);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
181 else
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
182 {
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
183 sequence = wrong_type_argument (Qsequencep, sequence);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
184 goto retry;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
185 }
9965
f68eab303ddb (Flength): Don't call Farray_length, just use size field.
Karl Heuer <kwzh@gnu.org>
parents: 9927
diff changeset
186 return val;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
187 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
188
61723
afe4f19c3436 (Fplist_get): Replace by Fsafe_plist_get.
Kim F. Storm <storm@cua.dk>
parents: 61687
diff changeset
189 /* This does not check for quits. That is safe since it must terminate. */
12466
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
190
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
191 DEFUN ("safe-length", Fsafe_length, Ssafe_length, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
192 doc: /* Return the length of a list, but avoid error or infinite loop.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
193 This function never gets an error. If LIST is not really a list,
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
194 it returns 0. If LIST is circular, it returns a finite value
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
195 which is at least the number of distinct elements. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
196 (list)
12466
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
197 Lisp_Object list;
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
198 {
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
199 Lisp_Object tail, halftail, length;
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
200 int len = 0;
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
201
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
202 /* halftail is used to detect circular lists. */
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
203 halftail = list;
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
204 for (tail = list; CONSP (tail); tail = XCDR (tail))
12466
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
205 {
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
206 if (EQ (tail, halftail) && len != 0)
12618
60c4c0fee545 (Fsafe_length): Use conservative upper bound.
Karl Heuer <kwzh@gnu.org>
parents: 12466
diff changeset
207 break;
12466
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
208 len++;
13344
30e17254a280 (Fsafe_length): Add missing parentheses around & within comparison.
Richard M. Stallman <rms@gnu.org>
parents: 13277
diff changeset
209 if ((len & 1) == 0)
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
210 halftail = XCDR (halftail);
12466
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
211 }
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
212
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
213 XSETINT (length, len);
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
214 return length;
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
215 }
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
216
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
217 DEFUN ("string-bytes", Fstring_bytes, Sstring_bytes, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
218 doc: /* Return the number of bytes in STRING.
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
219 If STRING is a multibyte string, this is greater than the length of STRING. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
220 (string)
20881
fd35cf0efd94 (Fstring_bytes): Declare arg STRING as Lisp_Object.
Kenichi Handa <handa@m17n.org>
parents: 20880
diff changeset
221 Lisp_Object string;
20864
ad9e06c97d95 (Fstring_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20814
diff changeset
222 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
223 CHECK_STRING (string);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
224 return make_number (SBYTES (string));
20864
ad9e06c97d95 (Fstring_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20814
diff changeset
225 }
ad9e06c97d95 (Fstring_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20814
diff changeset
226
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
227 DEFUN ("string-equal", Fstring_equal, Sstring_equal, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
228 doc: /* Return t if two strings have identical contents.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
229 Case is significant, but text properties are ignored.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
230 Symbols are also allowed; their print names are used instead. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
231 (s1, s2)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
232 register Lisp_Object s1, s2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233 {
9128
04a702d7f662 (Frandom, Flength, Fstring_equal, Fstring_lessp, Fcopy_sequence, concat, Felt,
Karl Heuer <kwzh@gnu.org>
parents: 8966
diff changeset
234 if (SYMBOLP (s1))
45401
317e23417505 * fns.c (Fstring_equal, Fstring_lessp, Frequire, sxhash): Use
Ken Raeburn <raeburn@raeburn.org>
parents: 45039
diff changeset
235 s1 = SYMBOL_NAME (s1);
9128
04a702d7f662 (Frandom, Flength, Fstring_equal, Fstring_lessp, Fcopy_sequence, concat, Felt,
Karl Heuer <kwzh@gnu.org>
parents: 8966
diff changeset
236 if (SYMBOLP (s2))
45401
317e23417505 * fns.c (Fstring_equal, Fstring_lessp, Frequire, sxhash): Use
Ken Raeburn <raeburn@raeburn.org>
parents: 45039
diff changeset
237 s2 = SYMBOL_NAME (s2);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
238 CHECK_STRING (s1);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
239 CHECK_STRING (s2);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
240
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
241 if (SCHARS (s1) != SCHARS (s2)
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
242 || SBYTES (s1) != SBYTES (s2)
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
243 || bcmp (SDATA (s1), SDATA (s2), SBYTES (s1)))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
244 return Qnil;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
245 return Qt;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
246 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
247
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
248 DEFUN ("compare-strings", Fcompare_strings,
21673
8a32bf93da04 (Fcompare_strings): Require first 6 args.
Richard M. Stallman <rms@gnu.org>
parents: 21671
diff changeset
249 Scompare_strings, 6, 7, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
250 doc: /* Compare the contents of two strings, converting to multibyte if needed.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
251 In string STR1, skip the first START1 characters and stop at END1.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
252 In string STR2, skip the first START2 characters and stop at END2.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
253 END1 and END2 default to the full lengths of the respective strings.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
254
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
255 Case is significant in this comparison if IGNORE-CASE is nil.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
256 Unibyte strings are converted to multibyte for comparison.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
257
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
258 The value is t if the strings (or specified portions) match.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
259 If string STR1 is less, the value is a negative number N;
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
260 - 1 - N is the number of characters that match at the beginning.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
261 If string STR1 is greater, the value is a positive number N;
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
262 N - 1 is the number of characters that match at the beginning. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
263 (str1, start1, end1, str2, start2, end2, ignore_case)
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
264 Lisp_Object str1, start1, end1, start2, str2, end2, ignore_case;
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
265 {
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
266 register int end1_char, end2_char;
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
267 register int i1, i1_byte, i2, i2_byte;
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
268
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
269 CHECK_STRING (str1);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
270 CHECK_STRING (str2);
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
271 if (NILP (start1))
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
272 start1 = make_number (0);
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
273 if (NILP (start2))
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
274 start2 = make_number (0);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
275 CHECK_NATNUM (start1);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
276 CHECK_NATNUM (start2);
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
277 if (! NILP (end1))
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
278 CHECK_NATNUM (end1);
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
279 if (! NILP (end2))
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
280 CHECK_NATNUM (end2);
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
281
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
282 i1 = XINT (start1);
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
283 i2 = XINT (start2);
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
284
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
285 i1_byte = string_char_to_byte (str1, i1);
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
286 i2_byte = string_char_to_byte (str2, i2);
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
287
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
288 end1_char = SCHARS (str1);
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
289 if (! NILP (end1) && end1_char > XINT (end1))
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
290 end1_char = XINT (end1);
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
291
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
292 end2_char = SCHARS (str2);
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
293 if (! NILP (end2) && end2_char > XINT (end2))
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
294 end2_char = XINT (end2);
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
295
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
296 while (i1 < end1_char && i2 < end2_char)
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
297 {
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
298 /* When we find a mismatch, we must compare the
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
299 characters, not just the bytes. */
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
300 int c1, c2;
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
301
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
302 if (STRING_MULTIBYTE (str1))
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
303 FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c1, str1, i1, i1_byte);
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
304 else
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
305 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
306 c1 = SREF (str1, i1++);
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
307 c1 = unibyte_char_to_multibyte (c1);
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
308 }
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
309
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
310 if (STRING_MULTIBYTE (str2))
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
311 FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c2, str2, i2, i2_byte);
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
312 else
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
313 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
314 c2 = SREF (str2, i2++);
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
315 c2 = unibyte_char_to_multibyte (c2);
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
316 }
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
317
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
318 if (c1 == c2)
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
319 continue;
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
320
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
321 if (! NILP (ignore_case))
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
322 {
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
323 Lisp_Object tem;
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
324
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
325 tem = Fupcase (make_number (c1));
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
326 c1 = XINT (tem);
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
327 tem = Fupcase (make_number (c2));
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
328 c2 = XINT (tem);
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
329 }
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
330
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
331 if (c1 == c2)
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
332 continue;
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
333
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
334 /* Note that I1 has already been incremented
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
335 past the character that we are comparing;
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
336 hence we don't add or subtract 1 here. */
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
337 if (c1 < c2)
37309
aecc289cb0de (Fcompare_strings): Fix return values.
Gerd Moellmann <gerd@gnu.org>
parents: 37279
diff changeset
338 return make_number (- i1 + XINT (start1));
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
339 else
37309
aecc289cb0de (Fcompare_strings): Fix return values.
Gerd Moellmann <gerd@gnu.org>
parents: 37279
diff changeset
340 return make_number (i1 - XINT (start1));
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
341 }
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
342
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
343 if (i1 < end1_char)
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
344 return make_number (i1 - XINT (start1) + 1);
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
345 if (i2 < end2_char)
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
346 return make_number (- i1 + XINT (start1) - 1);
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
347
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
348 return Qt;
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
349 }
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
350
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
351 DEFUN ("string-lessp", Fstring_lessp, Sstring_lessp, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
352 doc: /* Return t if first arg string is less than second in lexicographic order.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
353 Case is significant.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
354 Symbols are also allowed; their print names are used instead. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
355 (s1, s2)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
356 register Lisp_Object s1, s2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
357 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
358 register int end;
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
359 register int i1, i1_byte, i2, i2_byte;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
360
9128
04a702d7f662 (Frandom, Flength, Fstring_equal, Fstring_lessp, Fcopy_sequence, concat, Felt,
Karl Heuer <kwzh@gnu.org>
parents: 8966
diff changeset
361 if (SYMBOLP (s1))
45401
317e23417505 * fns.c (Fstring_equal, Fstring_lessp, Frequire, sxhash): Use
Ken Raeburn <raeburn@raeburn.org>
parents: 45039
diff changeset
362 s1 = SYMBOL_NAME (s1);
9128
04a702d7f662 (Frandom, Flength, Fstring_equal, Fstring_lessp, Fcopy_sequence, concat, Felt,
Karl Heuer <kwzh@gnu.org>
parents: 8966
diff changeset
363 if (SYMBOLP (s2))
45401
317e23417505 * fns.c (Fstring_equal, Fstring_lessp, Frequire, sxhash): Use
Ken Raeburn <raeburn@raeburn.org>
parents: 45039
diff changeset
364 s2 = SYMBOL_NAME (s2);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
365 CHECK_STRING (s1);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
366 CHECK_STRING (s2);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
367
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
368 i1 = i1_byte = i2 = i2_byte = 0;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
369
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
370 end = SCHARS (s1);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
371 if (end > SCHARS (s2))
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
372 end = SCHARS (s2);
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
373
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
374 while (i1 < end)
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
375 {
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
376 /* When we find a mismatch, we must compare the
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
377 characters, not just the bytes. */
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
378 int c1, c2;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
379
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
380 FETCH_STRING_CHAR_ADVANCE (c1, s1, i1, i1_byte);
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
381 FETCH_STRING_CHAR_ADVANCE (c2, s2, i2, i2_byte);
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
382
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
383 if (c1 != c2)
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
384 return c1 < c2 ? Qt : Qnil;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
385 }
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
386 return i1 < SCHARS (s2) ? Qt : Qnil;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
387 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
388
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
389 static Lisp_Object concat ();
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
390
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
391 /* ARGSUSED */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
392 Lisp_Object
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
393 concat2 (s1, s2)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
394 Lisp_Object s1, s2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
395 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
396 #ifdef NO_ARG_ARRAY
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
397 Lisp_Object args[2];
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
398 args[0] = s1;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
399 args[1] = s2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
400 return concat (2, args, Lisp_String, 0);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
401 #else
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
402 return concat (2, &s1, Lisp_String, 0);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
403 #endif /* NO_ARG_ARRAY */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
404 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
405
8966
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
406 /* ARGSUSED */
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
407 Lisp_Object
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
408 concat3 (s1, s2, s3)
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
409 Lisp_Object s1, s2, s3;
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
410 {
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
411 #ifdef NO_ARG_ARRAY
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
412 Lisp_Object args[3];
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
413 args[0] = s1;
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
414 args[1] = s2;
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
415 args[2] = s3;
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
416 return concat (3, args, Lisp_String, 0);
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
417 #else
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
418 return concat (3, &s1, Lisp_String, 0);
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
419 #endif /* NO_ARG_ARRAY */
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
420 }
cafc16f356c2 (concat3): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8901
diff changeset
421
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
422 DEFUN ("append", Fappend, Sappend, 0, MANY, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
423 doc: /* Concatenate all the arguments and make the result a list.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
424 The result is a list whose elements are the elements of all the arguments.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
425 Each argument may be a list, vector or string.
40132
75fe73bea452 (Fappend, Fconcat, Fvconcat, Fnconc, Fwidget_apply, Fmake_hash_table):
Miles Bader <miles@gnu.org>
parents: 39977
diff changeset
426 The last argument is not copied, just used as the tail of the new list.
75fe73bea452 (Fappend, Fconcat, Fvconcat, Fnconc, Fwidget_apply, Fmake_hash_table):
Miles Bader <miles@gnu.org>
parents: 39977
diff changeset
427 usage: (append &rest SEQUENCES) */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
428 (nargs, args)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
429 int nargs;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
430 Lisp_Object *args;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
431 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
432 return concat (nargs, args, Lisp_Cons, 1);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
433 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
434
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
435 DEFUN ("concat", Fconcat, Sconcat, 0, MANY, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
436 doc: /* Concatenate all the arguments and make the result a string.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
437 The result is a string whose elements are the elements of all the arguments.
40132
75fe73bea452 (Fappend, Fconcat, Fvconcat, Fnconc, Fwidget_apply, Fmake_hash_table):
Miles Bader <miles@gnu.org>
parents: 39977
diff changeset
438 Each argument may be a string or a list or vector of characters (integers).
75fe73bea452 (Fappend, Fconcat, Fvconcat, Fnconc, Fwidget_apply, Fmake_hash_table):
Miles Bader <miles@gnu.org>
parents: 39977
diff changeset
439 usage: (concat &rest SEQUENCES) */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
440 (nargs, args)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
441 int nargs;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
442 Lisp_Object *args;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
443 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
444 return concat (nargs, args, Lisp_String, 0);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
445 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
446
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
447 DEFUN ("vconcat", Fvconcat, Svconcat, 0, MANY, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
448 doc: /* Concatenate all the arguments and make the result a vector.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
449 The result is a vector whose elements are the elements of all the arguments.
40132
75fe73bea452 (Fappend, Fconcat, Fvconcat, Fnconc, Fwidget_apply, Fmake_hash_table):
Miles Bader <miles@gnu.org>
parents: 39977
diff changeset
450 Each argument may be a list, vector or string.
75fe73bea452 (Fappend, Fconcat, Fvconcat, Fnconc, Fwidget_apply, Fmake_hash_table):
Miles Bader <miles@gnu.org>
parents: 39977
diff changeset
451 usage: (vconcat &rest SEQUENCES) */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
452 (nargs, args)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
453 int nargs;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
454 Lisp_Object *args;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
455 {
10006
402c87cbc4fa (Fvconcat, concat): Use Lisp_Vectorlike.
Karl Heuer <kwzh@gnu.org>
parents: 9965
diff changeset
456 return concat (nargs, args, Lisp_Vectorlike, 0);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
457 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
458
47762
aa5414c0e056 (Flength): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents: 46425
diff changeset
459 /* Return a copy of a sub char table ARG. The elements except for a
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
460 nested sub char table are not copied. */
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
461 static Lisp_Object
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
462 copy_sub_char_table (arg)
17826
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
463 Lisp_Object arg;
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
464 {
61735
76a2f6423902 (copy_sub_char_table): Explicitly copy the default value
Kenichi Handa <handa@m17n.org>
parents: 61723
diff changeset
465 Lisp_Object copy = make_sub_char_table (Qnil);
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
466 int i;
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
467
61735
76a2f6423902 (copy_sub_char_table): Explicitly copy the default value
Kenichi Handa <handa@m17n.org>
parents: 61723
diff changeset
468 XCHAR_TABLE (copy)->defalt = XCHAR_TABLE (arg)->defalt;
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
469 /* Copy all the contents. */
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
470 bcopy (XCHAR_TABLE (arg)->contents, XCHAR_TABLE (copy)->contents,
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
471 SUB_CHAR_TABLE_ORDINARY_SLOTS * sizeof (Lisp_Object));
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
472 /* Recursively copy any sub char-tables in the ordinary slots. */
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
473 for (i = 32; i < SUB_CHAR_TABLE_ORDINARY_SLOTS; i++)
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
474 if (SUB_CHAR_TABLE_P (XCHAR_TABLE (arg)->contents[i]))
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
475 XCHAR_TABLE (copy)->contents[i]
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
476 = copy_sub_char_table (XCHAR_TABLE (copy)->contents[i]);
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
477
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
478 return copy;
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
479 }
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
480
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
481
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
482 DEFUN ("copy-sequence", Fcopy_sequence, Scopy_sequence, 1, 1, 0,
48320
de5246a3655a (Fcopy_sequence): Doc fix.
Dave Love <fx@gnu.org>
parents: 48271
diff changeset
483 doc: /* Return a copy of a list, vector, string or char-table.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
484 The elements of a list or vector are not copied; they are shared
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
485 with the original. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
486 (arg)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
487 Lisp_Object arg;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
488 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
489 if (NILP (arg)) return arg;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
490
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
491 if (CHAR_TABLE_P (arg))
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
492 {
17291
b66473f0d0fe (Fcopy_sequence): Delete unused variable.
Karl Heuer <kwzh@gnu.org>
parents: 17182
diff changeset
493 int i;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
494 Lisp_Object copy;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
495
13184
04170e19b3d4 (Fcopy_sequence): Call Fmake_char_table the new way.
Richard M. Stallman <rms@gnu.org>
parents: 13140
diff changeset
496 copy = Fmake_char_table (XCHAR_TABLE (arg)->purpose, Qnil);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
497 /* Copy all the slots, including the extra ones. */
17819
6fd66459ec9a (Fcopy_sequence): Correctly copy the char-table contents.
Richard M. Stallman <rms@gnu.org>
parents: 17789
diff changeset
498 bcopy (XVECTOR (arg)->contents, XVECTOR (copy)->contents,
17291
b66473f0d0fe (Fcopy_sequence): Delete unused variable.
Karl Heuer <kwzh@gnu.org>
parents: 17182
diff changeset
499 ((XCHAR_TABLE (arg)->size & PSEUDOVECTOR_SIZE_MASK)
b66473f0d0fe (Fcopy_sequence): Delete unused variable.
Karl Heuer <kwzh@gnu.org>
parents: 17182
diff changeset
500 * sizeof (Lisp_Object)));
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
501
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
502 /* Recursively copy any sub char tables in the ordinary slots
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
503 for multibyte characters. */
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
504 for (i = CHAR_TABLE_SINGLE_BYTE_SLOTS;
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
505 i < CHAR_TABLE_ORDINARY_SLOTS; i++)
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
506 if (SUB_CHAR_TABLE_P (XCHAR_TABLE (arg)->contents[i]))
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
507 XCHAR_TABLE (copy)->contents[i]
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
508 = copy_sub_char_table (XCHAR_TABLE (copy)->contents[i]);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
509
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
510 return copy;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
511 }
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
512
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
513 if (BOOL_VECTOR_P (arg))
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
514 {
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
515 Lisp_Object val;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
516 int size_in_chars
55161
beac72c0215f (Fcopy_sequence, concat, internal_equal, Ffillarray, mapcar1): Use
Andreas Schwab <schwab@suse.de>
parents: 54994
diff changeset
517 = ((XBOOL_VECTOR (arg)->size + BOOL_VECTOR_BITS_PER_CHAR - 1)
beac72c0215f (Fcopy_sequence, concat, internal_equal, Ffillarray, mapcar1): Use
Andreas Schwab <schwab@suse.de>
parents: 54994
diff changeset
518 / BOOL_VECTOR_BITS_PER_CHAR);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
519
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
520 val = Fmake_bool_vector (Flength (arg), Qnil);
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
521 bcopy (XBOOL_VECTOR (arg)->data, XBOOL_VECTOR (val)->data,
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
522 size_in_chars);
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
523 return val;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
524 }
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
525
9128
04a702d7f662 (Frandom, Flength, Fstring_equal, Fstring_lessp, Fcopy_sequence, concat, Felt,
Karl Heuer <kwzh@gnu.org>
parents: 8966
diff changeset
526 if (!CONSP (arg) && !VECTORP (arg) && !STRINGP (arg))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
527 arg = wrong_type_argument (Qsequencep, arg);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
528 return concat (1, &arg, CONSP (arg) ? Lisp_Cons : XTYPE (arg), 0);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
529 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
530
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
531 /* This structure holds information of an argument of `concat' that is
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
532 a string and has text properties to be copied. */
25094
4df3b9d95d4a (concat): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 25093
diff changeset
533 struct textprop_rec
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
534 {
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
535 int argnum; /* refer to ARGS (arguments of `concat') */
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
536 int from; /* refer to ARGS[argnum] (argument string) */
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
537 int to; /* refer to VAL (the target string) */
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
538 };
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
539
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
540 static Lisp_Object
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
541 concat (nargs, args, target_type, last_special)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
542 int nargs;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
543 Lisp_Object *args;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
544 enum Lisp_Type target_type;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
545 int last_special;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
546 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
547 Lisp_Object val;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
548 register Lisp_Object tail;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
549 register Lisp_Object this;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
550 int toindex;
31533
3898245f639a (concat, Fsubstring, internal_equal, Fnconc): Avoid some
Gerd Moellmann <gerd@gnu.org>
parents: 30760
diff changeset
551 int toindex_byte = 0;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
552 register int result_len;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
553 register int result_len_byte;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
554 register int argnum;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
555 Lisp_Object last_tail;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
556 Lisp_Object prev;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
557 int some_multibyte;
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
558 /* When we make a multibyte string, we can't copy text properties
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
559 while concatinating each string because the length of resulting
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
560 string can't be decided until we finish the whole concatination.
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
561 So, we record strings that have text properties to be copied
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
562 here, and copy the text properties after the concatination. */
31533
3898245f639a (concat, Fsubstring, internal_equal, Fnconc): Avoid some
Gerd Moellmann <gerd@gnu.org>
parents: 30760
diff changeset
563 struct textprop_rec *textprops = NULL;
25094
4df3b9d95d4a (concat): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 25093
diff changeset
564 /* Number of elments in textprops. */
4df3b9d95d4a (concat): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 25093
diff changeset
565 int num_textprops = 0;
58623
834b3aeb850f (concat): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 58379
diff changeset
566 USE_SAFE_ALLOCA;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
567
31533
3898245f639a (concat, Fsubstring, internal_equal, Fnconc): Avoid some
Gerd Moellmann <gerd@gnu.org>
parents: 30760
diff changeset
568 tail = Qnil;
3898245f639a (concat, Fsubstring, internal_equal, Fnconc): Avoid some
Gerd Moellmann <gerd@gnu.org>
parents: 30760
diff changeset
569
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
570 /* In append, the last arg isn't treated like the others */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
571 if (last_special && nargs > 0)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
572 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
573 nargs--;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
574 last_tail = args[nargs];
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
575 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
576 else
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
577 last_tail = Qnil;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
578
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
579 /* Canonicalize each argument. */
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
580 for (argnum = 0; argnum < nargs; argnum++)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
581 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
582 this = args[argnum];
9128
04a702d7f662 (Frandom, Flength, Fstring_equal, Fstring_lessp, Fcopy_sequence, concat, Felt,
Karl Heuer <kwzh@gnu.org>
parents: 8966
diff changeset
583 if (!(CONSP (this) || NILP (this) || VECTORP (this) || STRINGP (this)
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
584 || COMPILEDP (this) || BOOL_VECTOR_P (this)))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
585 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
586 args[argnum] = wrong_type_argument (Qsequencep, this);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
587 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
588 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
589
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
590 /* Compute total length in chars of arguments in RESULT_LEN.
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
591 If desired output is a string, also compute length in bytes
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
592 in RESULT_LEN_BYTE, and determine in SOME_MULTIBYTE
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
593 whether the result should be a multibyte string. */
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
594 result_len_byte = 0;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
595 result_len = 0;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
596 some_multibyte = 0;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
597 for (argnum = 0; argnum < nargs; argnum++)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
598 {
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
599 int len;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
600 this = args[argnum];
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
601 len = XFASTINT (Flength (this));
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
602 if (target_type == Lisp_String)
18311
8b716cb12cdd (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 18108
diff changeset
603 {
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
604 /* We must count the number of bytes needed in the string
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
605 as well as the number of characters. */
18311
8b716cb12cdd (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 18108
diff changeset
606 int i;
8b716cb12cdd (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 18108
diff changeset
607 Lisp_Object ch;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
608 int this_len_byte;
18311
8b716cb12cdd (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 18108
diff changeset
609
19278
50f47ef6ce9a (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 19223
diff changeset
610 if (VECTORP (this))
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
611 for (i = 0; i < len; i++)
19278
50f47ef6ce9a (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 19223
diff changeset
612 {
50f47ef6ce9a (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 19223
diff changeset
613 ch = XVECTOR (this)->contents[i];
50f47ef6ce9a (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 19223
diff changeset
614 if (! INTEGERP (ch))
50f47ef6ce9a (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 19223
diff changeset
615 wrong_type_argument (Qintegerp, ch);
23128
45de23c16505 (concat): Use macro CHAR_BYTES instead of Fchar_bytes.
Kenichi Handa <handa@m17n.org>
parents: 23057
diff changeset
616 this_len_byte = CHAR_BYTES (XINT (ch));
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
617 result_len_byte += this_len_byte;
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
618 if (!SINGLE_BYTE_CHAR_P (XINT (ch)))
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
619 some_multibyte = 1;
19278
50f47ef6ce9a (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 19223
diff changeset
620 }
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
621 else if (BOOL_VECTOR_P (this) && XBOOL_VECTOR (this)->size > 0)
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
622 wrong_type_argument (Qintegerp, Faref (this, make_number (0)));
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
623 else if (CONSP (this))
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
624 for (; CONSP (this); this = XCDR (this))
19278
50f47ef6ce9a (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 19223
diff changeset
625 {
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
626 ch = XCAR (this);
19278
50f47ef6ce9a (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 19223
diff changeset
627 if (! INTEGERP (ch))
50f47ef6ce9a (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 19223
diff changeset
628 wrong_type_argument (Qintegerp, ch);
23128
45de23c16505 (concat): Use macro CHAR_BYTES instead of Fchar_bytes.
Kenichi Handa <handa@m17n.org>
parents: 23057
diff changeset
629 this_len_byte = CHAR_BYTES (XINT (ch));
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
630 result_len_byte += this_len_byte;
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
631 if (!SINGLE_BYTE_CHAR_P (XINT (ch)))
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
632 some_multibyte = 1;
19278
50f47ef6ce9a (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 19223
diff changeset
633 }
20639
12240a9b3679 (concat): Check STRINGP before increasing result_len_byte.
Kenichi Handa <handa@m17n.org>
parents: 20607
diff changeset
634 else if (STRINGP (this))
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
635 {
20699
907d8633c8cc (concat): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20667
diff changeset
636 if (STRING_MULTIBYTE (this))
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
637 {
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
638 some_multibyte = 1;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
639 result_len_byte += SBYTES (this);
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
640 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
641 else
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
642 result_len_byte += count_size_as_multibyte (SDATA (this),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
643 SCHARS (this));
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
644 }
18311
8b716cb12cdd (concat): Pay attention to multibyte characters when
Kenichi Handa <handa@m17n.org>
parents: 18108
diff changeset
645 }
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
646
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
647 result_len += len;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
648 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
649
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
650 if (! some_multibyte)
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
651 result_len_byte = result_len;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
652
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
653 /* Create the output object. */
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
654 if (target_type == Lisp_Cons)
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
655 val = Fmake_list (make_number (result_len), Qnil);
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
656 else if (target_type == Lisp_Vectorlike)
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
657 val = Fmake_vector (make_number (result_len), Qnil);
21260
4ac9ba6e745d (substring_both, Fsubstring): Use make_specified_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
658 else if (some_multibyte)
4ac9ba6e745d (substring_both, Fsubstring): Use make_specified_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
659 val = make_uninit_multibyte_string (result_len, result_len_byte);
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
660 else
21260
4ac9ba6e745d (substring_both, Fsubstring): Use make_specified_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
661 val = make_uninit_string (result_len);
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
662
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
663 /* In `append', if all but last arg are nil, return last arg. */
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
664 if (target_type == Lisp_Cons && EQ (val, Qnil))
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
665 return last_tail;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
666
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
667 /* Copy the contents of the args into the result. */
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
668 if (CONSP (val))
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
669 tail = val, toindex = -1; /* -1 in toindex is flag we are making a list */
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
670 else
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
671 toindex = 0, toindex_byte = 0;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
672
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
673 prev = Qnil;
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
674 if (STRINGP (val))
58623
834b3aeb850f (concat): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 58379
diff changeset
675 SAFE_ALLOCA (textprops, struct textprop_rec *, sizeof (struct textprop_rec) * nargs);
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
676
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
677 for (argnum = 0; argnum < nargs; argnum++)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
678 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
679 Lisp_Object thislen;
31533
3898245f639a (concat, Fsubstring, internal_equal, Fnconc): Avoid some
Gerd Moellmann <gerd@gnu.org>
parents: 30760
diff changeset
680 int thisleni = 0;
16863
591b7a95d7a5 (concat): Take modulus of thisindex before shifting.
Richard M. Stallman <rms@gnu.org>
parents: 16561
diff changeset
681 register unsigned int thisindex = 0;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
682 register unsigned int thisindex_byte = 0;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
683
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
684 this = args[argnum];
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
685 if (!CONSP (this))
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
686 thislen = Flength (this), thisleni = XINT (thislen);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
687
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
688 /* Between strings of the same kind, copy fast. */
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
689 if (STRINGP (this) && STRINGP (val)
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
690 && STRING_MULTIBYTE (this) == some_multibyte)
4004
71541ea16adf * fns.c (Fsubstring, concat): Pass all six arguments to
Jim Blandy <jimb@redhat.com>
parents: 3379
diff changeset
691 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
692 int thislen_byte = SBYTES (this);
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
693
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
694 bcopy (SDATA (this), SDATA (val) + toindex_byte,
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
695 SBYTES (this));
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
696 if (! NULL_INTERVAL_P (STRING_INTERVALS (this)))
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
697 {
25094
4df3b9d95d4a (concat): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 25093
diff changeset
698 textprops[num_textprops].argnum = argnum;
55481
53ac9afa3d0a (count_combining): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 55161
diff changeset
699 textprops[num_textprops].from = 0;
25094
4df3b9d95d4a (concat): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 25093
diff changeset
700 textprops[num_textprops++].to = toindex;
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
701 }
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
702 toindex_byte += thislen_byte;
55481
53ac9afa3d0a (count_combining): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 55161
diff changeset
703 toindex += thisleni;
53ac9afa3d0a (count_combining): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 55161
diff changeset
704 STRING_SET_CHARS (val, SCHARS (val));
4004
71541ea16adf * fns.c (Fsubstring, concat): Pass all six arguments to
Jim Blandy <jimb@redhat.com>
parents: 3379
diff changeset
705 }
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
706 /* Copy a single-byte string to a multibyte string. */
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
707 else if (STRINGP (this) && STRINGP (val))
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
708 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
709 if (! NULL_INTERVAL_P (STRING_INTERVALS (this)))
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
710 {
25094
4df3b9d95d4a (concat): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 25093
diff changeset
711 textprops[num_textprops].argnum = argnum;
4df3b9d95d4a (concat): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 25093
diff changeset
712 textprops[num_textprops].from = 0;
4df3b9d95d4a (concat): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 25093
diff changeset
713 textprops[num_textprops++].to = toindex;
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
714 }
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
715 toindex_byte += copy_text (SDATA (this),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
716 SDATA (val) + toindex_byte,
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
717 SCHARS (this), 0, 1);
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
718 toindex += thisleni;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
719 }
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
720 else
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
721 /* Copy element by element. */
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
722 while (1)
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
723 {
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
724 register Lisp_Object elt;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
725
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
726 /* Fetch next element of `this' arg into `elt', or break if
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
727 `this' is exhausted. */
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
728 if (NILP (this)) break;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
729 if (CONSP (this))
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
730 elt = XCAR (this), this = XCDR (this);
20814
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
731 else if (thisindex >= thisleni)
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
732 break;
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
733 else if (STRINGP (this))
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
734 {
21029
3f47b0364c2a (DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents: 21021
diff changeset
735 int c;
20814
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
736 if (STRING_MULTIBYTE (this))
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
737 {
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
738 FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, this,
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
739 thisindex,
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
740 thisindex_byte);
20814
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
741 XSETFASTINT (elt, c);
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
742 }
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
743 else
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
744 {
58265
491080266027 Avoid side-effects inside XSETFASTINT's arguments.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58239
diff changeset
745 XSETFASTINT (elt, SREF (this, thisindex)); thisindex++;
23152
7cd25ebef713 (concat): If Vnonascii_translation_table is non-nil, try
Kenichi Handa <handa@m17n.org>
parents: 23128
diff changeset
746 if (some_multibyte
7cd25ebef713 (concat): If Vnonascii_translation_table is non-nil, try
Kenichi Handa <handa@m17n.org>
parents: 23128
diff changeset
747 && (XINT (elt) >= 0240
23927
74a3a9c26a03 (concat): Don't convert 7-bit ASCII characters via
Eli Zaretskii <eliz@gnu.org>
parents: 23901
diff changeset
748 || (XINT (elt) >= 0200
74a3a9c26a03 (concat): Don't convert 7-bit ASCII characters via
Eli Zaretskii <eliz@gnu.org>
parents: 23901
diff changeset
749 && ! NILP (Vnonascii_translation_table)))
20814
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
750 && XINT (elt) < 0400)
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
751 {
21029
3f47b0364c2a (DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents: 21021
diff changeset
752 c = unibyte_char_to_multibyte (XINT (elt));
20814
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
753 XSETINT (elt, c);
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
754 }
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
755 }
20814
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
756 }
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
757 else if (BOOL_VECTOR_P (this))
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
758 {
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
759 int byte;
55161
beac72c0215f (Fcopy_sequence, concat, internal_equal, Ffillarray, mapcar1): Use
Andreas Schwab <schwab@suse.de>
parents: 54994
diff changeset
760 byte = XBOOL_VECTOR (this)->data[thisindex / BOOL_VECTOR_BITS_PER_CHAR];
beac72c0215f (Fcopy_sequence, concat, internal_equal, Ffillarray, mapcar1): Use
Andreas Schwab <schwab@suse.de>
parents: 54994
diff changeset
761 if (byte & (1 << (thisindex % BOOL_VECTOR_BITS_PER_CHAR)))
20814
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
762 elt = Qt;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
763 else
20814
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
764 elt = Qnil;
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
765 thisindex++;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
766 }
20814
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
767 else
8f6d92b4f48a (concat): Handle bool-vectors correctly.
Richard M. Stallman <rms@gnu.org>
parents: 20813
diff changeset
768 elt = XVECTOR (this)->contents[thisindex++];
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
769
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
770 /* Store this element into the result. */
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
771 if (toindex < 0)
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
772 {
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39968
diff changeset
773 XSETCAR (tail, elt);
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
774 prev = tail;
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
775 tail = XCDR (tail);
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
776 }
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
777 else if (VECTORP (val))
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
778 XVECTOR (val)->contents[toindex++] = elt;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
779 else
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
780 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
781 CHECK_NUMBER (elt);
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
782 if (SINGLE_BYTE_CHAR_P (XINT (elt)))
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
783 {
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
784 if (some_multibyte)
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
785 toindex_byte
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
786 += CHAR_STRING (XINT (elt),
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
787 SDATA (val) + toindex_byte);
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
788 else
46425
2e674544b19a * fns.c (concat): Use SSET.
Ken Raeburn <raeburn@raeburn.org>
parents: 46379
diff changeset
789 SSET (val, toindex_byte++, XINT (elt));
55481
53ac9afa3d0a (count_combining): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 55161
diff changeset
790 toindex++;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
791 }
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
792 else
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
793 /* If we have any multibyte characters,
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
794 we already decided to make a multibyte string. */
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
795 {
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
796 int c = XINT (elt);
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
797 /* P exists as a variable
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
798 to avoid a bug on the Masscomp C compiler. */
46425
2e674544b19a * fns.c (concat): Use SSET.
Ken Raeburn <raeburn@raeburn.org>
parents: 46379
diff changeset
799 unsigned char *p = SDATA (val) + toindex_byte;
26856
c629af522c09 (Flength): The length of char-table is MAX_CHAR.
Kenichi Handa <handa@m17n.org>
parents: 26596
diff changeset
800
c629af522c09 (Flength): The length of char-table is MAX_CHAR.
Kenichi Handa <handa@m17n.org>
parents: 26596
diff changeset
801 toindex_byte += CHAR_STRING (c, p);
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
802 toindex++;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
803 }
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
804 }
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
805 }
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
806 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
807 if (!NILP (prev))
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39968
diff changeset
808 XSETCDR (prev, last_tail);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
809
25094
4df3b9d95d4a (concat): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 25093
diff changeset
810 if (num_textprops > 0)
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
811 {
30024
9fd285caeb51 (concat): While copying text properties, make each composition
Kenichi Handa <handa@m17n.org>
parents: 30007
diff changeset
812 Lisp_Object props;
35352
42b56dd8986e (concat): Be sure to avoid putting the same `composition'
Kenichi Handa <handa@m17n.org>
parents: 35336
diff changeset
813 int last_to_end = -1;
30024
9fd285caeb51 (concat): While copying text properties, make each composition
Kenichi Handa <handa@m17n.org>
parents: 30007
diff changeset
814
25094
4df3b9d95d4a (concat): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 25093
diff changeset
815 for (argnum = 0; argnum < num_textprops; argnum++)
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
816 {
25094
4df3b9d95d4a (concat): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 25093
diff changeset
817 this = args[textprops[argnum].argnum];
30024
9fd285caeb51 (concat): While copying text properties, make each composition
Kenichi Handa <handa@m17n.org>
parents: 30007
diff changeset
818 props = text_property_list (this,
9fd285caeb51 (concat): While copying text properties, make each composition
Kenichi Handa <handa@m17n.org>
parents: 30007
diff changeset
819 make_number (0),
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
820 make_number (SCHARS (this)),
30024
9fd285caeb51 (concat): While copying text properties, make each composition
Kenichi Handa <handa@m17n.org>
parents: 30007
diff changeset
821 Qnil);
9fd285caeb51 (concat): While copying text properties, make each composition
Kenichi Handa <handa@m17n.org>
parents: 30007
diff changeset
822 /* If successive arguments have properites, be sure that the
9fd285caeb51 (concat): While copying text properties, make each composition
Kenichi Handa <handa@m17n.org>
parents: 30007
diff changeset
823 value of `composition' property be the copy. */
35352
42b56dd8986e (concat): Be sure to avoid putting the same `composition'
Kenichi Handa <handa@m17n.org>
parents: 35336
diff changeset
824 if (last_to_end == textprops[argnum].to)
30024
9fd285caeb51 (concat): While copying text properties, make each composition
Kenichi Handa <handa@m17n.org>
parents: 30007
diff changeset
825 make_composition_value_copy (props);
9fd285caeb51 (concat): While copying text properties, make each composition
Kenichi Handa <handa@m17n.org>
parents: 30007
diff changeset
826 add_text_properties_from_list (val, props,
9fd285caeb51 (concat): While copying text properties, make each composition
Kenichi Handa <handa@m17n.org>
parents: 30007
diff changeset
827 make_number (textprops[argnum].to));
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
828 last_to_end = textprops[argnum].to + SCHARS (this);
25093
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
829 }
30bfdf581d6f (count_combining): New function.
Kenichi Handa <handa@m17n.org>
parents: 25080
diff changeset
830 }
58623
834b3aeb850f (concat): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 58379
diff changeset
831
834b3aeb850f (concat): Use SAFE_ALLOCA.
Kim F. Storm <storm@cua.dk>
parents: 58379
diff changeset
832 SAFE_FREE ();
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
833 return val;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
834 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
835
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
836 static Lisp_Object string_char_byte_cache_string;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
837 static int string_char_byte_cache_charpos;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
838 static int string_char_byte_cache_bytepos;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
839
23424
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
840 void
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
841 clear_string_char_byte_cache ()
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
842 {
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
843 string_char_byte_cache_string = Qnil;
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
844 }
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
845
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
846 /* Return the character index corresponding to CHAR_INDEX in STRING. */
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
847
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
848 int
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
849 string_char_to_byte (string, char_index)
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
850 Lisp_Object string;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
851 int char_index;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
852 {
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
853 int i, i_byte;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
854 int best_below, best_below_byte;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
855 int best_above, best_above_byte;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
856
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
857 best_below = best_below_byte = 0;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
858 best_above = SCHARS (string);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
859 best_above_byte = SBYTES (string);
53742
2b23252ecc55 (string_char_to_byte): Optimize for ASCII only string.
Kenichi Handa <handa@m17n.org>
parents: 53681
diff changeset
860 if (best_above == best_above_byte)
2b23252ecc55 (string_char_to_byte): Optimize for ASCII only string.
Kenichi Handa <handa@m17n.org>
parents: 53681
diff changeset
861 return char_index;
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
862
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
863 if (EQ (string, string_char_byte_cache_string))
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
864 {
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
865 if (string_char_byte_cache_charpos < char_index)
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
866 {
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
867 best_below = string_char_byte_cache_charpos;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
868 best_below_byte = string_char_byte_cache_bytepos;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
869 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
870 else
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
871 {
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
872 best_above = string_char_byte_cache_charpos;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
873 best_above_byte = string_char_byte_cache_bytepos;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
874 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
875 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
876
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
877 if (char_index - best_below < best_above - char_index)
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
878 {
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
879 while (best_below < char_index)
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
880 {
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
881 int c;
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
882 FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, string,
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
883 best_below, best_below_byte);
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
884 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
885 i = best_below;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
886 i_byte = best_below_byte;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
887 }
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
888 else
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
889 {
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
890 while (best_above > char_index)
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
891 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
892 unsigned char *pend = SDATA (string) + best_above_byte;
25501
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
893 unsigned char *pbeg = pend - best_above_byte;
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
894 unsigned char *p = pend - 1;
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
895 int bytes;
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
896
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
897 while (p > pbeg && !CHAR_HEAD_P (*p)) p--;
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
898 PARSE_MULTIBYTE_SEQ (p, pend - p, bytes);
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
899 if (bytes == pend - p)
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
900 best_above_byte -= bytes;
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
901 else if (bytes > pend - p)
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
902 best_above_byte -= (pend - p);
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
903 else
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
904 best_above_byte--;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
905 best_above--;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
906 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
907 i = best_above;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
908 i_byte = best_above_byte;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
909 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
910
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
911 string_char_byte_cache_bytepos = i_byte;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
912 string_char_byte_cache_charpos = i;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
913 string_char_byte_cache_string = string;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
914
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
915 return i_byte;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
916 }
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
917
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
918 /* Return the character index corresponding to BYTE_INDEX in STRING. */
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
919
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
920 int
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
921 string_byte_to_char (string, byte_index)
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
922 Lisp_Object string;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
923 int byte_index;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
924 {
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
925 int i, i_byte;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
926 int best_below, best_below_byte;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
927 int best_above, best_above_byte;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
928
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
929 best_below = best_below_byte = 0;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
930 best_above = SCHARS (string);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
931 best_above_byte = SBYTES (string);
53742
2b23252ecc55 (string_char_to_byte): Optimize for ASCII only string.
Kenichi Handa <handa@m17n.org>
parents: 53681
diff changeset
932 if (best_above == best_above_byte)
2b23252ecc55 (string_char_to_byte): Optimize for ASCII only string.
Kenichi Handa <handa@m17n.org>
parents: 53681
diff changeset
933 return byte_index;
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
934
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
935 if (EQ (string, string_char_byte_cache_string))
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
936 {
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
937 if (string_char_byte_cache_bytepos < byte_index)
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
938 {
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
939 best_below = string_char_byte_cache_charpos;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
940 best_below_byte = string_char_byte_cache_bytepos;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
941 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
942 else
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
943 {
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
944 best_above = string_char_byte_cache_charpos;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
945 best_above_byte = string_char_byte_cache_bytepos;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
946 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
947 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
948
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
949 if (byte_index - best_below_byte < best_above_byte - byte_index)
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
950 {
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
951 while (best_below_byte < byte_index)
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
952 {
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
953 int c;
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
954 FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c, string,
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
955 best_below, best_below_byte);
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
956 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
957 i = best_below;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
958 i_byte = best_below_byte;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
959 }
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
960 else
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
961 {
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
962 while (best_above_byte > byte_index)
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
963 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
964 unsigned char *pend = SDATA (string) + best_above_byte;
25501
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
965 unsigned char *pbeg = pend - best_above_byte;
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
966 unsigned char *p = pend - 1;
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
967 int bytes;
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
968
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
969 while (p > pbeg && !CHAR_HEAD_P (*p)) p--;
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
970 PARSE_MULTIBYTE_SEQ (p, pend - p, bytes);
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
971 if (bytes == pend - p)
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
972 best_above_byte -= bytes;
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
973 else if (bytes > pend - p)
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
974 best_above_byte -= (pend - p);
9392c9b7dd07 (count_combining): Use the macro PARSE_MULTIBYTE_SEQ.
Kenichi Handa <handa@m17n.org>
parents: 25495
diff changeset
975 else
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
976 best_above_byte--;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
977 best_above--;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
978 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
979 i = best_above;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
980 i_byte = best_above_byte;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
981 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
982
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
983 string_char_byte_cache_bytepos = i_byte;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
984 string_char_byte_cache_charpos = i;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
985 string_char_byte_cache_string = string;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
986
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
987 return i;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
988 }
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
989
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
990 /* Convert STRING to a multibyte string.
21029
3f47b0364c2a (DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents: 21021
diff changeset
991 Single-byte characters 0240 through 0377 are converted
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
992 by adding nonascii_insert_offset to each. */
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
993
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
994 Lisp_Object
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
995 string_make_multibyte (string)
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
996 Lisp_Object string;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
997 {
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
998 unsigned char *buf;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
999 int nbytes;
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1000 Lisp_Object ret;
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1001 USE_SAFE_ALLOCA;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1002
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1003 if (STRING_MULTIBYTE (string))
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1004 return string;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1005
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1006 nbytes = count_size_as_multibyte (SDATA (string),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1007 SCHARS (string));
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1008 /* If all the chars are ASCII, they won't need any more bytes
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1009 once converted. In that case, we can return STRING itself. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1010 if (nbytes == SBYTES (string))
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1011 return string;
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1012
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1013 SAFE_ALLOCA (buf, unsigned char *, nbytes);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1014 copy_text (SDATA (string), buf, SBYTES (string),
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1015 0, 1);
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1016
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1017 ret = make_multibyte_string (buf, SCHARS (string), nbytes);
57726
66e97a54985f Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents: 57482
diff changeset
1018 SAFE_FREE ();
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1019
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1020 return ret;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1021 }
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1022
49656
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1023
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1024 /* Convert STRING to a multibyte string without changing each
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1025 character codes. Thus, characters 0200 trough 0237 are converted
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1026 to eight-bit-control characters, and characters 0240 through 0377
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1027 are converted eight-bit-graphic characters. */
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1028
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1029 Lisp_Object
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1030 string_to_multibyte (string)
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1031 Lisp_Object string;
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1032 {
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1033 unsigned char *buf;
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1034 int nbytes;
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1035 Lisp_Object ret;
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1036 USE_SAFE_ALLOCA;
49656
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1037
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1038 if (STRING_MULTIBYTE (string))
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1039 return string;
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1040
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1041 nbytes = parse_str_to_multibyte (SDATA (string), SBYTES (string));
49815
2a19e12053a4 (string_to_multibyte): Always return a multibyte string.
Kenichi Handa <handa@m17n.org>
parents: 49798
diff changeset
1042 /* If all the chars are ASCII or eight-bit-graphic, they won't need
2a19e12053a4 (string_to_multibyte): Always return a multibyte string.
Kenichi Handa <handa@m17n.org>
parents: 49798
diff changeset
1043 any more bytes once converted. */
49656
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1044 if (nbytes == SBYTES (string))
49815
2a19e12053a4 (string_to_multibyte): Always return a multibyte string.
Kenichi Handa <handa@m17n.org>
parents: 49798
diff changeset
1045 return make_multibyte_string (SDATA (string), nbytes, nbytes);
49656
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1046
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1047 SAFE_ALLOCA (buf, unsigned char *, nbytes);
49656
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1048 bcopy (SDATA (string), buf, SBYTES (string));
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1049 str_to_multibyte (buf, nbytes, SBYTES (string));
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1050
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1051 ret = make_multibyte_string (buf, SCHARS (string), nbytes);
57726
66e97a54985f Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents: 57482
diff changeset
1052 SAFE_FREE ();
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1053
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1054 return ret;
49656
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1055 }
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1056
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1057
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1058 /* Convert STRING to a single-byte string. */
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1059
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1060 Lisp_Object
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1061 string_make_unibyte (string)
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1062 Lisp_Object string;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1063 {
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1064 int nchars;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1065 unsigned char *buf;
56147
6b858fb89033 * fns.c (string_to_multibyte): Use xmalloc/xfree instead of alloca.
Jan Djärv <jan.h.d@swipnet.se>
parents: 55481
diff changeset
1066 Lisp_Object ret;
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1067 USE_SAFE_ALLOCA;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1068
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1069 if (! STRING_MULTIBYTE (string))
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1070 return string;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1071
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1072 nchars = SCHARS (string);
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1073
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1074 SAFE_ALLOCA (buf, unsigned char *, nchars);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1075 copy_text (SDATA (string), buf, SBYTES (string),
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1076 1, 0);
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1077
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
1078 ret = make_unibyte_string (buf, nchars);
57726
66e97a54985f Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents: 57482
diff changeset
1079 SAFE_FREE ();
56147
6b858fb89033 * fns.c (string_to_multibyte): Use xmalloc/xfree instead of alloca.
Jan Djärv <jan.h.d@swipnet.se>
parents: 55481
diff changeset
1080
6b858fb89033 * fns.c (string_to_multibyte): Use xmalloc/xfree instead of alloca.
Jan Djärv <jan.h.d@swipnet.se>
parents: 55481
diff changeset
1081 return ret;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1082 }
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1083
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1084 DEFUN ("string-make-multibyte", Fstring_make_multibyte, Sstring_make_multibyte,
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1085 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1086 doc: /* Return the multibyte equivalent of STRING.
53255
3b437add35b6 (Frandom, Fstring_make_multibyte): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53189
diff changeset
1087 If STRING is unibyte and contains non-ASCII characters, the function
3b437add35b6 (Frandom, Fstring_make_multibyte): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53189
diff changeset
1088 `unibyte-char-to-multibyte' is used to convert each unibyte character
3b437add35b6 (Frandom, Fstring_make_multibyte): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53189
diff changeset
1089 to a multibyte character. In this case, the returned string is a
3b437add35b6 (Frandom, Fstring_make_multibyte): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53189
diff changeset
1090 newly created string with no text properties. If STRING is multibyte
3b437add35b6 (Frandom, Fstring_make_multibyte): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53189
diff changeset
1091 or entirely ASCII, it is returned unchanged. In particular, when
3b437add35b6 (Frandom, Fstring_make_multibyte): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53189
diff changeset
1092 STRING is unibyte and entirely ASCII, the returned string is unibyte.
3b437add35b6 (Frandom, Fstring_make_multibyte): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53189
diff changeset
1093 \(When the characters are all ASCII, Emacs primitives will treat the
3b437add35b6 (Frandom, Fstring_make_multibyte): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53189
diff changeset
1094 string the same way whether it is unibyte or multibyte.) */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1095 (string)
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1096 Lisp_Object string;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1097 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
1098 CHECK_STRING (string);
22165
8cdacecac78b (Fstring_make_multibyte): Call CHECK_STRING.
Kenichi Handa <handa@m17n.org>
parents: 22117
diff changeset
1099
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1100 return string_make_multibyte (string);
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1101 }
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1102
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1103 DEFUN ("string-make-unibyte", Fstring_make_unibyte, Sstring_make_unibyte,
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1104 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1105 doc: /* Return the unibyte equivalent of STRING.
45650
dca52f93fdc0 (Fstring_make_unibyte): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 45629
diff changeset
1106 Multibyte character codes are converted to unibyte according to
dca52f93fdc0 (Fstring_make_unibyte): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 45629
diff changeset
1107 `nonascii-translation-table' or, if that is nil, `nonascii-insert-offset'.
dca52f93fdc0 (Fstring_make_unibyte): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 45629
diff changeset
1108 If the lookup in the translation table fails, this function takes just
dca52f93fdc0 (Fstring_make_unibyte): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 45629
diff changeset
1109 the low 8 bits of each character. */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1110 (string)
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1111 Lisp_Object string;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1112 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
1113 CHECK_STRING (string);
22165
8cdacecac78b (Fstring_make_multibyte): Call CHECK_STRING.
Kenichi Handa <handa@m17n.org>
parents: 22117
diff changeset
1114
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1115 return string_make_unibyte (string);
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
1116 }
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1117
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1118 DEFUN ("string-as-unibyte", Fstring_as_unibyte, Sstring_as_unibyte,
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1119 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1120 doc: /* Return a unibyte string with the same individual bytes as STRING.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1121 If STRING is unibyte, the result is STRING itself.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1122 Otherwise it is a newly created string, with no text properties.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1123 If STRING is multibyte and contains a character of charset
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1124 `eight-bit-control' or `eight-bit-graphic', it is converted to the
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1125 corresponding single byte. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1126 (string)
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1127 Lisp_Object string;
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1128 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
1129 CHECK_STRING (string);
22165
8cdacecac78b (Fstring_make_multibyte): Call CHECK_STRING.
Kenichi Handa <handa@m17n.org>
parents: 22117
diff changeset
1130
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1131 if (STRING_MULTIBYTE (string))
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1132 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1133 int bytes = SBYTES (string);
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
1134 unsigned char *str = (unsigned char *) xmalloc (bytes);
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
1135
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1136 bcopy (SDATA (string), str, bytes);
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
1137 bytes = str_as_unibyte (str, bytes);
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
1138 string = make_unibyte_string (str, bytes);
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
1139 xfree (str);
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1140 }
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1141 return string;
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1142 }
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1143
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1144 DEFUN ("string-as-multibyte", Fstring_as_multibyte, Sstring_as_multibyte,
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1145 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1146 doc: /* Return a multibyte string with the same individual bytes as STRING.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1147 If STRING is multibyte, the result is STRING itself.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1148 Otherwise it is a newly created string, with no text properties.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1149 If STRING is unibyte and contains an individual 8-bit byte (i.e. not
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1150 part of a multibyte form), it is converted to the corresponding
61433
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1151 multibyte character of charset `eight-bit-control' or `eight-bit-graphic'.
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1152 Beware, this often doesn't really do what you think it does.
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1153 It is similar to (decode-coding-string STRING 'emacs-mule-unix).
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1154 If you're not sure, whether to use `string-as-multibyte' or
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1155 `string-to-multibyte', use `string-to-multibyte'. Beware:
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1156 (aref (string-as-multibyte "\201") 0) -> 129 (aka ?\201)
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1157 (aref (string-as-multibyte "\300") 0) -> 192 (aka ?\300)
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1158 (aref (string-as-multibyte "\300\201") 0) -> 192 (aka ?\300)
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1159 (aref (string-as-multibyte "\300\201") 1) -> 129 (aka ?\201)
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1160 but
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1161 (aref (string-as-multibyte "\201\300") 0) -> 2240
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1162 (aref (string-as-multibyte "\201\300") 1) -> <error> */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1163 (string)
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1164 Lisp_Object string;
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1165 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
1166 CHECK_STRING (string);
22165
8cdacecac78b (Fstring_make_multibyte): Call CHECK_STRING.
Kenichi Handa <handa@m17n.org>
parents: 22117
diff changeset
1167
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1168 if (! STRING_MULTIBYTE (string))
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1169 {
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
1170 Lisp_Object new_string;
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
1171 int nchars, nbytes;
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
1172
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1173 parse_str_as_multibyte (SDATA (string),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1174 SBYTES (string),
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
1175 &nchars, &nbytes);
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
1176 new_string = make_uninit_multibyte_string (nchars, nbytes);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1177 bcopy (SDATA (string), SDATA (new_string),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1178 SBYTES (string));
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1179 if (nbytes != SBYTES (string))
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1180 str_as_multibyte (SDATA (new_string), nbytes,
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1181 SBYTES (string), NULL);
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
1182 string = new_string;
46379
18cf1d2514d9 * fns.c (Fstring_as_multibyte): Use STRING_SET_INTERVALS.
Ken Raeburn <raeburn@raeburn.org>
parents: 46374
diff changeset
1183 STRING_SET_INTERVALS (string, NULL_INTERVAL);
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1184 }
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1185 return string;
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
1186 }
49656
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1187
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1188 DEFUN ("string-to-multibyte", Fstring_to_multibyte, Sstring_to_multibyte,
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1189 1, 1, 0,
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1190 doc: /* Return a multibyte string with the same individual chars as STRING.
49674
d7f7ccbc302a (Fstring_to_multibyte): Fix typo in the docstring.
Kenichi Handa <handa@m17n.org>
parents: 49656
diff changeset
1191 If STRING is multibyte, the result is STRING itself.
49656
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1192 Otherwise it is a newly created string, with no text properties.
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1193 Characters 0200 through 0237 are converted to eight-bit-control
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1194 characters of the same character code. Characters 0240 through 0377
53042
ad6fbb925d66 (Fstring_to_multibyte): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 52766
diff changeset
1195 are converted to eight-bit-graphic characters of the same character
61433
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1196 codes.
74a256d5f3ec (Fstring_as_multibyte, Fstring_to_multibyte): Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61417
diff changeset
1197 This is similar to (decode-coding-string STRING 'binary) */)
49656
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1198 (string)
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1199 Lisp_Object string;
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1200 {
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1201 CHECK_STRING (string);
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1202
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1203 return string_to_multibyte (string);
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1204 }
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
1205
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1206
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1207 DEFUN ("copy-alist", Fcopy_alist, Scopy_alist, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1208 doc: /* Return a copy of ALIST.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1209 This is an alist which represents the same mapping from objects to objects,
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1210 but does not share the alist structure with ALIST.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1211 The objects mapped (cars and cdrs of elements of the alist)
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1212 are shared, however.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1213 Elements of ALIST that are not conses are also shared. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1214 (alist)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1215 Lisp_Object alist;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1216 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1217 register Lisp_Object tem;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1218
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
1219 CHECK_LIST (alist);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1220 if (NILP (alist))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1221 return alist;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1222 alist = concat (1, &alist, Lisp_Cons, 0);
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
1223 for (tem = alist; CONSP (tem); tem = XCDR (tem))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1224 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1225 register Lisp_Object car;
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
1226 car = XCAR (tem);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1227
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1228 if (CONSP (car))
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39968
diff changeset
1229 XSETCAR (tem, Fcons (XCAR (car), XCDR (car)));
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1230 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1231 return alist;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1232 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1233
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1234 DEFUN ("substring", Fsubstring, Ssubstring, 2, 3, 0,
41006
fd83ec62a495 Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 40985
diff changeset
1235 doc: /* Return a substring of STRING, starting at index FROM and ending before TO.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1236 TO may be nil or omitted; then the substring runs to the end of STRING.
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
1237 FROM and TO start at 0. If either is negative, it counts from the end.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1238
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1239 This function allows vectors as well as strings. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1240 (string, from, to)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1241 Lisp_Object string;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1242 register Lisp_Object from, to;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1243 {
4004
71541ea16adf * fns.c (Fsubstring, concat): Pass all six arguments to
Jim Blandy <jimb@redhat.com>
parents: 3379
diff changeset
1244 Lisp_Object res;
15966
ceb8d03a04f6 (Fsubstring): Handle vectors as well as strings.
Richard M. Stallman <rms@gnu.org>
parents: 15713
diff changeset
1245 int size;
31533
3898245f639a (concat, Fsubstring, internal_equal, Fnconc): Avoid some
Gerd Moellmann <gerd@gnu.org>
parents: 30760
diff changeset
1246 int size_byte = 0;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1247 int from_char, to_char;
31533
3898245f639a (concat, Fsubstring, internal_equal, Fnconc): Avoid some
Gerd Moellmann <gerd@gnu.org>
parents: 30760
diff changeset
1248 int from_byte = 0, to_byte = 0;
4004
71541ea16adf * fns.c (Fsubstring, concat): Pass all six arguments to
Jim Blandy <jimb@redhat.com>
parents: 3379
diff changeset
1249
15966
ceb8d03a04f6 (Fsubstring): Handle vectors as well as strings.
Richard M. Stallman <rms@gnu.org>
parents: 15713
diff changeset
1250 if (! (STRINGP (string) || VECTORP (string)))
ceb8d03a04f6 (Fsubstring): Handle vectors as well as strings.
Richard M. Stallman <rms@gnu.org>
parents: 15713
diff changeset
1251 wrong_type_argument (Qarrayp, string);
ceb8d03a04f6 (Fsubstring): Handle vectors as well as strings.
Richard M. Stallman <rms@gnu.org>
parents: 15713
diff changeset
1252
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
1253 CHECK_NUMBER (from);
15966
ceb8d03a04f6 (Fsubstring): Handle vectors as well as strings.
Richard M. Stallman <rms@gnu.org>
parents: 15713
diff changeset
1254
ceb8d03a04f6 (Fsubstring): Handle vectors as well as strings.
Richard M. Stallman <rms@gnu.org>
parents: 15713
diff changeset
1255 if (STRINGP (string))
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1256 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1257 size = SCHARS (string);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1258 size_byte = SBYTES (string);
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1259 }
15966
ceb8d03a04f6 (Fsubstring): Handle vectors as well as strings.
Richard M. Stallman <rms@gnu.org>
parents: 15713
diff changeset
1260 else
ceb8d03a04f6 (Fsubstring): Handle vectors as well as strings.
Richard M. Stallman <rms@gnu.org>
parents: 15713
diff changeset
1261 size = XVECTOR (string)->size;
ceb8d03a04f6 (Fsubstring): Handle vectors as well as strings.
Richard M. Stallman <rms@gnu.org>
parents: 15713
diff changeset
1262
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1263 if (NILP (to))
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1264 {
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1265 to_char = size;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1266 to_byte = size_byte;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1267 }
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1268 else
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1269 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
1270 CHECK_NUMBER (to);
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1271
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1272 to_char = XINT (to);
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1273 if (to_char < 0)
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1274 to_char += size;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1275
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1276 if (STRINGP (string))
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1277 to_byte = string_char_to_byte (string, to_char);
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1278 }
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1279
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1280 from_char = XINT (from);
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1281 if (from_char < 0)
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1282 from_char += size;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1283 if (STRINGP (string))
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1284 from_byte = string_char_to_byte (string, from_char);
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1285
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1286 if (!(0 <= from_char && from_char <= to_char && to_char <= size))
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1287 args_out_of_range_3 (string, make_number (from_char),
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1288 make_number (to_char));
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1289
15966
ceb8d03a04f6 (Fsubstring): Handle vectors as well as strings.
Richard M. Stallman <rms@gnu.org>
parents: 15713
diff changeset
1290 if (STRINGP (string))
ceb8d03a04f6 (Fsubstring): Handle vectors as well as strings.
Richard M. Stallman <rms@gnu.org>
parents: 15713
diff changeset
1291 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1292 res = make_specified_string (SDATA (string) + from_byte,
21260
4ac9ba6e745d (substring_both, Fsubstring): Use make_specified_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
1293 to_char - from_char, to_byte - from_byte,
4ac9ba6e745d (substring_both, Fsubstring): Use make_specified_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
1294 STRING_MULTIBYTE (string));
21523
33d800bf97c3 (Fsubstring, substring_both, Fchar_table_range,
Andreas Schwab <schwab@suse.de>
parents: 21514
diff changeset
1295 copy_text_properties (make_number (from_char), make_number (to_char),
33d800bf97c3 (Fsubstring, substring_both, Fchar_table_range,
Andreas Schwab <schwab@suse.de>
parents: 21514
diff changeset
1296 string, make_number (0), res, Qnil);
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1297 }
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1298 else
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1299 res = Fvector (to_char - from_char,
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1300 XVECTOR (string)->contents + from_char);
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1301
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1302 return res;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1303 }
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1304
44159
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1305
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1306 DEFUN ("substring-no-properties", Fsubstring_no_properties, Ssubstring_no_properties, 1, 3, 0,
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1307 doc: /* Return a substring of STRING, without text properties.
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1308 It starts at index FROM and ending before TO.
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1309 TO may be nil or omitted; then the substring runs to the end of STRING.
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1310 If FROM is nil or omitted, the substring starts at the beginning of STRING.
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1311 If FROM or TO is negative, it counts from the end.
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1312
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1313 With one argument, just copy STRING without its properties. */)
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1314 (string, from, to)
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1315 Lisp_Object string;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1316 register Lisp_Object from, to;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1317 {
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1318 int size, size_byte;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1319 int from_char, to_char;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1320 int from_byte, to_byte;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1321
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1322 CHECK_STRING (string);
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1323
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1324 size = SCHARS (string);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1325 size_byte = SBYTES (string);
44159
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1326
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1327 if (NILP (from))
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1328 from_char = from_byte = 0;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1329 else
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1330 {
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1331 CHECK_NUMBER (from);
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1332 from_char = XINT (from);
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1333 if (from_char < 0)
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1334 from_char += size;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1335
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1336 from_byte = string_char_to_byte (string, from_char);
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1337 }
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1338
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1339 if (NILP (to))
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1340 {
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1341 to_char = size;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1342 to_byte = size_byte;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1343 }
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1344 else
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1345 {
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1346 CHECK_NUMBER (to);
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1347
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1348 to_char = XINT (to);
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1349 if (to_char < 0)
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1350 to_char += size;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1351
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1352 to_byte = string_char_to_byte (string, to_char);
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1353 }
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1354
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1355 if (!(0 <= from_char && from_char <= to_char && to_char <= size))
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1356 args_out_of_range_3 (string, make_number (from_char),
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1357 make_number (to_char));
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1358
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1359 return make_specified_string (SDATA (string) + from_byte,
44159
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1360 to_char - from_char, to_byte - from_byte,
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1361 STRING_MULTIBYTE (string));
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1362 }
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
1363
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1364 /* Extract a substring of STRING, giving start and end positions
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1365 both in characters and in bytes. */
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1366
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1367 Lisp_Object
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1368 substring_both (string, from, from_byte, to, to_byte)
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1369 Lisp_Object string;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1370 int from, from_byte, to, to_byte;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1371 {
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1372 Lisp_Object res;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1373 int size;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1374 int size_byte;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1375
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1376 if (! (STRINGP (string) || VECTORP (string)))
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1377 wrong_type_argument (Qarrayp, string);
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1378
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1379 if (STRINGP (string))
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1380 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1381 size = SCHARS (string);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1382 size_byte = SBYTES (string);
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1383 }
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1384 else
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1385 size = XVECTOR (string)->size;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1386
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1387 if (!(0 <= from && from <= to && to <= size))
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1388 args_out_of_range_3 (string, make_number (from), make_number (to));
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1389
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1390 if (STRINGP (string))
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1391 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1392 res = make_specified_string (SDATA (string) + from_byte,
21260
4ac9ba6e745d (substring_both, Fsubstring): Use make_specified_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
1393 to - from, to_byte - from_byte,
4ac9ba6e745d (substring_both, Fsubstring): Use make_specified_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
1394 STRING_MULTIBYTE (string));
21523
33d800bf97c3 (Fsubstring, substring_both, Fchar_table_range,
Andreas Schwab <schwab@suse.de>
parents: 21514
diff changeset
1395 copy_text_properties (make_number (from), make_number (to),
33d800bf97c3 (Fsubstring, substring_both, Fchar_table_range,
Andreas Schwab <schwab@suse.de>
parents: 21514
diff changeset
1396 string, make_number (0), res, Qnil);
15966
ceb8d03a04f6 (Fsubstring): Handle vectors as well as strings.
Richard M. Stallman <rms@gnu.org>
parents: 15713
diff changeset
1397 }
ceb8d03a04f6 (Fsubstring): Handle vectors as well as strings.
Richard M. Stallman <rms@gnu.org>
parents: 15713
diff changeset
1398 else
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1399 res = Fvector (to - from,
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
1400 XVECTOR (string)->contents + from);
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
1401
4004
71541ea16adf * fns.c (Fsubstring, concat): Pass all six arguments to
Jim Blandy <jimb@redhat.com>
parents: 3379
diff changeset
1402 return res;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1403 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1404
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1405 DEFUN ("nthcdr", Fnthcdr, Snthcdr, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1406 doc: /* Take cdr N times on LIST, returns the result. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1407 (n, list)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1408 Lisp_Object n;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1409 register Lisp_Object list;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1410 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1411 register int i, num;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
1412 CHECK_NUMBER (n);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1413 num = XINT (n);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1414 for (i = 0; i < num && !NILP (list); i++)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1415 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1416 QUIT;
26596
f908261703d3 (Fnthcdr, Fnreverse): Inline cdr.
Dave Love <fx@gnu.org>
parents: 26256
diff changeset
1417 if (! CONSP (list))
f908261703d3 (Fnthcdr, Fnreverse): Inline cdr.
Dave Love <fx@gnu.org>
parents: 26256
diff changeset
1418 wrong_type_argument (Qlistp, list);
f908261703d3 (Fnthcdr, Fnreverse): Inline cdr.
Dave Love <fx@gnu.org>
parents: 26256
diff changeset
1419 list = XCDR (list);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1420 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1421 return list;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1422 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1423
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1424 DEFUN ("nth", Fnth, Snth, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1425 doc: /* Return the Nth element of LIST.
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1426 N counts from zero. If LIST is not that long, nil is returned. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1427 (n, list)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1428 Lisp_Object n, list;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1429 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1430 return Fcar (Fnthcdr (n, list));
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1431 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1432
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1433 DEFUN ("elt", Felt, Selt, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1434 doc: /* Return element of SEQUENCE at index N. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1435 (sequence, n)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
1436 register Lisp_Object sequence, n;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1437 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
1438 CHECK_NUMBER (n);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1439 while (1)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1440 {
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
1441 if (CONSP (sequence) || NILP (sequence))
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
1442 return Fcar (Fnthcdr (n, sequence));
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
1443 else if (STRINGP (sequence) || VECTORP (sequence)
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
1444 || BOOL_VECTOR_P (sequence) || CHAR_TABLE_P (sequence))
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
1445 return Faref (sequence, n);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1446 else
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
1447 sequence = wrong_type_argument (Qsequencep, sequence);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1448 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1449 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1450
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1451 DEFUN ("member", Fmember, Smember, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1452 doc: /* Return non-nil if ELT is an element of LIST. Comparison done with `equal'.
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1453 The value is actually the tail of LIST whose car is ELT. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1454 (elt, list)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1455 register Lisp_Object elt;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1456 Lisp_Object list;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1457 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1458 register Lisp_Object tail;
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
1459 for (tail = list; !NILP (tail); tail = XCDR (tail))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1460 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1461 register Lisp_Object tem;
26596
f908261703d3 (Fnthcdr, Fnreverse): Inline cdr.
Dave Love <fx@gnu.org>
parents: 26256
diff changeset
1462 if (! CONSP (tail))
f908261703d3 (Fnthcdr, Fnreverse): Inline cdr.
Dave Love <fx@gnu.org>
parents: 26256
diff changeset
1463 wrong_type_argument (Qlistp, list);
f908261703d3 (Fnthcdr, Fnreverse): Inline cdr.
Dave Love <fx@gnu.org>
parents: 26256
diff changeset
1464 tem = XCAR (tail);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1465 if (! NILP (Fequal (elt, tem)))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1466 return tail;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1467 QUIT;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1468 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1469 return Qnil;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1470 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1471
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1472 DEFUN ("memq", Fmemq, Smemq, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1473 doc: /* Return non-nil if ELT is an element of LIST.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1474 Comparison done with EQ. The value is actually the tail of LIST
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1475 whose car is ELT. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1476 (elt, list)
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1477 Lisp_Object elt, list;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1478 {
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1479 while (1)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1480 {
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1481 if (!CONSP (list) || EQ (XCAR (list), elt))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1482 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1483
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1484 list = XCDR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1485 if (!CONSP (list) || EQ (XCAR (list), elt))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1486 break;
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1487
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1488 list = XCDR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1489 if (!CONSP (list) || EQ (XCAR (list), elt))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1490 break;
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1491
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1492 list = XCDR (list);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1493 QUIT;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1494 }
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1495
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1496 if (!CONSP (list) && !NILP (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1497 list = wrong_type_argument (Qlistp, list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1498
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1499 return list;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1500 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1501
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1502 DEFUN ("assq", Fassq, Sassq, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1503 doc: /* Return non-nil if KEY is `eq' to the car of an element of LIST.
53115
988e1d16a971 (Fassq, Fassoc, Frassq, Frassoc): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53106
diff changeset
1504 The value is actually the first element of LIST whose car is KEY.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1505 Elements of LIST that are not conses are ignored. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1506 (key, list)
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1507 Lisp_Object key, list;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1508 {
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1509 Lisp_Object result;
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1510
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1511 while (1)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1512 {
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1513 if (!CONSP (list)
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1514 || (CONSP (XCAR (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1515 && EQ (XCAR (XCAR (list)), key)))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1516 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1517
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1518 list = XCDR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1519 if (!CONSP (list)
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1520 || (CONSP (XCAR (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1521 && EQ (XCAR (XCAR (list)), key)))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1522 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1523
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1524 list = XCDR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1525 if (!CONSP (list)
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1526 || (CONSP (XCAR (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1527 && EQ (XCAR (XCAR (list)), key)))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1528 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1529
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1530 list = XCDR (list);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1531 QUIT;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1532 }
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1533
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1534 if (CONSP (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1535 result = XCAR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1536 else if (NILP (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1537 result = Qnil;
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1538 else
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1539 result = wrong_type_argument (Qlistp, list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1540
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1541 return result;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1542 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1543
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1544 /* Like Fassq but never report an error and do not allow quits.
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1545 Use only on lists known never to be circular. */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1546
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1547 Lisp_Object
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1548 assq_no_quit (key, list)
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1549 Lisp_Object key, list;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1550 {
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1551 while (CONSP (list)
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1552 && (!CONSP (XCAR (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1553 || !EQ (XCAR (XCAR (list)), key)))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1554 list = XCDR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1555
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1556 return CONSP (list) ? XCAR (list) : Qnil;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1557 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1558
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1559 DEFUN ("assoc", Fassoc, Sassoc, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1560 doc: /* Return non-nil if KEY is `equal' to the car of an element of LIST.
53115
988e1d16a971 (Fassq, Fassoc, Frassq, Frassoc): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53106
diff changeset
1561 The value is actually the first element of LIST whose car equals KEY. */)
54994
937db08d4048 (Fassoc, Feql): Fix indentation.
John Paul Wallington <jpw@pobox.com>
parents: 54987
diff changeset
1562 (key, list)
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1563 Lisp_Object key, list;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1564 {
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1565 Lisp_Object result, car;
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1566
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1567 while (1)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1568 {
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1569 if (!CONSP (list)
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1570 || (CONSP (XCAR (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1571 && (car = XCAR (XCAR (list)),
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1572 EQ (car, key) || !NILP (Fequal (car, key)))))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1573 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1574
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1575 list = XCDR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1576 if (!CONSP (list)
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1577 || (CONSP (XCAR (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1578 && (car = XCAR (XCAR (list)),
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1579 EQ (car, key) || !NILP (Fequal (car, key)))))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1580 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1581
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1582 list = XCDR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1583 if (!CONSP (list)
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1584 || (CONSP (XCAR (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1585 && (car = XCAR (XCAR (list)),
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1586 EQ (car, key) || !NILP (Fequal (car, key)))))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1587 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1588
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1589 list = XCDR (list);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1590 QUIT;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1591 }
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1592
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1593 if (CONSP (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1594 result = XCAR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1595 else if (NILP (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1596 result = Qnil;
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1597 else
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1598 result = wrong_type_argument (Qlistp, list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1599
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1600 return result;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1601 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1602
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1603 DEFUN ("rassq", Frassq, Srassq, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1604 doc: /* Return non-nil if KEY is `eq' to the cdr of an element of LIST.
53115
988e1d16a971 (Fassq, Fassoc, Frassq, Frassoc): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53106
diff changeset
1605 The value is actually the first element of LIST whose cdr is KEY. */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1606 (key, list)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1607 register Lisp_Object key;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1608 Lisp_Object list;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1609 {
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1610 Lisp_Object result;
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1611
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1612 while (1)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1613 {
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1614 if (!CONSP (list)
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1615 || (CONSP (XCAR (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1616 && EQ (XCDR (XCAR (list)), key)))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1617 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1618
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1619 list = XCDR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1620 if (!CONSP (list)
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1621 || (CONSP (XCAR (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1622 && EQ (XCDR (XCAR (list)), key)))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1623 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1624
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1625 list = XCDR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1626 if (!CONSP (list)
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1627 || (CONSP (XCAR (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1628 && EQ (XCDR (XCAR (list)), key)))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1629 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1630
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1631 list = XCDR (list);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1632 QUIT;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1633 }
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1634
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1635 if (NILP (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1636 result = Qnil;
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1637 else if (CONSP (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1638 result = XCAR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1639 else
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1640 result = wrong_type_argument (Qlistp, list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1641
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1642 return result;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1643 }
10588
2a8f29cd9e9f (Frassoc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10485
diff changeset
1644
2a8f29cd9e9f (Frassoc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10485
diff changeset
1645 DEFUN ("rassoc", Frassoc, Srassoc, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1646 doc: /* Return non-nil if KEY is `equal' to the cdr of an element of LIST.
53115
988e1d16a971 (Fassq, Fassoc, Frassq, Frassoc): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53106
diff changeset
1647 The value is actually the first element of LIST whose cdr equals KEY. */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1648 (key, list)
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1649 Lisp_Object key, list;
10588
2a8f29cd9e9f (Frassoc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10485
diff changeset
1650 {
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1651 Lisp_Object result, cdr;
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1652
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1653 while (1)
10588
2a8f29cd9e9f (Frassoc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10485
diff changeset
1654 {
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1655 if (!CONSP (list)
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1656 || (CONSP (XCAR (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1657 && (cdr = XCDR (XCAR (list)),
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1658 EQ (cdr, key) || !NILP (Fequal (cdr, key)))))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1659 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1660
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1661 list = XCDR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1662 if (!CONSP (list)
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1663 || (CONSP (XCAR (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1664 && (cdr = XCDR (XCAR (list)),
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1665 EQ (cdr, key) || !NILP (Fequal (cdr, key)))))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1666 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1667
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1668 list = XCDR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1669 if (!CONSP (list)
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1670 || (CONSP (XCAR (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1671 && (cdr = XCDR (XCAR (list)),
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1672 EQ (cdr, key) || !NILP (Fequal (cdr, key)))))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1673 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1674
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1675 list = XCDR (list);
10588
2a8f29cd9e9f (Frassoc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10485
diff changeset
1676 QUIT;
2a8f29cd9e9f (Frassoc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10485
diff changeset
1677 }
26230
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1678
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1679 if (CONSP (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1680 result = XCAR (list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1681 else if (NILP (list))
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1682 result = Qnil;
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1683 else
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1684 result = wrong_type_argument (Qlistp, list);
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1685
d44efc0b3243 (Fmemq, Fassq, Frassq, assq_no_quit, Fassoc)
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
1686 return result;
10588
2a8f29cd9e9f (Frassoc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10485
diff changeset
1687 }
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1688
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1689 DEFUN ("delq", Fdelq, Sdelq, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1690 doc: /* Delete by side effect any occurrences of ELT as a member of LIST.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1691 The modified LIST is returned. Comparison is done with `eq'.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1692 If the first member of LIST is ELT, there is no way to remove it by side effect;
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1693 therefore, write `(setq foo (delq element foo))'
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1694 to be sure of changing the value of `foo'. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1695 (elt, list)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1696 register Lisp_Object elt;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1697 Lisp_Object list;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1698 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1699 register Lisp_Object tail, prev;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1700 register Lisp_Object tem;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1701
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1702 tail = list;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1703 prev = Qnil;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1704 while (!NILP (tail))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1705 {
26596
f908261703d3 (Fnthcdr, Fnreverse): Inline cdr.
Dave Love <fx@gnu.org>
parents: 26256
diff changeset
1706 if (! CONSP (tail))
f908261703d3 (Fnthcdr, Fnreverse): Inline cdr.
Dave Love <fx@gnu.org>
parents: 26256
diff changeset
1707 wrong_type_argument (Qlistp, list);
f908261703d3 (Fnthcdr, Fnreverse): Inline cdr.
Dave Love <fx@gnu.org>
parents: 26256
diff changeset
1708 tem = XCAR (tail);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1709 if (EQ (elt, tem))
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1710 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1711 if (NILP (prev))
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
1712 list = XCDR (tail);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1713 else
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
1714 Fsetcdr (prev, XCDR (tail));
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1715 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1716 else
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1717 prev = tail;
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
1718 tail = XCDR (tail);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1719 QUIT;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1720 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1721 return list;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1722 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1723
414
4c9349866dac *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 401
diff changeset
1724 DEFUN ("delete", Fdelete, Sdelete, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1725 doc: /* Delete by side effect any occurrences of ELT as a member of SEQ.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1726 SEQ must be a list, a vector, or a string.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1727 The modified SEQ is returned. Comparison is done with `equal'.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1728 If SEQ is not a list, or the first member of SEQ is ELT, deleting it
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1729 is not a side effect; it is simply using a different sequence.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1730 Therefore, write `(setq foo (delete element foo))'
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1731 to be sure of changing the value of `foo'. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1732 (elt, seq)
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1733 Lisp_Object elt, seq;
401
24b63d6679b6 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 399
diff changeset
1734 {
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1735 if (VECTORP (seq))
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1736 {
34961
d033c08f2ac6 (Flength): Remove unused variable `tail'.
Eli Zaretskii <eliz@gnu.org>
parents: 34722
diff changeset
1737 EMACS_INT i, n;
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1738
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1739 for (i = n = 0; i < ASIZE (seq); ++i)
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1740 if (NILP (Fequal (AREF (seq, i), elt)))
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1741 ++n;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1742
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1743 if (n != ASIZE (seq))
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1744 {
36431
c10e67afd7ec (Fdelete, larger_vector): Use allocate_vector.
Gerd Moellmann <gerd@gnu.org>
parents: 36256
diff changeset
1745 struct Lisp_Vector *p = allocate_vector (n);
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1746
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1747 for (i = n = 0; i < ASIZE (seq); ++i)
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1748 if (NILP (Fequal (AREF (seq, i), elt)))
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1749 p->contents[n++] = AREF (seq, i);
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1750
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1751 XSETVECTOR (seq, p);
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1752 }
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1753 }
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1754 else if (STRINGP (seq))
401
24b63d6679b6 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 399
diff changeset
1755 {
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1756 EMACS_INT i, ibyte, nchars, nbytes, cbytes;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1757 int c;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1758
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1759 for (i = nchars = nbytes = ibyte = 0;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1760 i < SCHARS (seq);
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1761 ++i, ibyte += cbytes)
401
24b63d6679b6 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 399
diff changeset
1762 {
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1763 if (STRING_MULTIBYTE (seq))
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1764 {
46425
2e674544b19a * fns.c (concat): Use SSET.
Ken Raeburn <raeburn@raeburn.org>
parents: 46379
diff changeset
1765 c = STRING_CHAR (SDATA (seq) + ibyte,
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1766 SBYTES (seq) - ibyte);
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1767 cbytes = CHAR_BYTES (c);
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1768 }
401
24b63d6679b6 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 399
diff changeset
1769 else
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1770 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1771 c = SREF (seq, i);
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1772 cbytes = 1;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1773 }
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1774
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1775 if (!INTEGERP (elt) || c != XINT (elt))
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1776 {
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1777 ++nchars;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1778 nbytes += cbytes;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1779 }
401
24b63d6679b6 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 399
diff changeset
1780 }
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1781
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1782 if (nchars != SCHARS (seq))
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1783 {
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1784 Lisp_Object tem;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1785
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1786 tem = make_uninit_multibyte_string (nchars, nbytes);
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1787 if (!STRING_MULTIBYTE (seq))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1788 STRING_SET_UNIBYTE (tem);
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1789
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1790 for (i = nchars = nbytes = ibyte = 0;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1791 i < SCHARS (seq);
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1792 ++i, ibyte += cbytes)
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1793 {
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1794 if (STRING_MULTIBYTE (seq))
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1795 {
46425
2e674544b19a * fns.c (concat): Use SSET.
Ken Raeburn <raeburn@raeburn.org>
parents: 46379
diff changeset
1796 c = STRING_CHAR (SDATA (seq) + ibyte,
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1797 SBYTES (seq) - ibyte);
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1798 cbytes = CHAR_BYTES (c);
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1799 }
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1800 else
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1801 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1802 c = SREF (seq, i);
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1803 cbytes = 1;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1804 }
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1805
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1806 if (!INTEGERP (elt) || c != XINT (elt))
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1807 {
46425
2e674544b19a * fns.c (concat): Use SSET.
Ken Raeburn <raeburn@raeburn.org>
parents: 46379
diff changeset
1808 unsigned char *from = SDATA (seq) + ibyte;
2e674544b19a * fns.c (concat): Use SSET.
Ken Raeburn <raeburn@raeburn.org>
parents: 46379
diff changeset
1809 unsigned char *to = SDATA (tem) + nbytes;
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1810 EMACS_INT n;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1811
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1812 ++nchars;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1813 nbytes += cbytes;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1814
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1815 for (n = cbytes; n--; )
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1816 *to++ = *from++;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1817 }
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1818 }
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1819
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1820 seq = tem;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1821 }
401
24b63d6679b6 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 399
diff changeset
1822 }
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1823 else
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1824 {
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1825 Lisp_Object tail, prev;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1826
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1827 for (tail = seq, prev = Qnil; !NILP (tail); tail = XCDR (tail))
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1828 {
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1829 if (!CONSP (tail))
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1830 wrong_type_argument (Qlistp, seq);
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1831
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1832 if (!NILP (Fequal (elt, XCAR (tail))))
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1833 {
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1834 if (NILP (prev))
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1835 seq = XCDR (tail);
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1836 else
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1837 Fsetcdr (prev, XCDR (tail));
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1838 }
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1839 else
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1840 prev = tail;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1841 QUIT;
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1842 }
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1843 }
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
1844
30510
4a2abe231277 (Fdelete): Make it work on vectors and strings in addition to lists.
Gerd Moellmann <gerd@gnu.org>
parents: 30496
diff changeset
1845 return seq;
401
24b63d6679b6 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 399
diff changeset
1846 }
24b63d6679b6 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 399
diff changeset
1847
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1848 DEFUN ("nreverse", Fnreverse, Snreverse, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1849 doc: /* Reverse LIST by modifying cdr pointers.
53106
b4b8c928aba2 (Freverse): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53090
diff changeset
1850 Return the reversed list. */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1851 (list)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1852 Lisp_Object list;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1853 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1854 register Lisp_Object prev, tail, next;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1855
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1856 if (NILP (list)) return list;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1857 prev = Qnil;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1858 tail = list;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1859 while (!NILP (tail))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1860 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1861 QUIT;
26596
f908261703d3 (Fnthcdr, Fnreverse): Inline cdr.
Dave Love <fx@gnu.org>
parents: 26256
diff changeset
1862 if (! CONSP (tail))
f908261703d3 (Fnthcdr, Fnreverse): Inline cdr.
Dave Love <fx@gnu.org>
parents: 26256
diff changeset
1863 wrong_type_argument (Qlistp, list);
f908261703d3 (Fnthcdr, Fnreverse): Inline cdr.
Dave Love <fx@gnu.org>
parents: 26256
diff changeset
1864 next = XCDR (tail);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1865 Fsetcdr (tail, prev);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1866 prev = tail;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1867 tail = next;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1868 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1869 return prev;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1870 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1871
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1872 DEFUN ("reverse", Freverse, Sreverse, 1, 1, 0,
53106
b4b8c928aba2 (Freverse): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53090
diff changeset
1873 doc: /* Reverse LIST, copying. Return the reversed list.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1874 See also the function `nreverse', which is used more often. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1875 (list)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1876 Lisp_Object list;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1877 {
18421
618cc7b75c06 (Freverse): Simplify.
Richard M. Stallman <rms@gnu.org>
parents: 18311
diff changeset
1878 Lisp_Object new;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1879
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
1880 for (new = Qnil; CONSP (list); list = XCDR (list))
49204
0feef1a06875 (Freverse): Use QUIT.
Dave Love <fx@gnu.org>
parents: 49081
diff changeset
1881 {
0feef1a06875 (Freverse): Use QUIT.
Dave Love <fx@gnu.org>
parents: 49081
diff changeset
1882 QUIT;
0feef1a06875 (Freverse): Use QUIT.
Dave Love <fx@gnu.org>
parents: 49081
diff changeset
1883 new = Fcons (XCAR (list), new);
0feef1a06875 (Freverse): Use QUIT.
Dave Love <fx@gnu.org>
parents: 49081
diff changeset
1884 }
18421
618cc7b75c06 (Freverse): Simplify.
Richard M. Stallman <rms@gnu.org>
parents: 18311
diff changeset
1885 if (!NILP (list))
618cc7b75c06 (Freverse): Simplify.
Richard M. Stallman <rms@gnu.org>
parents: 18311
diff changeset
1886 wrong_type_argument (Qconsp, list);
618cc7b75c06 (Freverse): Simplify.
Richard M. Stallman <rms@gnu.org>
parents: 18311
diff changeset
1887 return new;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1888 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1889
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1890 Lisp_Object merge ();
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1891
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1892 DEFUN ("sort", Fsort, Ssort, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1893 doc: /* Sort LIST, stably, comparing elements using PREDICATE.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1894 Returns the sorted list. LIST is modified by side effects.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1895 PREDICATE is called with two elements of LIST, and should return t
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1896 if the first element is "less" than the second. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1897 (list, predicate)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
1898 Lisp_Object list, predicate;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1899 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1900 Lisp_Object front, back;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1901 register Lisp_Object len, tem;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1902 struct gcpro gcpro1, gcpro2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1903 register int length;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1904
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1905 front = list;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1906 len = Flength (list);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1907 length = XINT (len);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1908 if (length < 2)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1909 return list;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1910
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1911 XSETINT (len, (length / 2) - 1);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1912 tem = Fnthcdr (len, list);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1913 back = Fcdr (tem);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1914 Fsetcdr (tem, Qnil);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1915
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1916 GCPRO2 (front, back);
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
1917 front = Fsort (front, predicate);
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
1918 back = Fsort (back, predicate);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1919 UNGCPRO;
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
1920 return merge (front, back, predicate);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1921 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1922
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1923 Lisp_Object
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1924 merge (org_l1, org_l2, pred)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1925 Lisp_Object org_l1, org_l2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1926 Lisp_Object pred;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1927 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1928 Lisp_Object value;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1929 register Lisp_Object tail;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1930 Lisp_Object tem;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1931 register Lisp_Object l1, l2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1932 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1933
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1934 l1 = org_l1;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1935 l2 = org_l2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1936 tail = Qnil;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1937 value = Qnil;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1938
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1939 /* It is sufficient to protect org_l1 and org_l2.
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1940 When l1 and l2 are updated, we copy the new values
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1941 back into the org_ vars. */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1942 GCPRO4 (org_l1, org_l2, pred, value);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1943
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1944 while (1)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1945 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1946 if (NILP (l1))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1947 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1948 UNGCPRO;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1949 if (NILP (tail))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1950 return l2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1951 Fsetcdr (tail, l2);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1952 return value;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1953 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1954 if (NILP (l2))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1955 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1956 UNGCPRO;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1957 if (NILP (tail))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1958 return l1;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1959 Fsetcdr (tail, l1);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1960 return value;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1961 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1962 tem = call2 (pred, Fcar (l2), Fcar (l1));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1963 if (NILP (tem))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1964 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1965 tem = l1;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1966 l1 = Fcdr (l1);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1967 org_l1 = l1;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1968 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1969 else
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1970 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1971 tem = l2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1972 l2 = Fcdr (l2);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1973 org_l2 = l2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1974 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
1975 if (NILP (tail))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1976 value = tem;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1977 else
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1978 Fsetcdr (tail, tem);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1979 tail = tem;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1980 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1981 }
37279
c706f3e5efe0 (Fplist_get, Fplist_put): Add QUITs.
Gerd Moellmann <gerd@gnu.org>
parents: 37208
diff changeset
1982
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1983
61723
afe4f19c3436 (Fplist_get): Replace by Fsafe_plist_get.
Kim F. Storm <storm@cua.dk>
parents: 61687
diff changeset
1984 #if 0 /* Unsafe version. */
11130
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
1985 DEFUN ("plist-get", Fplist_get, Splist_get, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1986 doc: /* Extract a value from a property list.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1987 PLIST is a property list, which is a list of the form
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1988 \(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
1989 corresponding to the given PROP, or nil if PROP is not
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1990 one of the properties on the list. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
1991 (plist, prop)
14051
7f7e97f219ce (Fplist_get): Rename arg `val' to `plist' as in doc.
Erik Naggum <erik@naggum.no>
parents: 13862
diff changeset
1992 Lisp_Object plist;
37279
c706f3e5efe0 (Fplist_get, Fplist_put): Add QUITs.
Gerd Moellmann <gerd@gnu.org>
parents: 37208
diff changeset
1993 Lisp_Object prop;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1994 {
37279
c706f3e5efe0 (Fplist_get, Fplist_put): Add QUITs.
Gerd Moellmann <gerd@gnu.org>
parents: 37208
diff changeset
1995 Lisp_Object tail;
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
1996
37279
c706f3e5efe0 (Fplist_get, Fplist_put): Add QUITs.
Gerd Moellmann <gerd@gnu.org>
parents: 37208
diff changeset
1997 for (tail = plist;
c706f3e5efe0 (Fplist_get, Fplist_put): Add QUITs.
Gerd Moellmann <gerd@gnu.org>
parents: 37208
diff changeset
1998 CONSP (tail) && CONSP (XCDR (tail));
c706f3e5efe0 (Fplist_get, Fplist_put): Add QUITs.
Gerd Moellmann <gerd@gnu.org>
parents: 37208
diff changeset
1999 tail = XCDR (XCDR (tail)))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2000 {
37279
c706f3e5efe0 (Fplist_get, Fplist_put): Add QUITs.
Gerd Moellmann <gerd@gnu.org>
parents: 37208
diff changeset
2001 if (EQ (prop, XCAR (tail)))
c706f3e5efe0 (Fplist_get, Fplist_put): Add QUITs.
Gerd Moellmann <gerd@gnu.org>
parents: 37208
diff changeset
2002 return XCAR (XCDR (tail));
37317
36d04528f2aa (Fplist_get): Don't QUIT is interrupt_input_blocked.
Gerd Moellmann <gerd@gnu.org>
parents: 37309
diff changeset
2003
36d04528f2aa (Fplist_get): Don't QUIT is interrupt_input_blocked.
Gerd Moellmann <gerd@gnu.org>
parents: 37309
diff changeset
2004 /* This function can be called asynchronously
36d04528f2aa (Fplist_get): Don't QUIT is interrupt_input_blocked.
Gerd Moellmann <gerd@gnu.org>
parents: 37309
diff changeset
2005 (setup_coding_system). Don't QUIT in that case. */
36d04528f2aa (Fplist_get): Don't QUIT is interrupt_input_blocked.
Gerd Moellmann <gerd@gnu.org>
parents: 37309
diff changeset
2006 if (!interrupt_input_blocked)
36d04528f2aa (Fplist_get): Don't QUIT is interrupt_input_blocked.
Gerd Moellmann <gerd@gnu.org>
parents: 37309
diff changeset
2007 QUIT;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2008 }
37279
c706f3e5efe0 (Fplist_get, Fplist_put): Add QUITs.
Gerd Moellmann <gerd@gnu.org>
parents: 37208
diff changeset
2009
c706f3e5efe0 (Fplist_get, Fplist_put): Add QUITs.
Gerd Moellmann <gerd@gnu.org>
parents: 37208
diff changeset
2010 if (!NILP (tail))
c706f3e5efe0 (Fplist_get, Fplist_put): Add QUITs.
Gerd Moellmann <gerd@gnu.org>
parents: 37208
diff changeset
2011 wrong_type_argument (Qlistp, prop);
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
2012
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2013 return Qnil;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2014 }
61723
afe4f19c3436 (Fplist_get): Replace by Fsafe_plist_get.
Kim F. Storm <storm@cua.dk>
parents: 61687
diff changeset
2015 #endif
afe4f19c3436 (Fplist_get): Replace by Fsafe_plist_get.
Kim F. Storm <storm@cua.dk>
parents: 61687
diff changeset
2016
afe4f19c3436 (Fplist_get): Replace by Fsafe_plist_get.
Kim F. Storm <storm@cua.dk>
parents: 61687
diff changeset
2017 /* This does not check for quits. That is safe since it must terminate. */
afe4f19c3436 (Fplist_get): Replace by Fsafe_plist_get.
Kim F. Storm <storm@cua.dk>
parents: 61687
diff changeset
2018
afe4f19c3436 (Fplist_get): Replace by Fsafe_plist_get.
Kim F. Storm <storm@cua.dk>
parents: 61687
diff changeset
2019 DEFUN ("plist-get", Fplist_get, Splist_get, 2, 2, 0,
58239
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2020 doc: /* Extract a value from a property list.
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2021 PLIST is a property list, which is a list of the form
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2022 \(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value
61723
afe4f19c3436 (Fplist_get): Replace by Fsafe_plist_get.
Kim F. Storm <storm@cua.dk>
parents: 61687
diff changeset
2023 corresponding to the given PROP, or nil if PROP is not one of the
afe4f19c3436 (Fplist_get): Replace by Fsafe_plist_get.
Kim F. Storm <storm@cua.dk>
parents: 61687
diff changeset
2024 properties on the list. This function never signals an error. */)
58239
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2025 (plist, prop)
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2026 Lisp_Object plist;
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2027 Lisp_Object prop;
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2028 {
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2029 Lisp_Object tail, halftail;
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2030
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2031 /* halftail is used to detect circular lists. */
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2032 tail = halftail = plist;
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2033 while (CONSP (tail) && CONSP (XCDR (tail)))
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2034 {
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2035 if (EQ (prop, XCAR (tail)))
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2036 return XCAR (XCDR (tail));
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2037
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2038 tail = XCDR (XCDR (tail));
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2039 halftail = XCDR (halftail);
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2040 if (EQ (tail, halftail))
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2041 break;
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2042 }
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2043
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2044 return Qnil;
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2045 }
6c9552cf734a (Fsafe_plist_get): New defun.
Kim F. Storm <storm@cua.dk>
parents: 57988
diff changeset
2046
11130
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2047 DEFUN ("get", Fget, Sget, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2048 doc: /* Return the value of SYMBOL's PROPNAME property.
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2049 This is the last value stored with `(put SYMBOL PROPNAME VALUE)'. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2050 (symbol, propname)
11138
8eed13a00d2b (Fget, Fput): Fetch and store symbol's plist directly.
Richard M. Stallman <rms@gnu.org>
parents: 11130
diff changeset
2051 Lisp_Object symbol, propname;
11130
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2052 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2053 CHECK_SYMBOL (symbol);
11138
8eed13a00d2b (Fget, Fput): Fetch and store symbol's plist directly.
Richard M. Stallman <rms@gnu.org>
parents: 11130
diff changeset
2054 return Fplist_get (XSYMBOL (symbol)->plist, propname);
11130
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2055 }
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2056
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2057 DEFUN ("plist-put", Fplist_put, Splist_put, 3, 3, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2058 doc: /* Change value in PLIST of PROP to VAL.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2059 PLIST is a property list, which is a list of the form
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2060 \(PROP1 VALUE1 PROP2 VALUE2 ...). PROP is a symbol and VAL is any object.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2061 If PROP is already a property on the list, its value is set to VAL,
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2062 otherwise the new PROP VAL pair is added. The new plist is returned;
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2063 use `(setq x (plist-put x prop val))' to be sure to use the new value.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2064 The PLIST is modified by side effects. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2065 (plist, prop, val)
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
2066 Lisp_Object plist;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
2067 register Lisp_Object prop;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
2068 Lisp_Object val;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2069 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2070 register Lisp_Object tail, prev;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2071 Lisp_Object newcell;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2072 prev = Qnil;
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
2073 for (tail = plist; CONSP (tail) && CONSP (XCDR (tail));
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
2074 tail = XCDR (XCDR (tail)))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2075 {
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
2076 if (EQ (prop, XCAR (tail)))
11130
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2077 {
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
2078 Fsetcar (XCDR (tail), val);
11130
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2079 return plist;
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2080 }
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
2081
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2082 prev = tail;
37279
c706f3e5efe0 (Fplist_get, Fplist_put): Add QUITs.
Gerd Moellmann <gerd@gnu.org>
parents: 37208
diff changeset
2083 QUIT;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2084 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2085 newcell = Fcons (prop, Fcons (val, Qnil));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
2086 if (NILP (prev))
11130
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2087 return newcell;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2088 else
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
2089 Fsetcdr (XCDR (prev), newcell);
11130
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2090 return plist;
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2091 }
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2092
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2093 DEFUN ("put", Fput, Sput, 3, 3, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2094 doc: /* Store SYMBOL's PROPNAME property with value VALUE.
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2095 It can be retrieved with `(get SYMBOL PROPNAME)'. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2096 (symbol, propname, value)
11138
8eed13a00d2b (Fget, Fput): Fetch and store symbol's plist directly.
Richard M. Stallman <rms@gnu.org>
parents: 11130
diff changeset
2097 Lisp_Object symbol, propname, value;
11130
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
2098 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2099 CHECK_SYMBOL (symbol);
11138
8eed13a00d2b (Fget, Fput): Fetch and store symbol's plist directly.
Richard M. Stallman <rms@gnu.org>
parents: 11130
diff changeset
2100 XSYMBOL (symbol)->plist
8eed13a00d2b (Fget, Fput): Fetch and store symbol's plist directly.
Richard M. Stallman <rms@gnu.org>
parents: 11130
diff changeset
2101 = Fplist_put (XSYMBOL (symbol)->plist, propname, value);
8eed13a00d2b (Fget, Fput): Fetch and store symbol's plist directly.
Richard M. Stallman <rms@gnu.org>
parents: 11130
diff changeset
2102 return value;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2103 }
44159
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2104
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2105 DEFUN ("lax-plist-get", Flax_plist_get, Slax_plist_get, 2, 2, 0,
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2106 doc: /* Extract a value from a property list, comparing with `equal'.
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2107 PLIST is a property list, which is a list of the form
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2108 \(PROP1 VALUE1 PROP2 VALUE2...). This function returns the value
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2109 corresponding to the given PROP, or nil if PROP is not
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2110 one of the properties on the list. */)
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2111 (plist, prop)
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2112 Lisp_Object plist;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2113 Lisp_Object prop;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2114 {
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2115 Lisp_Object tail;
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
2116
44159
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2117 for (tail = plist;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2118 CONSP (tail) && CONSP (XCDR (tail));
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2119 tail = XCDR (XCDR (tail)))
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2120 {
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2121 if (! NILP (Fequal (prop, XCAR (tail))))
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2122 return XCAR (XCDR (tail));
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2123
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2124 QUIT;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2125 }
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2126
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2127 if (!NILP (tail))
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2128 wrong_type_argument (Qlistp, prop);
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
2129
44159
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2130 return Qnil;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2131 }
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2132
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2133 DEFUN ("lax-plist-put", Flax_plist_put, Slax_plist_put, 3, 3, 0,
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2134 doc: /* Change value in PLIST of PROP to VAL, comparing with `equal'.
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2135 PLIST is a property list, which is a list of the form
44219
dfaa607f640f (Flax_plist_put): Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 44159
diff changeset
2136 \(PROP1 VALUE1 PROP2 VALUE2 ...). PROP and VAL are any objects.
44159
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2137 If PROP is already a property on the list, its value is set to VAL,
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2138 otherwise the new PROP VAL pair is added. The new plist is returned;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2139 use `(setq x (lax-plist-put x prop val))' to be sure to use the new value.
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2140 The PLIST is modified by side effects. */)
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2141 (plist, prop, val)
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2142 Lisp_Object plist;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2143 register Lisp_Object prop;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2144 Lisp_Object val;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2145 {
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2146 register Lisp_Object tail, prev;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2147 Lisp_Object newcell;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2148 prev = Qnil;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2149 for (tail = plist; CONSP (tail) && CONSP (XCDR (tail));
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2150 tail = XCDR (XCDR (tail)))
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2151 {
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2152 if (! NILP (Fequal (prop, XCAR (tail))))
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2153 {
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2154 Fsetcar (XCDR (tail), val);
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2155 return plist;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2156 }
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
2157
44159
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2158 prev = tail;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2159 QUIT;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2160 }
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2161 newcell = Fcons (prop, Fcons (val, Qnil));
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2162 if (NILP (prev))
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2163 return newcell;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2164 else
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2165 Fsetcdr (XCDR (prev), newcell);
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2166 return plist;
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2167 }
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
2168
54987
1b818fd4a373 (Feql): New function.
John Paul Wallington <jpw@pobox.com>
parents: 54373
diff changeset
2169 DEFUN ("eql", Feql, Seql, 2, 2, 0,
1b818fd4a373 (Feql): New function.
John Paul Wallington <jpw@pobox.com>
parents: 54373
diff changeset
2170 doc: /* Return t if the two args are the same Lisp object.
1b818fd4a373 (Feql): New function.
John Paul Wallington <jpw@pobox.com>
parents: 54373
diff changeset
2171 Floating-point numbers of equal value are `eql', but they may not be `eq'. */)
54994
937db08d4048 (Fassoc, Feql): Fix indentation.
John Paul Wallington <jpw@pobox.com>
parents: 54987
diff changeset
2172 (obj1, obj2)
54987
1b818fd4a373 (Feql): New function.
John Paul Wallington <jpw@pobox.com>
parents: 54373
diff changeset
2173 Lisp_Object obj1, obj2;
1b818fd4a373 (Feql): New function.
John Paul Wallington <jpw@pobox.com>
parents: 54373
diff changeset
2174 {
1b818fd4a373 (Feql): New function.
John Paul Wallington <jpw@pobox.com>
parents: 54373
diff changeset
2175 if (FLOATP (obj1))
1b818fd4a373 (Feql): New function.
John Paul Wallington <jpw@pobox.com>
parents: 54373
diff changeset
2176 return internal_equal (obj1, obj2, 0, 0) ? Qt : Qnil;
1b818fd4a373 (Feql): New function.
John Paul Wallington <jpw@pobox.com>
parents: 54373
diff changeset
2177 else
1b818fd4a373 (Feql): New function.
John Paul Wallington <jpw@pobox.com>
parents: 54373
diff changeset
2178 return EQ (obj1, obj2) ? Qt : Qnil;
1b818fd4a373 (Feql): New function.
John Paul Wallington <jpw@pobox.com>
parents: 54373
diff changeset
2179 }
1b818fd4a373 (Feql): New function.
John Paul Wallington <jpw@pobox.com>
parents: 54373
diff changeset
2180
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2181 DEFUN ("equal", Fequal, Sequal, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2182 doc: /* Return t if two Lisp objects have similar structure and contents.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2183 They must have the same data type.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2184 Conses are compared by comparing the cars and the cdrs.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2185 Vectors and strings are compared element by element.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2186 Numbers are compared by value, but integers cannot equal floats.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2187 (Use `=' if you want integers and floats to be able to be equal.)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2188 Symbols must match exactly. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2189 (o1, o2)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2190 register Lisp_Object o1, o2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2191 {
54373
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2192 return internal_equal (o1, o2, 0, 0) ? Qt : Qnil;
399
21aa17a1560d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 350
diff changeset
2193 }
21aa17a1560d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 350
diff changeset
2194
54373
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2195 DEFUN ("equal-including-properties", Fequal_including_properties, Sequal_including_properties, 2, 2, 0,
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2196 doc: /* Return t if two Lisp objects have similar structure and contents.
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2197 This is like `equal' except that it compares the text properties
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2198 of strings. (`equal' ignores text properties.) */)
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2199 (o1, o2)
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2200 register Lisp_Object o1, o2;
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2201 {
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2202 return internal_equal (o1, o2, 0, 1) ? Qt : Qnil;
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2203 }
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2204
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2205 /* DEPTH is current depth of recursion. Signal an error if it
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2206 gets too deep.
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2207 PROPS, if non-nil, means compare string text properties too. */
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2208
9927
05aa745fc829 (internal_equal): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents: 9439
diff changeset
2209 static int
54373
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2210 internal_equal (o1, o2, depth, props)
399
21aa17a1560d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 350
diff changeset
2211 register Lisp_Object o1, o2;
54373
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2212 int depth, props;
399
21aa17a1560d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 350
diff changeset
2213 {
21aa17a1560d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 350
diff changeset
2214 if (depth > 200)
21aa17a1560d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 350
diff changeset
2215 error ("Stack overflow in equal");
10405
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2216
9927
05aa745fc829 (internal_equal): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents: 9439
diff changeset
2217 tail_recurse:
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2218 QUIT;
10405
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2219 if (EQ (o1, o2))
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2220 return 1;
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2221 if (XTYPE (o1) != XTYPE (o2))
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2222 return 0;
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2223
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2224 switch (XTYPE (o1))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2225 {
10405
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2226 case Lisp_Float:
53393
6658b72a5f99 (internal_equal): Return t for two NaN arguments.
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53259
diff changeset
2227 {
6658b72a5f99 (internal_equal): Return t for two NaN arguments.
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53259
diff changeset
2228 double d1, d2;
6658b72a5f99 (internal_equal): Return t for two NaN arguments.
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53259
diff changeset
2229
6658b72a5f99 (internal_equal): Return t for two NaN arguments.
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53259
diff changeset
2230 d1 = extract_float (o1);
6658b72a5f99 (internal_equal): Return t for two NaN arguments.
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53259
diff changeset
2231 d2 = extract_float (o2);
6658b72a5f99 (internal_equal): Return t for two NaN arguments.
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53259
diff changeset
2232 /* If d is a NaN, then d != d. Two NaNs should be `equal' even
6658b72a5f99 (internal_equal): Return t for two NaN arguments.
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53259
diff changeset
2233 though they are not =. */
6658b72a5f99 (internal_equal): Return t for two NaN arguments.
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53259
diff changeset
2234 return d1 == d2 || (d1 != d1 && d2 != d2);
6658b72a5f99 (internal_equal): Return t for two NaN arguments.
Eli Zaretskii <eliz@is.elta.co.il>
parents: 53259
diff changeset
2235 }
10405
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2236
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2237 case Lisp_Cons:
54373
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2238 if (!internal_equal (XCAR (o1), XCAR (o2), depth + 1, props))
10411
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2239 return 0;
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
2240 o1 = XCDR (o1);
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
2241 o2 = XCDR (o2);
10411
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2242 goto tail_recurse;
10405
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2243
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2244 case Lisp_Misc:
11240
2642924d2d21 (internal_equal): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
2245 if (XMISCTYPE (o1) != XMISCTYPE (o2))
9927
05aa745fc829 (internal_equal): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents: 9439
diff changeset
2246 return 0;
10405
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2247 if (OVERLAYP (o1))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2248 {
25149
ee483f870bde (internal_equal): Fix overlay comparison.
Richard M. Stallman <rms@gnu.org>
parents: 25094
diff changeset
2249 if (!internal_equal (OVERLAY_START (o1), OVERLAY_START (o2),
54373
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2250 depth + 1, props)
25149
ee483f870bde (internal_equal): Fix overlay comparison.
Richard M. Stallman <rms@gnu.org>
parents: 25094
diff changeset
2251 || !internal_equal (OVERLAY_END (o1), OVERLAY_END (o2),
10405
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2252 depth + 1))
9927
05aa745fc829 (internal_equal): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents: 9439
diff changeset
2253 return 0;
10405
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2254 o1 = XOVERLAY (o1)->plist;
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2255 o2 = XOVERLAY (o2)->plist;
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2256 goto tail_recurse;
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2257 }
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2258 if (MARKERP (o1))
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2259 {
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2260 return (XMARKER (o1)->buffer == XMARKER (o2)->buffer
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2261 && (XMARKER (o1)->buffer == 0
20567
d56b7d5c18e8 (internal_equal): For markers, use bytepos instead of bufpos.
Richard M. Stallman <rms@gnu.org>
parents: 20314
diff changeset
2262 || XMARKER (o1)->bytepos == XMARKER (o2)->bytepos));
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2263 }
10405
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2264 break;
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2265
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2266 case Lisp_Vectorlike:
10411
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2267 {
53159
e929f6d1593b (internal_equal) <case Lisp_Vectorlike>: Declare size as
Andreas Schwab <schwab@suse.de>
parents: 53138
diff changeset
2268 register int i;
e929f6d1593b (internal_equal) <case Lisp_Vectorlike>: Declare size as
Andreas Schwab <schwab@suse.de>
parents: 53138
diff changeset
2269 EMACS_INT size = XVECTOR (o1)->size;
10411
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2270 /* Pseudovectors have the type encoded in the size field, so this test
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2271 actually checks that the objects have the same type as well as the
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2272 same size. */
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2273 if (XVECTOR (o2)->size != size)
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2274 return 0;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2275 /* Boolvectors are compared much like strings. */
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2276 if (BOOL_VECTOR_P (o1))
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2277 {
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2278 int size_in_chars
55161
beac72c0215f (Fcopy_sequence, concat, internal_equal, Ffillarray, mapcar1): Use
Andreas Schwab <schwab@suse.de>
parents: 54994
diff changeset
2279 = ((XBOOL_VECTOR (o1)->size + BOOL_VECTOR_BITS_PER_CHAR - 1)
beac72c0215f (Fcopy_sequence, concat, internal_equal, Ffillarray, mapcar1): Use
Andreas Schwab <schwab@suse.de>
parents: 54994
diff changeset
2280 / BOOL_VECTOR_BITS_PER_CHAR);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2281
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2282 if (XBOOL_VECTOR (o1)->size != XBOOL_VECTOR (o2)->size)
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2283 return 0;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2284 if (bcmp (XBOOL_VECTOR (o1)->data, XBOOL_VECTOR (o2)->data,
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2285 size_in_chars))
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2286 return 0;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2287 return 1;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2288 }
20776
219fdecc30d3 (internal_equal): Use compare_window_configurations.
Richard M. Stallman <rms@gnu.org>
parents: 20712
diff changeset
2289 if (WINDOW_CONFIGURATIONP (o1))
21021
7be2384fabdc (internal_equal): compare_window_configurations takes new arg.
Richard M. Stallman <rms@gnu.org>
parents: 20992
diff changeset
2290 return compare_window_configurations (o1, o2, 0);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2291
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2292 /* Aside from them, only true vectors, char-tables, and compiled
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2293 functions are sensible to compare, so eliminate the others now. */
10411
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2294 if (size & PSEUDOVECTOR_FLAG)
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2295 {
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2296 if (!(size & (PVEC_COMPILED | PVEC_CHAR_TABLE)))
10411
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2297 return 0;
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2298 size &= PSEUDOVECTOR_SIZE_MASK;
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2299 }
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2300 for (i = 0; i < size; i++)
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2301 {
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2302 Lisp_Object v1, v2;
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2303 v1 = XVECTOR (o1)->contents [i];
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2304 v2 = XVECTOR (o2)->contents [i];
54373
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2305 if (!internal_equal (v1, v2, depth + 1, props))
10411
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2306 return 0;
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2307 }
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2308 return 1;
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2309 }
10405
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2310 break;
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2311
609f34c0c7bc (internal_equal): Once again use a switch.
Richard M. Stallman <rms@gnu.org>
parents: 10289
diff changeset
2312 case Lisp_String:
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2313 if (SCHARS (o1) != SCHARS (o2))
10411
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2314 return 0;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2315 if (SBYTES (o1) != SBYTES (o2))
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
2316 return 0;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2317 if (bcmp (SDATA (o1), SDATA (o2),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2318 SBYTES (o1)))
10411
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2319 return 0;
54373
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2320 if (props && !compare_string_intervals (o1, o2))
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
2321 return 0;
10411
b3c03881e6f6 (internal_equal): Delete redundant tests.
Karl Heuer <kwzh@gnu.org>
parents: 10405
diff changeset
2322 return 1;
31533
3898245f639a (concat, Fsubstring, internal_equal, Fnconc): Avoid some
Gerd Moellmann <gerd@gnu.org>
parents: 30760
diff changeset
2323
3898245f639a (concat, Fsubstring, internal_equal, Fnconc): Avoid some
Gerd Moellmann <gerd@gnu.org>
parents: 30760
diff changeset
2324 case Lisp_Int:
3898245f639a (concat, Fsubstring, internal_equal, Fnconc): Avoid some
Gerd Moellmann <gerd@gnu.org>
parents: 30760
diff changeset
2325 case Lisp_Symbol:
3898245f639a (concat, Fsubstring, internal_equal, Fnconc): Avoid some
Gerd Moellmann <gerd@gnu.org>
parents: 30760
diff changeset
2326 case Lisp_Type_Limit:
3898245f639a (concat, Fsubstring, internal_equal, Fnconc): Avoid some
Gerd Moellmann <gerd@gnu.org>
parents: 30760
diff changeset
2327 break;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2328 }
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
2329
9927
05aa745fc829 (internal_equal): Use new overlay substructure.
Karl Heuer <kwzh@gnu.org>
parents: 9439
diff changeset
2330 return 0;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2331 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2332
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18531
diff changeset
2333 extern Lisp_Object Fmake_char_internal ();
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18531
diff changeset
2334
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2335 DEFUN ("fillarray", Ffillarray, Sfillarray, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2336 doc: /* Store each element of ARRAY with ITEM.
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2337 ARRAY is a vector, string, char-table, or bool-vector. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2338 (array, item)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2339 Lisp_Object array, item;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2340 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2341 register int size, index, charval;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2342 retry:
9128
04a702d7f662 (Frandom, Flength, Fstring_equal, Fstring_lessp, Fcopy_sequence, concat, Felt,
Karl Heuer <kwzh@gnu.org>
parents: 8966
diff changeset
2343 if (VECTORP (array))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2344 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2345 register Lisp_Object *p = XVECTOR (array)->contents;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2346 size = XVECTOR (array)->size;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2347 for (index = 0; index < size; index++)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2348 p[index] = item;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2349 }
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2350 else if (CHAR_TABLE_P (array))
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2351 {
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2352 register Lisp_Object *p = XCHAR_TABLE (array)->contents;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2353 size = CHAR_TABLE_ORDINARY_SLOTS;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2354 for (index = 0; index < size; index++)
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2355 p[index] = item;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2356 XCHAR_TABLE (array)->defalt = Qnil;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2357 }
9128
04a702d7f662 (Frandom, Flength, Fstring_equal, Fstring_lessp, Fcopy_sequence, concat, Felt,
Karl Heuer <kwzh@gnu.org>
parents: 8966
diff changeset
2358 else if (STRINGP (array))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2359 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2360 register unsigned char *p = SDATA (array);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2361 CHECK_NUMBER (item);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2362 charval = XINT (item);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2363 size = SCHARS (array);
23424
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
2364 if (STRING_MULTIBYTE (array))
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
2365 {
26856
c629af522c09 (Flength): The length of char-table is MAX_CHAR.
Kenichi Handa <handa@m17n.org>
parents: 26596
diff changeset
2366 unsigned char str[MAX_MULTIBYTE_LENGTH];
c629af522c09 (Flength): The length of char-table is MAX_CHAR.
Kenichi Handa <handa@m17n.org>
parents: 26596
diff changeset
2367 int len = CHAR_STRING (charval, str);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2368 int size_byte = SBYTES (array);
23424
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
2369 unsigned char *p1 = p, *endp = p + size_byte;
23453
fa66133ad026 (Ffillarray): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23424
diff changeset
2370 int i;
fa66133ad026 (Ffillarray): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23424
diff changeset
2371
fa66133ad026 (Ffillarray): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23424
diff changeset
2372 if (size != size_byte)
fa66133ad026 (Ffillarray): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23424
diff changeset
2373 while (p1 < endp)
fa66133ad026 (Ffillarray): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23424
diff changeset
2374 {
fa66133ad026 (Ffillarray): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23424
diff changeset
2375 int this_len = MULTIBYTE_FORM_LENGTH (p1, endp - p1);
fa66133ad026 (Ffillarray): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23424
diff changeset
2376 if (len != this_len)
fa66133ad026 (Ffillarray): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23424
diff changeset
2377 error ("Attempt to change byte length of a string");
fa66133ad026 (Ffillarray): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23424
diff changeset
2378 p1 += this_len;
fa66133ad026 (Ffillarray): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 23424
diff changeset
2379 }
23424
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
2380 for (i = 0; i < size_byte; i++)
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
2381 *p++ = str[i % len];
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
2382 }
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
2383 else
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
2384 for (index = 0; index < size; index++)
982f97638a8e (clear_string_char_byte_cache): New function.
Kenichi Handa <handa@m17n.org>
parents: 23208
diff changeset
2385 p[index] = charval;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2386 }
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2387 else if (BOOL_VECTOR_P (array))
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2388 {
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2389 register unsigned char *p = XBOOL_VECTOR (array)->data;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2390 int size_in_chars
55161
beac72c0215f (Fcopy_sequence, concat, internal_equal, Ffillarray, mapcar1): Use
Andreas Schwab <schwab@suse.de>
parents: 54994
diff changeset
2391 = ((XBOOL_VECTOR (array)->size + BOOL_VECTOR_BITS_PER_CHAR - 1)
beac72c0215f (Fcopy_sequence, concat, internal_equal, Ffillarray, mapcar1): Use
Andreas Schwab <schwab@suse.de>
parents: 54994
diff changeset
2392 / BOOL_VECTOR_BITS_PER_CHAR);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2393
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2394 charval = (! NILP (item) ? -1 : 0);
53159
e929f6d1593b (internal_equal) <case Lisp_Vectorlike>: Declare size as
Andreas Schwab <schwab@suse.de>
parents: 53138
diff changeset
2395 for (index = 0; index < size_in_chars - 1; index++)
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2396 p[index] = charval;
53159
e929f6d1593b (internal_equal) <case Lisp_Vectorlike>: Declare size as
Andreas Schwab <schwab@suse.de>
parents: 53138
diff changeset
2397 if (index < size_in_chars)
e929f6d1593b (internal_equal) <case Lisp_Vectorlike>: Declare size as
Andreas Schwab <schwab@suse.de>
parents: 53138
diff changeset
2398 {
e929f6d1593b (internal_equal) <case Lisp_Vectorlike>: Declare size as
Andreas Schwab <schwab@suse.de>
parents: 53138
diff changeset
2399 /* Mask out bits beyond the vector size. */
55161
beac72c0215f (Fcopy_sequence, concat, internal_equal, Ffillarray, mapcar1): Use
Andreas Schwab <schwab@suse.de>
parents: 54994
diff changeset
2400 if (XBOOL_VECTOR (array)->size % BOOL_VECTOR_BITS_PER_CHAR)
beac72c0215f (Fcopy_sequence, concat, internal_equal, Ffillarray, mapcar1): Use
Andreas Schwab <schwab@suse.de>
parents: 54994
diff changeset
2401 charval &= (1 << (XBOOL_VECTOR (array)->size % BOOL_VECTOR_BITS_PER_CHAR)) - 1;
53159
e929f6d1593b (internal_equal) <case Lisp_Vectorlike>: Declare size as
Andreas Schwab <schwab@suse.de>
parents: 53138
diff changeset
2402 p[index] = charval;
e929f6d1593b (internal_equal) <case Lisp_Vectorlike>: Declare size as
Andreas Schwab <schwab@suse.de>
parents: 53138
diff changeset
2403 }
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2404 }
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2405 else
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2406 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2407 array = wrong_type_argument (Qarrayp, array);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2408 goto retry;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2409 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2410 return array;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2411 }
52075
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
2412
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
2413 DEFUN ("clear-string", Fclear_string, Sclear_string,
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
2414 1, 1, 0,
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
2415 doc: /* Clear the contents of STRING.
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
2416 This makes STRING unibyte and may change its length. */)
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
2417 (string)
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
2418 Lisp_Object string;
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
2419 {
56364
78e8df7d1ad8 (Fclear_string): Correct previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56361
diff changeset
2420 int len;
56358
97e94a98c666 (Fclear_string): Signal an error if STRING is not a string.
John Paul Wallington <jpw@pobox.com>
parents: 56241
diff changeset
2421 CHECK_STRING (string);
56364
78e8df7d1ad8 (Fclear_string): Correct previous change.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56361
diff changeset
2422 len = SBYTES (string);
52075
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
2423 bzero (SDATA (string), len);
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
2424 STRING_SET_CHARS (string, len);
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
2425 STRING_SET_UNIBYTE (string);
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
2426 return Qnil;
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
2427 }
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
2428
13236
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2429 DEFUN ("char-table-subtype", Fchar_table_subtype, Schar_table_subtype,
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2430 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2431 doc: /* Return the subtype of char-table CHAR-TABLE. The value is a symbol. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2432 (char_table)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2433 Lisp_Object char_table;
13236
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2434 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2435 CHECK_CHAR_TABLE (char_table);
13236
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2436
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2437 return XCHAR_TABLE (char_table)->purpose;
13236
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2438 }
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2439
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2440 DEFUN ("char-table-parent", Fchar_table_parent, Schar_table_parent,
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2441 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2442 doc: /* Return the parent char-table of CHAR-TABLE.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2443 The value is either nil or another char-table.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2444 If CHAR-TABLE holds nil for a given character,
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2445 then the actual applicable value is inherited from the parent char-table
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2446 \(or from its parents, if necessary). */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2447 (char_table)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2448 Lisp_Object char_table;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2449 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2450 CHECK_CHAR_TABLE (char_table);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2451
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2452 return XCHAR_TABLE (char_table)->parent;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2453 }
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2454
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2455 DEFUN ("set-char-table-parent", Fset_char_table_parent, Sset_char_table_parent,
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2456 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2457 doc: /* Set the parent char-table of CHAR-TABLE to PARENT.
53138
7cf5bcb7a8ad (Fset_char_table_parent): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53115
diff changeset
2458 Return PARENT. PARENT must be either nil or another char-table. */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2459 (char_table, parent)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2460 Lisp_Object char_table, parent;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2461 {
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2462 Lisp_Object temp;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2463
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2464 CHECK_CHAR_TABLE (char_table);
13184
04170e19b3d4 (Fcopy_sequence): Call Fmake_char_table the new way.
Richard M. Stallman <rms@gnu.org>
parents: 13140
diff changeset
2465
04170e19b3d4 (Fcopy_sequence): Call Fmake_char_table the new way.
Richard M. Stallman <rms@gnu.org>
parents: 13140
diff changeset
2466 if (!NILP (parent))
04170e19b3d4 (Fcopy_sequence): Call Fmake_char_table the new way.
Richard M. Stallman <rms@gnu.org>
parents: 13140
diff changeset
2467 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2468 CHECK_CHAR_TABLE (parent);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2469
13184
04170e19b3d4 (Fcopy_sequence): Call Fmake_char_table the new way.
Richard M. Stallman <rms@gnu.org>
parents: 13140
diff changeset
2470 for (temp = parent; !NILP (temp); temp = XCHAR_TABLE (temp)->parent)
14097
91c55574973f (Fset_char_table_parent): Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents: 14091
diff changeset
2471 if (EQ (temp, char_table))
13184
04170e19b3d4 (Fcopy_sequence): Call Fmake_char_table the new way.
Richard M. Stallman <rms@gnu.org>
parents: 13140
diff changeset
2472 error ("Attempt to make a chartable be its own parent");
04170e19b3d4 (Fcopy_sequence): Call Fmake_char_table the new way.
Richard M. Stallman <rms@gnu.org>
parents: 13140
diff changeset
2473 }
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2474
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2475 XCHAR_TABLE (char_table)->parent = parent;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2476
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2477 return parent;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2478 }
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2479
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2480 DEFUN ("char-table-extra-slot", Fchar_table_extra_slot, Schar_table_extra_slot,
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2481 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2482 doc: /* Return the value of CHAR-TABLE's extra-slot number N. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2483 (char_table, n)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2484 Lisp_Object char_table, n;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2485 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2486 CHECK_CHAR_TABLE (char_table);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2487 CHECK_NUMBER (n);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2488 if (XINT (n) < 0
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2489 || XINT (n) >= CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (char_table)))
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2490 args_out_of_range (char_table, n);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2491
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2492 return XCHAR_TABLE (char_table)->extras[XINT (n)];
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2493 }
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2494
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2495 DEFUN ("set-char-table-extra-slot", Fset_char_table_extra_slot,
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2496 Sset_char_table_extra_slot,
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2497 3, 3, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2498 doc: /* Set CHAR-TABLE's extra-slot number N to VALUE. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2499 (char_table, n, value)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2500 Lisp_Object char_table, n, value;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2501 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2502 CHECK_CHAR_TABLE (char_table);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2503 CHECK_NUMBER (n);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2504 if (XINT (n) < 0
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2505 || XINT (n) >= CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (char_table)))
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2506 args_out_of_range (char_table, n);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2507
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2508 return XCHAR_TABLE (char_table)->extras[XINT (n)] = value;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2509 }
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
2510
61838
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2511 static Lisp_Object
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2512 char_table_range (table, from, to, defalt)
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2513 Lisp_Object table;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2514 int from, to;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2515 Lisp_Object defalt;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2516 {
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2517 Lisp_Object val;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2518
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2519 if (! NILP (XCHAR_TABLE (table)->defalt))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2520 defalt = XCHAR_TABLE (table)->defalt;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2521 val = XCHAR_TABLE (table)->contents[from];
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2522 if (SUB_CHAR_TABLE_P (val))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2523 val = char_table_range (val, 32, 127, defalt);
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2524 else if (NILP (val))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2525 val = defalt;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2526 for (from++; from <= to; from++)
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2527 {
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2528 Lisp_Object this_val;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2529
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2530 this_val = XCHAR_TABLE (table)->contents[from];
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2531 if (SUB_CHAR_TABLE_P (this_val))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2532 this_val = char_table_range (this_val, 32, 127, defalt);
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2533 else if (NILP (this_val))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2534 this_val = defalt;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2535 if (! EQ (val, this_val))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2536 error ("Characters in the range have inconsistent values");
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2537 }
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2538 return val;
62139
7f7d4a001320 (Fchar_table_range): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62137
diff changeset
2539 }
61838
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2540
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2541
13236
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2542 DEFUN ("char-table-range", Fchar_table_range, Schar_table_range,
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2543 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2544 doc: /* Return the value in CHAR-TABLE for a range of characters RANGE.
62139
7f7d4a001320 (Fchar_table_range): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62137
diff changeset
2545 RANGE should be nil (for the default value),
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2546 a vector which identifies a character set or a row of a character set,
61838
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2547 a character set name, or a character code.
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2548 If the characters in the specified range have different values,
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2549 an error is signalled.
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2550
62139
7f7d4a001320 (Fchar_table_range): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62137
diff changeset
2551 Note that this function doesn't check the parent of CHAR-TABLE. */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2552 (char_table, range)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2553 Lisp_Object char_table, range;
13236
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2554 {
61838
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2555 int charset_id, c1 = 0, c2 = 0;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2556 int size, i;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2557 Lisp_Object ch, val, current_default;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2558
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2559 CHECK_CHAR_TABLE (char_table);
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
2560
13236
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2561 if (EQ (range, Qnil))
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2562 return XCHAR_TABLE (char_table)->defalt;
61838
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2563 if (INTEGERP (range))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2564 {
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2565 int c = XINT (range);
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2566 if (! CHAR_VALID_P (c, 0))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2567 error ("Invalid character code: %d", c);
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2568 ch = range;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2569 SPLIT_CHAR (c, charset_id, c1, c2);
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2570 }
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
2571 else if (SYMBOLP (range))
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
2572 {
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
2573 Lisp_Object charset_info;
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
2574
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
2575 charset_info = Fget (range, Qcharset);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2576 CHECK_VECTOR (charset_info);
61838
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2577 charset_id = XINT (XVECTOR (charset_info)->contents[0]);
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2578 ch = Fmake_char_internal (make_number (charset_id),
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2579 make_number (0), make_number (0));
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
2580 }
13236
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2581 else if (VECTORP (range))
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2582 {
61838
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2583 size = ASIZE (range);
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2584 if (size == 0)
62137
4ca8167b7304 (Fchar_table_range): Yet Another Int/Lisp_Object Mixup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61838
diff changeset
2585 args_out_of_range (range, make_number (0));
61838
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2586 CHECK_NUMBER (AREF (range, 0));
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2587 charset_id = XINT (AREF (range, 0));
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2588 if (size > 1)
18035
edf54f605b36 (Fchar_table_range, Fset_char_table_range):
Richard M. Stallman <rms@gnu.org>
parents: 18000
diff changeset
2589 {
61838
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2590 CHECK_NUMBER (AREF (range, 1));
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2591 c1 = XINT (AREF (range, 1));
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2592 if (size > 2)
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2593 {
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2594 CHECK_NUMBER (AREF (range, 2));
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2595 c2 = XINT (AREF (range, 2));
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2596 }
18035
edf54f605b36 (Fchar_table_range, Fset_char_table_range):
Richard M. Stallman <rms@gnu.org>
parents: 18000
diff changeset
2597 }
61838
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2598
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2599 /* This checks if charset_id, c0, and c1 are all valid or not. */
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2600 ch = Fmake_char_internal (make_number (charset_id),
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2601 make_number (c1), make_number (c2));
13236
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2602 }
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2603 else
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2604 error ("Invalid RANGE argument to `char-table-range'");
61838
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2605
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2606 if (c1 > 0 && (CHARSET_DIMENSION (charset_id) == 1 || c2 > 0))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2607 {
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2608 /* Fully specified character. */
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2609 Lisp_Object parent = XCHAR_TABLE (char_table)->parent;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2610
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2611 XCHAR_TABLE (char_table)->parent = Qnil;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2612 val = Faref (char_table, ch);
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2613 XCHAR_TABLE (char_table)->parent = parent;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2614 return val;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2615 }
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2616
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2617 current_default = XCHAR_TABLE (char_table)->defalt;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2618 if (charset_id == CHARSET_ASCII
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2619 || charset_id == CHARSET_8_BIT_CONTROL
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2620 || charset_id == CHARSET_8_BIT_GRAPHIC)
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2621 {
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2622 int from, to, defalt;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2623
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2624 if (charset_id == CHARSET_ASCII)
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2625 from = 0, to = 127, defalt = CHAR_TABLE_DEFAULT_SLOT_ASCII;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2626 else if (charset_id == CHARSET_8_BIT_CONTROL)
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2627 from = 128, to = 159, defalt = CHAR_TABLE_DEFAULT_SLOT_8_BIT_CONTROL;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2628 else
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2629 from = 160, to = 255, defalt = CHAR_TABLE_DEFAULT_SLOT_8_BIT_GRAPHIC;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2630 if (! NILP (XCHAR_TABLE (char_table)->contents[defalt]))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2631 current_default = XCHAR_TABLE (char_table)->contents[defalt];
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2632 return char_table_range (char_table, from, to, current_default);
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2633 }
62139
7f7d4a001320 (Fchar_table_range): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62137
diff changeset
2634
61838
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2635 val = XCHAR_TABLE (char_table)->contents[128 + charset_id];
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2636 if (! SUB_CHAR_TABLE_P (val))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2637 return (NILP (val) ? current_default : val);
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2638 if (! NILP (XCHAR_TABLE (val)->defalt))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2639 current_default = XCHAR_TABLE (val)->defalt;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2640 if (c1 == 0)
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2641 return char_table_range (val, 32, 127, current_default);
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2642 val = XCHAR_TABLE (val)->contents[c1];
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2643 if (! SUB_CHAR_TABLE_P (val))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2644 return (NILP (val) ? current_default : val);
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2645 if (! NILP (XCHAR_TABLE (val)->defalt))
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2646 current_default = XCHAR_TABLE (val)->defalt;
8ff9d677eeff (char_table_range): New function.
Kenichi Handa <handa@m17n.org>
parents: 61735
diff changeset
2647 return char_table_range (val, 32, 127, current_default);
13236
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2648 }
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
2649
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2650 DEFUN ("set-char-table-range", Fset_char_table_range, Sset_char_table_range,
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2651 3, 3, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2652 doc: /* Set the value in CHAR-TABLE for a range of characters RANGE to VALUE.
53259
ee40f6db9683 (Fset_char_table_range): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53255
diff changeset
2653 RANGE should be t (for all characters), nil (for the default value),
ee40f6db9683 (Fset_char_table_range): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53255
diff changeset
2654 a character set, a vector which identifies a character set, a row of a
ee40f6db9683 (Fset_char_table_range): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53255
diff changeset
2655 character set, or a character code. Return VALUE. */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2656 (char_table, range, value)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2657 Lisp_Object char_table, range, value;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2658 {
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2659 int i;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2660
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2661 CHECK_CHAR_TABLE (char_table);
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
2662
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2663 if (EQ (range, Qt))
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2664 for (i = 0; i < CHAR_TABLE_ORDINARY_SLOTS; i++)
61687
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2665 {
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2666 /* Don't set these special slots used for default values of
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2667 ascii, eight-bit-control, and eight-bit-graphic. */
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2668 if (i != CHAR_TABLE_DEFAULT_SLOT_ASCII
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2669 && i != CHAR_TABLE_DEFAULT_SLOT_8_BIT_CONTROL
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2670 && i != CHAR_TABLE_DEFAULT_SLOT_8_BIT_GRAPHIC)
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2671 XCHAR_TABLE (char_table)->contents[i] = value;
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2672 }
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2673 else if (EQ (range, Qnil))
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2674 XCHAR_TABLE (char_table)->defalt = value;
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
2675 else if (SYMBOLP (range))
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
2676 {
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
2677 Lisp_Object charset_info;
53799
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2678 int charset_id;
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
2679
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
2680 charset_info = Fget (range, Qcharset);
53799
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2681 if (! VECTORP (charset_info)
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2682 || ! NATNUMP (AREF (charset_info, 0))
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2683 || (charset_id = XINT (AREF (charset_info, 0)),
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2684 ! CHARSET_DEFINED_P (charset_id)))
53821
7848629711b6 (Fset_char_table_range): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 53799
diff changeset
2685 error ("Invalid charset: %s", SDATA (SYMBOL_NAME (range)));
53799
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2686
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2687 if (charset_id == CHARSET_ASCII)
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2688 for (i = 0; i < 128; i++)
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2689 XCHAR_TABLE (char_table)->contents[i] = value;
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2690 else if (charset_id == CHARSET_8_BIT_CONTROL)
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2691 for (i = 128; i < 160; i++)
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2692 XCHAR_TABLE (char_table)->contents[i] = value;
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2693 else if (charset_id == CHARSET_8_BIT_GRAPHIC)
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2694 for (i = 160; i < 256; i++)
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2695 XCHAR_TABLE (char_table)->contents[i] = value;
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2696 else
9ddd570ce8c7 (Fset_char_table_range): Handle charsets ascii,
Kenichi Handa <handa@m17n.org>
parents: 53742
diff changeset
2697 XCHAR_TABLE (char_table)->contents[charset_id + 128] = value;
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
2698 }
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2699 else if (INTEGERP (range))
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2700 Faset (char_table, range, value);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2701 else if (VECTORP (range))
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2702 {
61687
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2703 int size = XVECTOR (range)->size;
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2704 Lisp_Object *val = XVECTOR (range)->contents;
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2705 Lisp_Object ch = Fmake_char_internal (size <= 0 ? Qnil : val[0],
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2706 size <= 1 ? Qnil : val[1],
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2707 size <= 2 ? Qnil : val[2]);
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2708 Faset (char_table, ch, value);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2709 }
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2710 else
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2711 error ("Invalid RANGE argument to `set-char-table-range'");
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2712
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2713 return value;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2714 }
17826
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2715
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2716 DEFUN ("set-char-table-default", Fset_char_table_default,
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2717 Sset_char_table_default, 3, 3, 0,
51397
6b7e048da8be Doc fixes.
Dave Love <fx@gnu.org>
parents: 51038
diff changeset
2718 doc: /* Set the default value in CHAR-TABLE for generic character CH to VALUE.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2719 The generic character specifies the group of characters.
61687
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2720 If CH is a normal character, set the default value for a group of
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2721 characters to which CH belongs.
51397
6b7e048da8be Doc fixes.
Dave Love <fx@gnu.org>
parents: 51038
diff changeset
2722 See also the documentation of `make-char'. */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2723 (char_table, ch, value)
17826
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2724 Lisp_Object char_table, ch, value;
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2725 {
25709
ba4e2a641663 (SXHASH_COMBINE): Add missing parentheses.
Gerd Moellmann <gerd@gnu.org>
parents: 25690
diff changeset
2726 int c, charset, code1, code2;
17826
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2727 Lisp_Object temp;
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2728
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2729 CHECK_CHAR_TABLE (char_table);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2730 CHECK_NUMBER (ch);
17826
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2731
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2732 c = XINT (ch);
24255
c373e786127a (Fset_char_table_default): To handle the case that CH is
Kenichi Handa <handa@m17n.org>
parents: 24016
diff changeset
2733 SPLIT_CHAR (c, charset, code1, code2);
22701
c771a25f6f8c (Fset_char_table_default): Check only if the charset of
Kenichi Handa <handa@m17n.org>
parents: 22696
diff changeset
2734
c771a25f6f8c (Fset_char_table_default): Check only if the charset of
Kenichi Handa <handa@m17n.org>
parents: 22696
diff changeset
2735 /* Since we may want to set the default value for a character set
c771a25f6f8c (Fset_char_table_default): Check only if the charset of
Kenichi Handa <handa@m17n.org>
parents: 22696
diff changeset
2736 not yet defined, we check only if the character set is in the
c771a25f6f8c (Fset_char_table_default): Check only if the charset of
Kenichi Handa <handa@m17n.org>
parents: 22696
diff changeset
2737 valid range or not, instead of it is already defined or not. */
c771a25f6f8c (Fset_char_table_default): Check only if the charset of
Kenichi Handa <handa@m17n.org>
parents: 22696
diff changeset
2738 if (! CHARSET_VALID_P (charset))
22706
27a8a6847be2 Whitespace change.
Richard M. Stallman <rms@gnu.org>
parents: 22701
diff changeset
2739 invalid_character (c);
17826
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2740
61687
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2741 if (SINGLE_BYTE_CHAR_P (c))
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2742 {
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2743 /* We use special slots for the default values of single byte
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2744 characters. */
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2745 int default_slot
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2746 = (c < 0x80 ? CHAR_TABLE_DEFAULT_SLOT_ASCII
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2747 : c < 0xA0 ? CHAR_TABLE_DEFAULT_SLOT_8_BIT_CONTROL
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2748 : CHAR_TABLE_DEFAULT_SLOT_8_BIT_GRAPHIC);
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2749
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2750 return (XCHAR_TABLE (char_table)->contents[default_slot] = value);
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2751 }
17826
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2752
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2753 /* Even if C is not a generic char, we had better behave as if a
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2754 generic char is specified. */
38483
eac29e9f6d99 * fns.c (Fset_char_table_default): Check that a charset is defined before checking its dimension.
Ken Raeburn <raeburn@raeburn.org>
parents: 37319
diff changeset
2755 if (!CHARSET_DEFINED_P (charset) || CHARSET_DIMENSION (charset) == 1)
17826
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2756 code1 = 0;
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2757 temp = XCHAR_TABLE (char_table)->contents[charset + 128];
61687
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2758 if (! SUB_CHAR_TABLE_P (temp))
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2759 {
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2760 temp = make_sub_char_table (temp);
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2761 XCHAR_TABLE (char_table)->contents[charset + 128] = temp;
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2762 }
17826
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2763 if (!code1)
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2764 {
61687
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2765 XCHAR_TABLE (temp)->defalt = value;
17826
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2766 return value;
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2767 }
61687
fe8e91f043af (Fset_char_table_range): Don't set slots used as default
Kenichi Handa <handa@m17n.org>
parents: 61645
diff changeset
2768 char_table = temp;
17826
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2769 temp = XCHAR_TABLE (char_table)->contents[code1];
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2770 if (SUB_CHAR_TABLE_P (temp))
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2771 XCHAR_TABLE (temp)->defalt = value;
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2772 else
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2773 XCHAR_TABLE (char_table)->contents[code1] = value;
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2774 return value;
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
2775 }
21339
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2776
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2777 /* Look up the element in TABLE at index CH,
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2778 and return it as an integer.
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2779 If the element is nil, return CH itself.
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2780 (Actually we do that for any non-integer.) */
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2781
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2782 int
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2783 char_table_translate (table, ch)
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2784 Lisp_Object table;
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2785 int ch;
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2786 {
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2787 Lisp_Object value;
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2788 value = Faref (table, make_number (ch));
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2789 if (! INTEGERP (value))
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2790 return ch;
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2791 return XINT (value);
91933098b4ae (char_table_translate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21260
diff changeset
2792 }
28222
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2793
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2794 static void
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2795 optimize_sub_char_table (table, chars)
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2796 Lisp_Object *table;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2797 int chars;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2798 {
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2799 Lisp_Object elt;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2800 int from, to;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2801
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2802 if (chars == 94)
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2803 from = 33, to = 127;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2804 else
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2805 from = 32, to = 128;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2806
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2807 if (!SUB_CHAR_TABLE_P (*table))
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2808 return;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2809 elt = XCHAR_TABLE (*table)->contents[from++];
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2810 for (; from < to; from++)
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2811 if (NILP (Fequal (elt, XCHAR_TABLE (*table)->contents[from])))
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2812 return;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2813 *table = elt;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2814 }
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2815
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2816 DEFUN ("optimize-char-table", Foptimize_char_table, Soptimize_char_table,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2817 1, 1, 0, doc: /* Optimize char table TABLE. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2818 (table)
28222
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2819 Lisp_Object table;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2820 {
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2821 Lisp_Object elt;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2822 int dim;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2823 int i, j;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2824
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2825 CHECK_CHAR_TABLE (table);
28222
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2826
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2827 for (i = CHAR_TABLE_SINGLE_BYTE_SLOTS; i < CHAR_TABLE_ORDINARY_SLOTS; i++)
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2828 {
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2829 elt = XCHAR_TABLE (table)->contents[i];
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2830 if (!SUB_CHAR_TABLE_P (elt))
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2831 continue;
33041
10bc9f620b67 (Foptimize_char_table): Fix arg for CHARSET_DIMENSION.
Kenichi Handa <handa@m17n.org>
parents: 32753
diff changeset
2832 dim = CHARSET_DIMENSION (i - 128);
28222
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2833 if (dim == 2)
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2834 for (j = 32; j < SUB_CHAR_TABLE_ORDINARY_SLOTS; j++)
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2835 optimize_sub_char_table (XCHAR_TABLE (elt)->contents + j, dim);
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2836 optimize_sub_char_table (XCHAR_TABLE (table)->contents + i, dim);
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2837 }
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2838 return Qnil;
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2839 }
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
2840
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2841
17789
120a8d934816 (map_char_table): New arg SUBTABLE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17318
diff changeset
2842 /* Map C_FUNCTION or FUNCTION over SUBTABLE, calling it for each
13184
04170e19b3d4 (Fcopy_sequence): Call Fmake_char_table the new way.
Richard M. Stallman <rms@gnu.org>
parents: 13140
diff changeset
2843 character or group of characters that share a value.
04170e19b3d4 (Fcopy_sequence): Call Fmake_char_table the new way.
Richard M. Stallman <rms@gnu.org>
parents: 13140
diff changeset
2844 DEPTH is the current depth in the originally specified
04170e19b3d4 (Fcopy_sequence): Call Fmake_char_table the new way.
Richard M. Stallman <rms@gnu.org>
parents: 13140
diff changeset
2845 chartable, and INDICES contains the vector indices
17789
120a8d934816 (map_char_table): New arg SUBTABLE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17318
diff changeset
2846 for the levels our callers have descended.
120a8d934816 (map_char_table): New arg SUBTABLE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17318
diff changeset
2847
120a8d934816 (map_char_table): New arg SUBTABLE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17318
diff changeset
2848 ARG is passed to C_FUNCTION when that is called. */
13184
04170e19b3d4 (Fcopy_sequence): Call Fmake_char_table the new way.
Richard M. Stallman <rms@gnu.org>
parents: 13140
diff changeset
2849
04170e19b3d4 (Fcopy_sequence): Call Fmake_char_table the new way.
Richard M. Stallman <rms@gnu.org>
parents: 13140
diff changeset
2850 void
51032
663da44e6176 (map_char_table): New arg TABLE gets the master table. All calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 50461
diff changeset
2851 map_char_table (c_function, function, table, subtable, arg, depth, indices)
20314
3fb425cf6a83 * fns.c (map_char_table): Protoize parameter.
Andreas Schwab <schwab@suse.de>
parents: 20148
diff changeset
2852 void (*c_function) P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
51032
663da44e6176 (map_char_table): New arg TABLE gets the master table. All calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 50461
diff changeset
2853 Lisp_Object function, table, subtable, arg, *indices;
16105
1712db4a1709 (map_char_table): Declare depth as int.
Richard M. Stallman <rms@gnu.org>
parents: 15966
diff changeset
2854 int depth;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2855 {
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2856 int i, to;
57482
72eb85758337 (map_char_table): Add missing gcpros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56364
diff changeset
2857 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
72eb85758337 (map_char_table): Add missing gcpros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56364
diff changeset
2858
72eb85758337 (map_char_table): Add missing gcpros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56364
diff changeset
2859 GCPRO4 (arg, table, subtable, function);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2860
17182
47bfc66eb7f1 (map_char_table): Handle multibyte characters.
Kenichi Handa <handa@m17n.org>
parents: 17063
diff changeset
2861 if (depth == 0)
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2862 {
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2863 /* At first, handle ASCII and 8-bit European characters. */
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2864 for (i = 0; i < CHAR_TABLE_SINGLE_BYTE_SLOTS; i++)
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2865 {
51032
663da44e6176 (map_char_table): New arg TABLE gets the master table. All calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 50461
diff changeset
2866 Lisp_Object elt= XCHAR_TABLE (subtable)->contents[i];
663da44e6176 (map_char_table): New arg TABLE gets the master table. All calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 50461
diff changeset
2867 if (NILP (elt))
663da44e6176 (map_char_table): New arg TABLE gets the master table. All calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 50461
diff changeset
2868 elt = XCHAR_TABLE (subtable)->defalt;
663da44e6176 (map_char_table): New arg TABLE gets the master table. All calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 50461
diff changeset
2869 if (NILP (elt))
663da44e6176 (map_char_table): New arg TABLE gets the master table. All calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 50461
diff changeset
2870 elt = Faref (subtable, make_number (i));
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2871 if (c_function)
17789
120a8d934816 (map_char_table): New arg SUBTABLE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 17318
diff changeset
2872 (*c_function) (arg, make_number (i), elt);
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2873 else
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2874 call2 (function, make_number (i), elt);
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2875 }
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
2876 #if 0 /* If the char table has entries for higher characters,
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
2877 we should report them. */
20148
988eef7dba1b (map_char_table): Do not operate on invalid characters.
Kenichi Handa <handa@m17n.org>
parents: 20004
diff changeset
2878 if (NILP (current_buffer->enable_multibyte_characters))
57482
72eb85758337 (map_char_table): Add missing gcpros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56364
diff changeset
2879 {
72eb85758337 (map_char_table): Add missing gcpros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56364
diff changeset
2880 UNGCPRO;
72eb85758337 (map_char_table): Add missing gcpros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56364
diff changeset
2881 return;
72eb85758337 (map_char_table): Add missing gcpros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56364
diff changeset
2882 }
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
2883 #endif
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2884 to = CHAR_TABLE_ORDINARY_SLOTS;
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2885 }
17182
47bfc66eb7f1 (map_char_table): Handle multibyte characters.
Kenichi Handa <handa@m17n.org>
parents: 17063
diff changeset
2886 else
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2887 {
28962
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2888 int charset = XFASTINT (indices[0]) - 128;
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2889
20148
988eef7dba1b (map_char_table): Do not operate on invalid characters.
Kenichi Handa <handa@m17n.org>
parents: 20004
diff changeset
2890 i = 32;
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2891 to = SUB_CHAR_TABLE_ORDINARY_SLOTS;
28962
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2892 if (CHARSET_CHARS (charset) == 94)
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2893 i++, to--;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2894 }
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2895
18000
2873e0dabbc1 (map_char_table): For sub char-table, index should be
Kenichi Handa <handa@m17n.org>
parents: 17931
diff changeset
2896 for (; i < to; i++)
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2897 {
28962
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2898 Lisp_Object elt;
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2899 int charset;
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2900
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2901 elt = XCHAR_TABLE (subtable)->contents[i];
18108
af791b0f0657 (map_char_table): Use XSETFASTINT.
Richard M. Stallman <rms@gnu.org>
parents: 18035
diff changeset
2902 XSETFASTINT (indices[depth], i);
28962
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2903 charset = XFASTINT (indices[0]) - 128;
29232
c0d6abd0b71b (map_char_table): Ignore char-table entries for
Kenichi Handa <handa@m17n.org>
parents: 29010
diff changeset
2904 if (depth == 0
c0d6abd0b71b (map_char_table): Ignore char-table entries for
Kenichi Handa <handa@m17n.org>
parents: 29010
diff changeset
2905 && (!CHARSET_DEFINED_P (charset)
c0d6abd0b71b (map_char_table): Ignore char-table entries for
Kenichi Handa <handa@m17n.org>
parents: 29010
diff changeset
2906 || charset == CHARSET_8_BIT_CONTROL
c0d6abd0b71b (map_char_table): Ignore char-table entries for
Kenichi Handa <handa@m17n.org>
parents: 29010
diff changeset
2907 || charset == CHARSET_8_BIT_GRAPHIC))
28962
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2908 continue;
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2909
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2910 if (SUB_CHAR_TABLE_P (elt))
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2911 {
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2912 if (depth >= 3)
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2913 error ("Too deep char table");
51032
663da44e6176 (map_char_table): New arg TABLE gets the master table. All calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 50461
diff changeset
2914 map_char_table (c_function, function, table, elt, arg, depth + 1, indices);
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2915 }
13184
04170e19b3d4 (Fcopy_sequence): Call Fmake_char_table the new way.
Richard M. Stallman <rms@gnu.org>
parents: 13140
diff changeset
2916 else
17182
47bfc66eb7f1 (map_char_table): Handle multibyte characters.
Kenichi Handa <handa@m17n.org>
parents: 17063
diff changeset
2917 {
28962
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2918 int c1, c2, c;
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2919
51038
0b084ee4c1c8 (map_char_table): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 51032
diff changeset
2920 c1 = depth >= 1 ? XFASTINT (indices[1]) : 0;
0b084ee4c1c8 (map_char_table): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 51032
diff changeset
2921 c2 = depth >= 2 ? XFASTINT (indices[2]) : 0;
0b084ee4c1c8 (map_char_table): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 51032
diff changeset
2922 c = MAKE_CHAR (charset, c1, c2);
0b084ee4c1c8 (map_char_table): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 51032
diff changeset
2923
28962
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2924 if (NILP (elt))
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2925 elt = XCHAR_TABLE (subtable)->defalt;
51032
663da44e6176 (map_char_table): New arg TABLE gets the master table. All calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 50461
diff changeset
2926 if (NILP (elt))
51038
0b084ee4c1c8 (map_char_table): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 51032
diff changeset
2927 elt = Faref (table, make_number (c));
0b084ee4c1c8 (map_char_table): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 51032
diff changeset
2928
28962
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2929 if (c_function)
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2930 (*c_function) (arg, make_number (c), elt);
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2931 else
3f62d70df67c (map_char_table): Pay attention to character number of
Kenichi Handa <handa@m17n.org>
parents: 28666
diff changeset
2932 call2 (function, make_number (c), elt);
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
2933 }
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2934 }
57482
72eb85758337 (map_char_table): Add missing gcpros.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 56364
diff changeset
2935 UNGCPRO;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2936 }
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2937
49915
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
2938 static void void_call2 P_ ((Lisp_Object a, Lisp_Object b, Lisp_Object c));
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
2939 static void
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
2940 void_call2 (a, b, c)
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
2941 Lisp_Object a, b, c;
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
2942 {
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
2943 call2 (a, b, c);
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
2944 }
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
2945
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2946 DEFUN ("map-char-table", Fmap_char_table, Smap_char_table,
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2947 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2948 doc: /* Call FUNCTION for each (normal and generic) characters in CHAR-TABLE.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
2949 FUNCTION is called with two arguments--a key and a value.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2950 The key is always a possible IDX argument to `aref'. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
2951 (function, char_table)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
2952 Lisp_Object function, char_table;
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2953 {
17318
224e100b393c (copy_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 17291
diff changeset
2954 /* The depth of char table is at most 3. */
18000
2873e0dabbc1 (map_char_table): For sub char-table, index should be
Kenichi Handa <handa@m17n.org>
parents: 17931
diff changeset
2955 Lisp_Object indices[3];
2873e0dabbc1 (map_char_table): For sub char-table, index should be
Kenichi Handa <handa@m17n.org>
parents: 17931
diff changeset
2956
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
2957 CHECK_CHAR_TABLE (char_table);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2958
49915
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
2959 /* When Lisp_Object is represented as a union, `call2' cannot directly
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
2960 be passed to map_char_table because it returns a Lisp_Object rather
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
2961 than returning nothing.
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
2962 Casting leads to crashes on some architectures. -stef */
51032
663da44e6176 (map_char_table): New arg TABLE gets the master table. All calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 50461
diff changeset
2963 map_char_table (void_call2, Qnil, char_table, char_table, function, 0, indices);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2964 return Qnil;
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
2965 }
30488
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2966
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2967 /* Return a value for character C in char-table TABLE. Store the
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2968 actual index for that value in *IDX. Ignore the default value of
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2969 TABLE. */
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2970
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2971 Lisp_Object
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2972 char_table_ref_and_index (table, c, idx)
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2973 Lisp_Object table;
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2974 int c, *idx;
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2975 {
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2976 int charset, c1, c2;
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2977 Lisp_Object elt;
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2978
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2979 if (SINGLE_BYTE_CHAR_P (c))
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2980 {
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2981 *idx = c;
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2982 return XCHAR_TABLE (table)->contents[c];
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2983 }
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2984 SPLIT_CHAR (c, charset, c1, c2);
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2985 elt = XCHAR_TABLE (table)->contents[charset + 128];
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2986 *idx = MAKE_CHAR (charset, 0, 0);
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2987 if (!SUB_CHAR_TABLE_P (elt))
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2988 return elt;
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2989 if (c1 < 32 || NILP (XCHAR_TABLE (elt)->contents[c1]))
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2990 return XCHAR_TABLE (elt)->defalt;
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2991 elt = XCHAR_TABLE (elt)->contents[c1];
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2992 *idx = MAKE_CHAR (charset, c1, 0);
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2993 if (!SUB_CHAR_TABLE_P (elt))
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2994 return elt;
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2995 if (c2 < 32 || NILP (XCHAR_TABLE (elt)->contents[c2]))
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2996 return XCHAR_TABLE (elt)->defalt;
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2997 *idx = c;
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2998 return XCHAR_TABLE (elt)->contents[c2];
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
2999 }
e26deb1d147a (char_table_ref_and_index): New function.
Kenichi Handa <handa@m17n.org>
parents: 30417
diff changeset
3000
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
3001
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3002 /* ARGSUSED */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3003 Lisp_Object
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3004 nconc2 (s1, s2)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3005 Lisp_Object s1, s2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3006 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3007 #ifdef NO_ARG_ARRAY
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3008 Lisp_Object args[2];
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3009 args[0] = s1;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3010 args[1] = s2;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3011 return Fnconc (2, args);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3012 #else
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3013 return Fnconc (2, &s1);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3014 #endif /* NO_ARG_ARRAY */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3015 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3016
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3017 DEFUN ("nconc", Fnconc, Snconc, 0, MANY, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3018 doc: /* Concatenate any number of lists by altering them.
40132
75fe73bea452 (Fappend, Fconcat, Fvconcat, Fnconc, Fwidget_apply, Fmake_hash_table):
Miles Bader <miles@gnu.org>
parents: 39977
diff changeset
3019 Only the last argument is not altered, and need not be a list.
75fe73bea452 (Fappend, Fconcat, Fvconcat, Fnconc, Fwidget_apply, Fmake_hash_table):
Miles Bader <miles@gnu.org>
parents: 39977
diff changeset
3020 usage: (nconc &rest LISTS) */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3021 (nargs, args)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3022 int nargs;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3023 Lisp_Object *args;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3024 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3025 register int argnum;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3026 register Lisp_Object tail, tem, val;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3027
31533
3898245f639a (concat, Fsubstring, internal_equal, Fnconc): Avoid some
Gerd Moellmann <gerd@gnu.org>
parents: 30760
diff changeset
3028 val = tail = Qnil;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3029
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3030 for (argnum = 0; argnum < nargs; argnum++)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3031 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3032 tem = args[argnum];
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
3033 if (NILP (tem)) continue;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3034
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
3035 if (NILP (val))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3036 val = tem;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3037
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3038 if (argnum + 1 == nargs) break;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3039
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3040 if (!CONSP (tem))
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3041 tem = wrong_type_argument (Qlistp, tem);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3042
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3043 while (CONSP (tem))
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3044 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3045 tail = tem;
46221
2f81e2382d8d (Fnconc): Use XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45650
diff changeset
3046 tem = XCDR (tail);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3047 QUIT;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3048 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3049
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3050 tem = args[argnum + 1];
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3051 Fsetcdr (tail, tem);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
3052 if (NILP (tem))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3053 args[argnum + 1] = tail;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3054 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3055
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3056 return val;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3057 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3058
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3059 /* This is the guts of all mapping functions.
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3060 Apply FN to each element of SEQ, one by one,
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3061 storing the results into elements of VALS, a C vector of Lisp_Objects.
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3062 LENI is the length of VALS, which should also be the length of SEQ. */
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3063
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3064 static void
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3065 mapcar1 (leni, vals, fn, seq)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3066 int leni;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3067 Lisp_Object *vals;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3068 Lisp_Object fn, seq;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3069 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3070 register Lisp_Object tail;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3071 Lisp_Object dummy;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3072 register int i;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3073 struct gcpro gcpro1, gcpro2, gcpro3;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3074
28555
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3075 if (vals)
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3076 {
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3077 /* Don't let vals contain any garbage when GC happens. */
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3078 for (i = 0; i < leni; i++)
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3079 vals[i] = Qnil;
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3080
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3081 GCPRO3 (dummy, fn, seq);
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3082 gcpro1.var = vals;
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3083 gcpro1.nvars = leni;
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3084 }
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3085 else
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3086 GCPRO2 (fn, seq);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3087 /* We need not explicitly protect `tail' because it is used only on lists, and
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3088 1) lists are not relocated and 2) the list is marked via `seq' so will not be freed */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3089
9128
04a702d7f662 (Frandom, Flength, Fstring_equal, Fstring_lessp, Fcopy_sequence, concat, Felt,
Karl Heuer <kwzh@gnu.org>
parents: 8966
diff changeset
3090 if (VECTORP (seq))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3091 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3092 for (i = 0; i < leni; i++)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3093 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3094 dummy = XVECTOR (seq)->contents[i];
28555
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3095 dummy = call1 (fn, dummy);
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3096 if (vals)
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3097 vals[i] = dummy;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3098 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3099 }
20992
d2366423bc00 (mapcar1): Handle bool-vectors.
Karl Heuer <kwzh@gnu.org>
parents: 20928
diff changeset
3100 else if (BOOL_VECTOR_P (seq))
d2366423bc00 (mapcar1): Handle bool-vectors.
Karl Heuer <kwzh@gnu.org>
parents: 20928
diff changeset
3101 {
d2366423bc00 (mapcar1): Handle bool-vectors.
Karl Heuer <kwzh@gnu.org>
parents: 20928
diff changeset
3102 for (i = 0; i < leni; i++)
d2366423bc00 (mapcar1): Handle bool-vectors.
Karl Heuer <kwzh@gnu.org>
parents: 20928
diff changeset
3103 {
d2366423bc00 (mapcar1): Handle bool-vectors.
Karl Heuer <kwzh@gnu.org>
parents: 20928
diff changeset
3104 int byte;
55161
beac72c0215f (Fcopy_sequence, concat, internal_equal, Ffillarray, mapcar1): Use
Andreas Schwab <schwab@suse.de>
parents: 54994
diff changeset
3105 byte = XBOOL_VECTOR (seq)->data[i / BOOL_VECTOR_BITS_PER_CHAR];
beac72c0215f (Fcopy_sequence, concat, internal_equal, Ffillarray, mapcar1): Use
Andreas Schwab <schwab@suse.de>
parents: 54994
diff changeset
3106 if (byte & (1 << (i % BOOL_VECTOR_BITS_PER_CHAR)))
20992
d2366423bc00 (mapcar1): Handle bool-vectors.
Karl Heuer <kwzh@gnu.org>
parents: 20928
diff changeset
3107 dummy = Qt;
d2366423bc00 (mapcar1): Handle bool-vectors.
Karl Heuer <kwzh@gnu.org>
parents: 20928
diff changeset
3108 else
d2366423bc00 (mapcar1): Handle bool-vectors.
Karl Heuer <kwzh@gnu.org>
parents: 20928
diff changeset
3109 dummy = Qnil;
d2366423bc00 (mapcar1): Handle bool-vectors.
Karl Heuer <kwzh@gnu.org>
parents: 20928
diff changeset
3110
28555
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3111 dummy = call1 (fn, dummy);
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3112 if (vals)
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3113 vals[i] = dummy;
20992
d2366423bc00 (mapcar1): Handle bool-vectors.
Karl Heuer <kwzh@gnu.org>
parents: 20928
diff changeset
3114 }
d2366423bc00 (mapcar1): Handle bool-vectors.
Karl Heuer <kwzh@gnu.org>
parents: 20928
diff changeset
3115 }
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3116 else if (STRINGP (seq))
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3117 {
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3118 int i_byte;
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3119
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3120 for (i = 0, i_byte = 0; i < leni;)
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3121 {
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3122 int c;
20712
50255c536f0f (mapcar1): Keep `i' in `i_before' before `i' is
Kenichi Handa <handa@m17n.org>
parents: 20706
diff changeset
3123 int i_before = i;
50255c536f0f (mapcar1): Keep `i' in `i_before' before `i' is
Kenichi Handa <handa@m17n.org>
parents: 20706
diff changeset
3124
50255c536f0f (mapcar1): Keep `i' in `i_before' before `i' is
Kenichi Handa <handa@m17n.org>
parents: 20706
diff changeset
3125 FETCH_STRING_CHAR_ADVANCE (c, seq, i, i_byte);
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3126 XSETFASTINT (dummy, c);
28555
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3127 dummy = call1 (fn, dummy);
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3128 if (vals)
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3129 vals[i_before] = dummy;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3130 }
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3131 }
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3132 else /* Must be a list, since Flength did not get an error */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3133 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3134 tail = seq;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3135 for (i = 0; i < leni; i++)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3136 {
28555
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3137 dummy = call1 (fn, Fcar (tail));
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3138 if (vals)
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3139 vals[i] = dummy;
25645
a14111a2a100 Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25619
diff changeset
3140 tail = XCDR (tail);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3141 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3142 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3143
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3144 UNGCPRO;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3145 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3146
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3147 DEFUN ("mapconcat", Fmapconcat, Smapconcat, 3, 3, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3148 doc: /* Apply FUNCTION to each element of SEQUENCE, and concat the results as strings.
39956
b394d7876697 (Fmapconcat): Fix typo in a doc string.
Pavel Janík <Pavel@Janik.cz>
parents: 39899
diff changeset
3149 In between each pair of results, stick in SEPARATOR. Thus, " " as
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3150 SEPARATOR results in spaces between the values returned by FUNCTION.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3151 SEQUENCE may be a list, a vector, a bool-vector, or a string. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3152 (function, sequence, separator)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
3153 Lisp_Object function, sequence, separator;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3154 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3155 Lisp_Object len;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3156 register int leni;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3157 int nargs;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3158 register Lisp_Object *args;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3159 register int i;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3160 struct gcpro gcpro1;
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3161 Lisp_Object ret;
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3162 USE_SAFE_ALLOCA;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3163
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
3164 len = Flength (sequence);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3165 leni = XINT (len);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3166 nargs = leni + leni - 1;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3167 if (nargs < 0) return build_string ("");
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3168
56203
2bb92448ff94 (Fmapconcat, Fmapcar): Use new SAFE_ALLOCA_LISP and
Kim F. Storm <storm@cua.dk>
parents: 56199
diff changeset
3169 SAFE_ALLOCA_LISP (args, nargs);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3170
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
3171 GCPRO1 (separator);
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
3172 mapcar1 (leni, args, function, sequence);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3173 UNGCPRO;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3174
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3175 for (i = leni - 1; i >= 0; i--)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3176 args[i + i] = args[i];
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3177
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3178 for (i = 1; i < nargs; i += 2)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
3179 args[i] = separator;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3180
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3181 ret = Fconcat (nargs, args);
57726
66e97a54985f Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents: 57482
diff changeset
3182 SAFE_FREE ();
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3183
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3184 return ret;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3185 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3186
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3187 DEFUN ("mapcar", Fmapcar, Smapcar, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3188 doc: /* Apply FUNCTION to each element of SEQUENCE, and make a list of the results.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3189 The result is a list just as long as SEQUENCE.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3190 SEQUENCE may be a list, a vector, a bool-vector, or a string. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3191 (function, sequence)
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
3192 Lisp_Object function, sequence;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3193 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3194 register Lisp_Object len;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3195 register int leni;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3196 register Lisp_Object *args;
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3197 Lisp_Object ret;
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3198 USE_SAFE_ALLOCA;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3199
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
3200 len = Flength (sequence);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3201 leni = XFASTINT (len);
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3202
56203
2bb92448ff94 (Fmapconcat, Fmapcar): Use new SAFE_ALLOCA_LISP and
Kim F. Storm <storm@cua.dk>
parents: 56199
diff changeset
3203 SAFE_ALLOCA_LISP (args, leni);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3204
14091
34911b128a47 (Frandom, Flength, Felt, Fsort, Fchar_table_subtype, Fchar_table_parent,
Erik Naggum <erik@naggum.no>
parents: 14051
diff changeset
3205 mapcar1 (leni, args, function, sequence);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3206
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3207 ret = Flist (leni, args);
57726
66e97a54985f Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents: 57482
diff changeset
3208 SAFE_FREE ();
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3209
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3210 return ret;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3211 }
28555
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3212
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3213 DEFUN ("mapc", Fmapc, Smapc, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3214 doc: /* Apply FUNCTION to each element of SEQUENCE for side effects only.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3215 Unlike `mapcar', don't accumulate the results. Return SEQUENCE.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3216 SEQUENCE may be a list, a vector, a bool-vector, or a string. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3217 (function, sequence)
28555
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3218 Lisp_Object function, sequence;
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3219 {
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3220 register int leni;
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3221
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3222 leni = XFASTINT (Flength (sequence));
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3223 mapcar1 (leni, 0, function, sequence);
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3224
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3225 return sequence;
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
3226 }
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3227
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3228 /* Anything that calls this function must protect from GC! */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3229
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3230 DEFUN ("y-or-n-p", Fy_or_n_p, Sy_or_n_p, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3231 doc: /* Ask user a "y or n" question. Return t if answer is "y".
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3232 Takes one argument, which is the string to display to ask the question.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3233 It should end in a space; `y-or-n-p' adds `(y or n) ' to it.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3234 No confirmation of the answer is requested; a single character is enough.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3235 Also accepts Space to mean yes, or Delete to mean no. \(Actually, it uses
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3236 the bindings in `query-replace-map'; see the documentation of that variable
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3237 for more information. In this case, the useful bindings are `act', `skip',
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3238 `recenter', and `quit'.\)
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3239
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3240 Under a windowing system a dialog box will be used if `last-nonmenu-event'
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3241 is nil and `use-dialog-box' is non-nil. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3242 (prompt)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3243 Lisp_Object prompt;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3244 {
25071
31cd7d7a54df (Fy_or_n_p): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 25005
diff changeset
3245 register Lisp_Object obj, key, def, map;
2091
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3246 register int answer;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3247 Lisp_Object xprompt;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3248 Lisp_Object args[2];
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3249 struct gcpro gcpro1, gcpro2;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46221
diff changeset
3250 int count = SPECPDL_INDEX ();
14456
fb11ccbe5c7c (Qcursor_in_echo_area): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14392
diff changeset
3251
fb11ccbe5c7c (Qcursor_in_echo_area): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14392
diff changeset
3252 specbind (Qcursor_in_echo_area, Qt);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3253
2091
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3254 map = Fsymbol_value (intern ("query-replace-map"));
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3255
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
3256 CHECK_STRING (prompt);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3257 xprompt = prompt;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3258 GCPRO2 (prompt, xprompt);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3259
28072
713349e24825 (Fy_or_n_p): Cancel busy-cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 27901
diff changeset
3260 #ifdef HAVE_X_WINDOWS
36256
e033d60bd048 Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents: 35513
diff changeset
3261 if (display_hourglass_p)
e033d60bd048 Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents: 35513
diff changeset
3262 cancel_hourglass ();
28072
713349e24825 (Fy_or_n_p): Cancel busy-cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 27901
diff changeset
3263 #endif
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
3264
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3265 while (1)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3266 {
14456
fb11ccbe5c7c (Qcursor_in_echo_area): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14392
diff changeset
3267
13862
817ecef2d2d0 (Fy_or_n_p, Fyes_or_no_p): using_x_p renamed to have_menus_p.
Richard M. Stallman <rms@gnu.org>
parents: 13410
diff changeset
3268 #ifdef HAVE_MENUS
7790
75153e2d5d85 (Fy_or_n_p): Don't use dialog box if not an X frame.
Richard M. Stallman <rms@gnu.org>
parents: 7307
diff changeset
3269 if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
18531
35a263e545b3 (Fy_or_n_p, Fyes_or_no_p): Obey use_dialog_box.
Richard M. Stallman <rms@gnu.org>
parents: 18421
diff changeset
3270 && use_dialog_box
13862
817ecef2d2d0 (Fy_or_n_p, Fyes_or_no_p): using_x_p renamed to have_menus_p.
Richard M. Stallman <rms@gnu.org>
parents: 13410
diff changeset
3271 && have_menus_p ())
6057
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3272 {
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3273 Lisp_Object pane, menu;
35336
002c02db42d3 Call redisplay_preserve_echo_area with additional arg.
Gerd Moellmann <gerd@gnu.org>
parents: 34961
diff changeset
3274 redisplay_preserve_echo_area (3);
6057
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3275 pane = Fcons (Fcons (build_string ("Yes"), Qt),
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3276 Fcons (Fcons (build_string ("No"), Qnil),
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3277 Qnil));
6478
65c2e184b5d9 (Fy_or_n_p, Fyes_or_no_p): Call Fx_popup_dialog the new way.
Richard M. Stallman <rms@gnu.org>
parents: 6427
diff changeset
3278 menu = Fcons (prompt, pane);
62674
100b8f001349 (Fyes_or_no_p, Fy_or_n_p): Call Fx_popup_dialog with
Nick Roberts <nickrob@snap.net.nz>
parents: 62139
diff changeset
3279 obj = Fx_popup_dialog (Qt, menu, Qnil);
6057
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3280 answer = !NILP (obj);
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3281 break;
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3282 }
13862
817ecef2d2d0 (Fy_or_n_p, Fyes_or_no_p): using_x_p renamed to have_menus_p.
Richard M. Stallman <rms@gnu.org>
parents: 13410
diff changeset
3283 #endif /* HAVE_MENUS */
6850
d2d8b40fb599 (Fy_or_n_p, Fyes_or_no_p): Test HAVE_X_MENU.
Karl Heuer <kwzh@gnu.org>
parents: 6478
diff changeset
3284 cursor_in_echo_area = 1;
14392
127c6142a07a (Fy_or_n_p): Call choose_minibuf_frame.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
3285 choose_minibuf_frame ();
44524
0626c87baa01 (Fy_or_n_p): Use `minibuffer-prompt' face for prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 44219
diff changeset
3286
0626c87baa01 (Fy_or_n_p): Use `minibuffer-prompt' face for prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 44219
diff changeset
3287 {
0626c87baa01 (Fy_or_n_p): Use `minibuffer-prompt' face for prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 44219
diff changeset
3288 Lisp_Object pargs[3];
0626c87baa01 (Fy_or_n_p): Use `minibuffer-prompt' face for prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 44219
diff changeset
3289
45037
8fe017cea042 (Frequire): Error if called while preparing to dump.
Richard M. Stallman <rms@gnu.org>
parents: 44760
diff changeset
3290 /* Colorize prompt according to `minibuffer-prompt' face. */
44524
0626c87baa01 (Fy_or_n_p): Use `minibuffer-prompt' face for prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 44219
diff changeset
3291 pargs[0] = build_string ("%s(y or n) ");
0626c87baa01 (Fy_or_n_p): Use `minibuffer-prompt' face for prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 44219
diff changeset
3292 pargs[1] = intern ("face");
0626c87baa01 (Fy_or_n_p): Use `minibuffer-prompt' face for prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 44219
diff changeset
3293 pargs[2] = intern ("minibuffer-prompt");
0626c87baa01 (Fy_or_n_p): Use `minibuffer-prompt' face for prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 44219
diff changeset
3294 args[0] = Fpropertize (3, pargs);
0626c87baa01 (Fy_or_n_p): Use `minibuffer-prompt' face for prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 44219
diff changeset
3295 args[1] = xprompt;
0626c87baa01 (Fy_or_n_p): Use `minibuffer-prompt' face for prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 44219
diff changeset
3296 Fmessage (2, args);
0626c87baa01 (Fy_or_n_p): Use `minibuffer-prompt' face for prompt.
Pavel Janík <Pavel@Janik.cz>
parents: 44219
diff changeset
3297 }
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3298
16561
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
3299 if (minibuffer_auto_raise)
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
3300 {
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
3301 Lisp_Object mini_frame;
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
3302
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
3303 mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window));
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
3304
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
3305 Fraise_frame (mini_frame);
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
3306 }
55fcbbf28987 Include frame.h and window.h.
Richard M. Stallman <rms@gnu.org>
parents: 16105
diff changeset
3307
23057
2dbf1ec20bf7 (Fy_or_n_p): Don't bind input-method-function.
Richard M. Stallman <rms@gnu.org>
parents: 23051
diff changeset
3308 obj = read_filtered_event (1, 0, 0, 0);
6850
d2d8b40fb599 (Fy_or_n_p, Fyes_or_no_p): Test HAVE_X_MENU.
Karl Heuer <kwzh@gnu.org>
parents: 6478
diff changeset
3309 cursor_in_echo_area = 0;
d2d8b40fb599 (Fy_or_n_p, Fyes_or_no_p): Test HAVE_X_MENU.
Karl Heuer <kwzh@gnu.org>
parents: 6478
diff changeset
3310 /* If we need to quit, quit with cursor_in_echo_area = 0. */
d2d8b40fb599 (Fy_or_n_p, Fyes_or_no_p): Test HAVE_X_MENU.
Karl Heuer <kwzh@gnu.org>
parents: 6478
diff changeset
3311 QUIT;
2369
8ce8541f393a (Fy_or_n_p): Ensure cursor_in_echo_area = 0 when quit.
Richard M. Stallman <rms@gnu.org>
parents: 2311
diff changeset
3312
2091
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3313 key = Fmake_vector (make_number (1), obj);
15713
27487191083d (Fy_or_n_p): Pass 3rd arg to Flookup_key.
Karl Heuer <kwzh@gnu.org>
parents: 14617
diff changeset
3314 def = Flookup_key (map, key, Qt);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3315
2091
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3316 if (EQ (def, intern ("skip")))
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3317 {
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3318 answer = 0;
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3319 break;
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3320 }
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3321 else if (EQ (def, intern ("act")))
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3322 {
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3323 answer = 1;
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3324 break;
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3325 }
2311
98b714786ad0 (Fy_or_n_p): Handle `recenter' response type.
Richard M. Stallman <rms@gnu.org>
parents: 2171
diff changeset
3326 else if (EQ (def, intern ("recenter")))
98b714786ad0 (Fy_or_n_p): Handle `recenter' response type.
Richard M. Stallman <rms@gnu.org>
parents: 2171
diff changeset
3327 {
98b714786ad0 (Fy_or_n_p): Handle `recenter' response type.
Richard M. Stallman <rms@gnu.org>
parents: 2171
diff changeset
3328 Frecenter (Qnil);
98b714786ad0 (Fy_or_n_p): Handle `recenter' response type.
Richard M. Stallman <rms@gnu.org>
parents: 2171
diff changeset
3329 xprompt = prompt;
98b714786ad0 (Fy_or_n_p): Handle `recenter' response type.
Richard M. Stallman <rms@gnu.org>
parents: 2171
diff changeset
3330 continue;
98b714786ad0 (Fy_or_n_p): Handle `recenter' response type.
Richard M. Stallman <rms@gnu.org>
parents: 2171
diff changeset
3331 }
2091
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3332 else if (EQ (def, intern ("quit")))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3333 Vquit_flag = Qt;
10059
c1b138be512e (Fy_or_n_p): Handle exit-prefix in query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 10006
diff changeset
3334 /* We want to exit this command for exit-prefix,
c1b138be512e (Fy_or_n_p): Handle exit-prefix in query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 10006
diff changeset
3335 and this is the only way to do it. */
c1b138be512e (Fy_or_n_p): Handle exit-prefix in query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 10006
diff changeset
3336 else if (EQ (def, intern ("exit-prefix")))
c1b138be512e (Fy_or_n_p): Handle exit-prefix in query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 10006
diff changeset
3337 Vquit_flag = Qt;
2091
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3338
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3339 QUIT;
1194
e0a970069f9e Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1193
diff changeset
3340
e0a970069f9e Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1193
diff changeset
3341 /* If we don't clear this, then the next call to read_char will
e0a970069f9e Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1193
diff changeset
3342 return quit_char again, and we'll enter an infinite loop. */
1193
e1329d41271d * fns.c (Fy_or_n_p): After testing for a QUIT, clear Vquit_flag.
Jim Blandy <jimb@redhat.com>
parents: 1093
diff changeset
3343 Vquit_flag = Qnil;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3344
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3345 Fding (Qnil);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3346 Fdiscard_input ();
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3347 if (EQ (xprompt, prompt))
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3348 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3349 args[0] = build_string ("Please answer y or n. ");
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3350 args[1] = prompt;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3351 xprompt = Fconcat (2, args);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3352 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3353 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3354 UNGCPRO;
2171
4fbceca13b22 * fns.c (Fy_or_n_p): Display the answer.
Jim Blandy <jimb@redhat.com>
parents: 2091
diff changeset
3355
2525
6cf2344e6e7e (Fy_or_n_p): Echo the answer just once, at exit.
Richard M. Stallman <rms@gnu.org>
parents: 2429
diff changeset
3356 if (! noninteractive)
6cf2344e6e7e (Fy_or_n_p): Echo the answer just once, at exit.
Richard M. Stallman <rms@gnu.org>
parents: 2429
diff changeset
3357 {
6cf2344e6e7e (Fy_or_n_p): Echo the answer just once, at exit.
Richard M. Stallman <rms@gnu.org>
parents: 2429
diff changeset
3358 cursor_in_echo_area = -1;
20607
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3359 message_with_string (answer ? "%s(y or n) y" : "%s(y or n) n",
04a436e5760b (map_char_table): Unconditionally consider non-ASCII charsets.
Richard M. Stallman <rms@gnu.org>
parents: 20567
diff changeset
3360 xprompt, 0);
2525
6cf2344e6e7e (Fy_or_n_p): Echo the answer just once, at exit.
Richard M. Stallman <rms@gnu.org>
parents: 2429
diff changeset
3361 }
2171
4fbceca13b22 * fns.c (Fy_or_n_p): Display the answer.
Jim Blandy <jimb@redhat.com>
parents: 2091
diff changeset
3362
14456
fb11ccbe5c7c (Qcursor_in_echo_area): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14392
diff changeset
3363 unbind_to (count, Qnil);
2091
eedbad26e34c (Fy_or_n_p): Use query-replace-map.
Richard M. Stallman <rms@gnu.org>
parents: 1919
diff changeset
3364 return answer ? Qt : Qnil;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3365 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3366
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3367 /* This is how C code calls `yes-or-no-p' and allows the user
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3368 to redefined it.
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3369
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3370 Anything that calls this function must protect from GC! */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3371
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3372 Lisp_Object
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3373 do_yes_or_no_p (prompt)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3374 Lisp_Object prompt;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3375 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3376 return call1 (intern ("yes-or-no-p"), prompt);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3377 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3378
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3379 /* Anything that calls this function must protect from GC! */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3380
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3381 DEFUN ("yes-or-no-p", Fyes_or_no_p, Syes_or_no_p, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3382 doc: /* Ask user a yes-or-no question. Return t if answer is yes.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3383 Takes one argument, which is the string to display to ask the question.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3384 It should end in a space; `yes-or-no-p' adds `(yes or no) ' to it.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3385 The user must confirm the answer with RET,
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3386 and can edit it until it has been confirmed.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3387
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3388 Under a windowing system a dialog box will be used if `last-nonmenu-event'
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3389 is nil, and `use-dialog-box' is non-nil. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3390 (prompt)
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3391 Lisp_Object prompt;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3392 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3393 register Lisp_Object ans;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3394 Lisp_Object args[2];
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3395 struct gcpro gcpro1;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3396
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
3397 CHECK_STRING (prompt);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3398
13862
817ecef2d2d0 (Fy_or_n_p, Fyes_or_no_p): using_x_p renamed to have_menus_p.
Richard M. Stallman <rms@gnu.org>
parents: 13410
diff changeset
3399 #ifdef HAVE_MENUS
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3400 if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
18531
35a263e545b3 (Fy_or_n_p, Fyes_or_no_p): Obey use_dialog_box.
Richard M. Stallman <rms@gnu.org>
parents: 18421
diff changeset
3401 && use_dialog_box
13862
817ecef2d2d0 (Fy_or_n_p, Fyes_or_no_p): using_x_p renamed to have_menus_p.
Richard M. Stallman <rms@gnu.org>
parents: 13410
diff changeset
3402 && have_menus_p ())
6057
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3403 {
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3404 Lisp_Object pane, menu, obj;
35336
002c02db42d3 Call redisplay_preserve_echo_area with additional arg.
Gerd Moellmann <gerd@gnu.org>
parents: 34961
diff changeset
3405 redisplay_preserve_echo_area (4);
6057
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3406 pane = Fcons (Fcons (build_string ("Yes"), Qt),
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3407 Fcons (Fcons (build_string ("No"), Qnil),
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3408 Qnil));
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3409 GCPRO1 (pane);
6478
65c2e184b5d9 (Fy_or_n_p, Fyes_or_no_p): Call Fx_popup_dialog the new way.
Richard M. Stallman <rms@gnu.org>
parents: 6427
diff changeset
3410 menu = Fcons (prompt, pane);
62674
100b8f001349 (Fyes_or_no_p, Fy_or_n_p): Call Fx_popup_dialog with
Nick Roberts <nickrob@snap.net.nz>
parents: 62139
diff changeset
3411 obj = Fx_popup_dialog (Qt, menu, Qnil);
6057
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3412 UNGCPRO;
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3413 return obj;
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3414 }
13862
817ecef2d2d0 (Fy_or_n_p, Fyes_or_no_p): using_x_p renamed to have_menus_p.
Richard M. Stallman <rms@gnu.org>
parents: 13410
diff changeset
3415 #endif /* HAVE_MENUS */
6057
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3416
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3417 args[0] = prompt;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3418 args[1] = build_string ("(yes or no) ");
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3419 prompt = Fconcat (2, args);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3420
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3421 GCPRO1 (prompt);
6057
b2cc63a56415 (Fy_or_n_p): Use a popup menu if reached via mouse command.
Richard M. Stallman <rms@gnu.org>
parents: 5664
diff changeset
3422
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3423 while (1)
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3424 {
4456
cbfcf187b5da (Fyes_or_no_p): Use Qyes_or_no_p_history.
Richard M. Stallman <rms@gnu.org>
parents: 4004
diff changeset
3425 ans = Fdowncase (Fread_from_minibuffer (prompt, Qnil, Qnil, Qnil,
19542
6d3cc8864678 (Fyes_or_no_p): Call Fread_from_minibuffer
Kenichi Handa <handa@m17n.org>
parents: 19383
diff changeset
3426 Qyes_or_no_p_history, Qnil,
58379
0f1b514dc439 (Fyes_or_no_p): Call Fread_from_minibuffer with extra argument.
Luc Teirlinck <teirllm@auburn.edu>
parents: 58265
diff changeset
3427 Qnil, Qnil));
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3428 if (SCHARS (ans) == 3 && !strcmp (SDATA (ans), "yes"))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3429 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3430 UNGCPRO;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3431 return Qt;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3432 }
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3433 if (SCHARS (ans) == 2 && !strcmp (SDATA (ans), "no"))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3434 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3435 UNGCPRO;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3436 return Qnil;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3437 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3438
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3439 Fding (Qnil);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3440 Fdiscard_input ();
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3441 message ("Please answer yes or no.");
1045
2ac1c701fced * fns.c (Fyes_or_no_p): Call Fsleep_for with the appropriate
Jim Blandy <jimb@redhat.com>
parents: 1037
diff changeset
3442 Fsleep_for (make_number (2), Qnil);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3443 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3444 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3445
21791
ec09080bc3e1 (Fload_average): New arg USE_FLOATS.
Richard M. Stallman <rms@gnu.org>
parents: 21790
diff changeset
3446 DEFUN ("load-average", Fload_average, Sload_average, 0, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3447 doc: /* Return list of 1 minute, 5 minute and 15 minute load averages.
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
3448
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3449 Each of the three load averages is multiplied by 100, then converted
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3450 to integer.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3451
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3452 When USE-FLOATS is non-nil, floats will be used instead of integers.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3453 These floats are not multiplied by 100.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3454
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3455 If the 5-minute or 15-minute load averages are not available, return a
51397
6b7e048da8be Doc fixes.
Dave Love <fx@gnu.org>
parents: 51038
diff changeset
3456 shortened list, containing only those averages which are available.
6b7e048da8be Doc fixes.
Dave Love <fx@gnu.org>
parents: 51038
diff changeset
3457
6b7e048da8be Doc fixes.
Dave Love <fx@gnu.org>
parents: 51038
diff changeset
3458 An error is thrown if the load average can't be obtained. In some
6b7e048da8be Doc fixes.
Dave Love <fx@gnu.org>
parents: 51038
diff changeset
3459 cases making it work would require Emacs being installed setuid or
6b7e048da8be Doc fixes.
Dave Love <fx@gnu.org>
parents: 51038
diff changeset
3460 setgid so that it can read kernel information, and that usually isn't
6b7e048da8be Doc fixes.
Dave Love <fx@gnu.org>
parents: 51038
diff changeset
3461 advisable. */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3462 (use_floats)
21791
ec09080bc3e1 (Fload_average): New arg USE_FLOATS.
Richard M. Stallman <rms@gnu.org>
parents: 21790
diff changeset
3463 Lisp_Object use_floats;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3464 {
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
3465 double load_ave[3];
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
3466 int loads = getloadavg (load_ave, 3);
21791
ec09080bc3e1 (Fload_average): New arg USE_FLOATS.
Richard M. Stallman <rms@gnu.org>
parents: 21790
diff changeset
3467 Lisp_Object ret = Qnil;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3468
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
3469 if (loads < 0)
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
3470 error ("load-average not implemented for this operating system");
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3471
21791
ec09080bc3e1 (Fload_average): New arg USE_FLOATS.
Richard M. Stallman <rms@gnu.org>
parents: 21790
diff changeset
3472 while (loads-- > 0)
ec09080bc3e1 (Fload_average): New arg USE_FLOATS.
Richard M. Stallman <rms@gnu.org>
parents: 21790
diff changeset
3473 {
ec09080bc3e1 (Fload_average): New arg USE_FLOATS.
Richard M. Stallman <rms@gnu.org>
parents: 21790
diff changeset
3474 Lisp_Object load = (NILP (use_floats) ?
ec09080bc3e1 (Fload_average): New arg USE_FLOATS.
Richard M. Stallman <rms@gnu.org>
parents: 21790
diff changeset
3475 make_number ((int) (100.0 * load_ave[loads]))
ec09080bc3e1 (Fload_average): New arg USE_FLOATS.
Richard M. Stallman <rms@gnu.org>
parents: 21790
diff changeset
3476 : make_float (load_ave[loads]));
ec09080bc3e1 (Fload_average): New arg USE_FLOATS.
Richard M. Stallman <rms@gnu.org>
parents: 21790
diff changeset
3477 ret = Fcons (load, ret);
ec09080bc3e1 (Fload_average): New arg USE_FLOATS.
Richard M. Stallman <rms@gnu.org>
parents: 21790
diff changeset
3478 }
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3479
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
3480 return ret;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3481 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3482
39968
51a89919bc4e (Vafter_load_alist): Declare extern (w32 build problem).
Sam Steingold <sds@gnu.org>
parents: 39956
diff changeset
3483 Lisp_Object Vfeatures, Qsubfeatures;
51a89919bc4e (Vafter_load_alist): Declare extern (w32 build problem).
Sam Steingold <sds@gnu.org>
parents: 39956
diff changeset
3484 extern Lisp_Object Vafter_load_alist;
39850
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
3485
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
3486 DEFUN ("featurep", Ffeaturep, Sfeaturep, 1, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3487 doc: /* Returns t if FEATURE is present in this Emacs.
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
3488
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3489 Use this to conditionalize execution of lisp code based on the
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3490 presence or absence of emacs or environment extensions.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3491 Use `provide' to declare that a feature is available. This function
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3492 looks at the value of the variable `features'. The optional argument
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3493 SUBFEATURE can be used to check a specific subfeature of FEATURE. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3494 (feature, subfeature)
39850
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
3495 Lisp_Object feature, subfeature;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3496 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3497 register Lisp_Object tem;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
3498 CHECK_SYMBOL (feature);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3499 tem = Fmemq (feature, Vfeatures);
39850
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
3500 if (!NILP (tem) && !NILP (subfeature))
44066
d0bef01f3cb3 (Ffeaturep): Allow subfeature to be a list (test using
Kim F. Storm <storm@cua.dk>
parents: 41006
diff changeset
3501 tem = Fmember (subfeature, Fget (feature, Qsubfeatures));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
3502 return (NILP (tem)) ? Qnil : Qt;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3503 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3504
39850
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
3505 DEFUN ("provide", Fprovide, Sprovide, 1, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3506 doc: /* Announce that FEATURE is a feature of the current Emacs.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3507 The optional argument SUBFEATURES should be a list of symbols listing
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3508 particular subfeatures supported in this version of FEATURE. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3509 (feature, subfeatures)
39850
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
3510 Lisp_Object feature, subfeatures;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3511 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3512 register Lisp_Object tem;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
3513 CHECK_SYMBOL (feature);
44066
d0bef01f3cb3 (Ffeaturep): Allow subfeature to be a list (test using
Kim F. Storm <storm@cua.dk>
parents: 41006
diff changeset
3514 CHECK_LIST (subfeatures);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
3515 if (!NILP (Vautoload_queue))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3516 Vautoload_queue = Fcons (Fcons (Vfeatures, Qnil), Vautoload_queue);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3517 tem = Fmemq (feature, Vfeatures);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
3518 if (NILP (tem))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3519 Vfeatures = Fcons (feature, Vfeatures);
39850
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
3520 if (!NILP (subfeatures))
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
3521 Fput (feature, Qsubfeatures, subfeatures);
2546
c8cd694d70eb (provide, require): Put appropriately-marked
Richard M. Stallman <rms@gnu.org>
parents: 2525
diff changeset
3522 LOADHIST_ATTACH (Fcons (Qprovide, feature));
39850
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
3523
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
3524 /* Run any load-hooks for this file. */
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
3525 tem = Fassq (feature, Vafter_load_alist);
46221
2f81e2382d8d (Fnconc): Use XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45650
diff changeset
3526 if (CONSP (tem))
2f81e2382d8d (Fnconc): Use XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45650
diff changeset
3527 Fprogn (XCDR (tem));
39850
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
3528
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3529 return feature;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3530 }
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3531
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3532 /* `require' and its subroutines. */
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3533
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3534 /* List of features currently being require'd, innermost first. */
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3535
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3536 Lisp_Object require_nesting_list;
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3537
40550
56075abda301 (require_unwind): Return Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 40474
diff changeset
3538 Lisp_Object
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3539 require_unwind (old_value)
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3540 Lisp_Object old_value;
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3541 {
40550
56075abda301 (require_unwind): Return Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 40474
diff changeset
3542 return require_nesting_list = old_value;
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3543 }
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3544
23733
e963fc8ca03f (Frequire): New arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents: 23690
diff changeset
3545 DEFUN ("require", Frequire, Srequire, 1, 3, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3546 doc: /* If feature FEATURE is not loaded, load it from FILENAME.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3547 If FEATURE is not a member of the list `features', then the feature
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3548 is not loaded; so load the file FILENAME.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3549 If FILENAME is omitted, the printname of FEATURE is used as the file name,
52766
ada153c6900b (Frequire): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 52401
diff changeset
3550 and `load' will try to load this name appended with the suffix `.elc' or
ada153c6900b (Frequire): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 52401
diff changeset
3551 `.el', in that order. The name without appended suffix will not be used.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3552 If the optional third argument NOERROR is non-nil,
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3553 then return nil if the file is not found instead of signaling an error.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3554 Normally the return value is FEATURE.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3555 The normal messages at start and end of loading FILENAME are suppressed. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3556 (feature, filename, noerror)
37208
34075f64de15 (Frequire): Doc fix. Rename parameter FILE_NAME to
Gerd Moellmann <gerd@gnu.org>
parents: 36890
diff changeset
3557 Lisp_Object feature, filename, noerror;
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3558 {
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3559 register Lisp_Object tem;
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3560 struct gcpro gcpro1, gcpro2;
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3561
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
3562 CHECK_SYMBOL (feature);
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3563
59490
dc3b1db0bed2 (Frequire): Record in load-history unconditionally.
Richard M. Stallman <rms@gnu.org>
parents: 59146
diff changeset
3564 /* Record the presence of `require' in this file
61417
93f7c57762e3 (Vloads_in_progress): Add extern.
Richard M. Stallman <rms@gnu.org>
parents: 59630
diff changeset
3565 even if the feature specified is already loaded.
93f7c57762e3 (Vloads_in_progress): Add extern.
Richard M. Stallman <rms@gnu.org>
parents: 59630
diff changeset
3566 But not more than once in any file,
93f7c57762e3 (Vloads_in_progress): Add extern.
Richard M. Stallman <rms@gnu.org>
parents: 59630
diff changeset
3567 and not when we aren't loading a file. */
61622
aef105b11011 (Vloads_in_progress): Remove extern.
Lute Kamstra <lute@gnu.org>
parents: 61433
diff changeset
3568 if (load_in_progress)
61417
93f7c57762e3 (Vloads_in_progress): Add extern.
Richard M. Stallman <rms@gnu.org>
parents: 59630
diff changeset
3569 {
93f7c57762e3 (Vloads_in_progress): Add extern.
Richard M. Stallman <rms@gnu.org>
parents: 59630
diff changeset
3570 tem = Fcons (Qrequire, feature);
93f7c57762e3 (Vloads_in_progress): Add extern.
Richard M. Stallman <rms@gnu.org>
parents: 59630
diff changeset
3571 if (NILP (Fmember (tem, Vcurrent_load_list)))
93f7c57762e3 (Vloads_in_progress): Add extern.
Richard M. Stallman <rms@gnu.org>
parents: 59630
diff changeset
3572 LOADHIST_ATTACH (tem);
93f7c57762e3 (Vloads_in_progress): Add extern.
Richard M. Stallman <rms@gnu.org>
parents: 59630
diff changeset
3573 }
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3574 tem = Fmemq (feature, Vfeatures);
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
3575
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
3576 if (NILP (tem))
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3577 {
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46221
diff changeset
3578 int count = SPECPDL_INDEX ();
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3579 int nesting = 0;
45037
8fe017cea042 (Frequire): Error if called while preparing to dump.
Richard M. Stallman <rms@gnu.org>
parents: 44760
diff changeset
3580
45039
ed0ad59e4ec7 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 45037
diff changeset
3581 /* This is to make sure that loadup.el gives a clear picture
ed0ad59e4ec7 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 45037
diff changeset
3582 of what files are preloaded and when. */
45037
8fe017cea042 (Frequire): Error if called while preparing to dump.
Richard M. Stallman <rms@gnu.org>
parents: 44760
diff changeset
3583 if (! NILP (Vpurify_flag))
8fe017cea042 (Frequire): Error if called while preparing to dump.
Richard M. Stallman <rms@gnu.org>
parents: 44760
diff changeset
3584 error ("(require %s) while preparing to dump",
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3585 SDATA (SYMBOL_NAME (feature)));
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
3586
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3587 /* A certain amount of recursive `require' is legitimate,
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3588 but if we require the same feature recursively 3 times,
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3589 signal an error. */
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3590 tem = require_nesting_list;
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3591 while (! NILP (tem))
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3592 {
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3593 if (! NILP (Fequal (feature, XCAR (tem))))
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3594 nesting++;
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3595 tem = XCDR (tem);
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3596 }
48567
ecf43ac20827 fns.c (Frequire): Change nesting allowance from 2 to 3 to cause more
Steven Tamm <steventamm@mac.com>
parents: 48337
diff changeset
3597 if (nesting > 3)
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3598 error ("Recursive `require' for feature `%s'",
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3599 SDATA (SYMBOL_NAME (feature)));
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3600
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3601 /* Update the list for any nested `require's that occur. */
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3602 record_unwind_protect (require_unwind, require_nesting_list);
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3603 require_nesting_list = Fcons (feature, require_nesting_list);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3604
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3605 /* Value saved here is to be restored into Vautoload_queue */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3606 record_unwind_protect (un_autoload, Vautoload_queue);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3607 Vautoload_queue = Qt;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3608
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3609 /* Load the file. */
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3610 GCPRO2 (feature, filename);
37208
34075f64de15 (Frequire): Doc fix. Rename parameter FILE_NAME to
Gerd Moellmann <gerd@gnu.org>
parents: 36890
diff changeset
3611 tem = Fload (NILP (filename) ? Fsymbol_name (feature) : filename,
34075f64de15 (Frequire): Doc fix. Rename parameter FILE_NAME to
Gerd Moellmann <gerd@gnu.org>
parents: 36890
diff changeset
3612 noerror, Qt, Qnil, (NILP (filename) ? Qt : Qnil));
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3613 UNGCPRO;
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3614
23733
e963fc8ca03f (Frequire): New arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents: 23690
diff changeset
3615 /* If load failed entirely, return nil. */
e963fc8ca03f (Frequire): New arg NOERROR.
Richard M. Stallman <rms@gnu.org>
parents: 23690
diff changeset
3616 if (NILP (tem))
24016
43344f47a865 (Frequire): Don't fail to unbind bindings.
Richard M. Stallman <rms@gnu.org>
parents: 23927
diff changeset
3617 return unbind_to (count, Qnil);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3618
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3619 tem = Fmemq (feature, Vfeatures);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 414
diff changeset
3620 if (NILP (tem))
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3621 error ("Required feature `%s' was not provided",
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3622 SDATA (SYMBOL_NAME (feature)));
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3623
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3624 /* Once loading finishes, don't undo it. */
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3625 Vautoload_queue = Qt;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3626 feature = unbind_to (count, feature);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3627 }
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
3628
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3629 return feature;
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3630 }
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3631
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3632 /* Primitives for work of the "widget" library.
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3633 In an ideal world, this section would not have been necessary.
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3634 However, lisp function calls being as slow as they are, it turns
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3635 out that some functions in the widget library (wid-edit.el) are the
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3636 bottleneck of Widget operation. Here is their translation to C,
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3637 for the sole reason of efficiency. */
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3638
29953
dad7b11391a3 (Fplist_member): Renamed from Fwidget_plist_member.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29809
diff changeset
3639 DEFUN ("plist-member", Fplist_member, Splist_member, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3640 doc: /* Return non-nil if PLIST has the property PROP.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3641 PLIST is a property list, which is a list of the form
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3642 \(PROP1 VALUE1 PROP2 VALUE2 ...\). PROP is a symbol.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3643 Unlike `plist-get', this allows you to distinguish between a missing
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3644 property and a property with the value nil.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3645 The value is actually the tail of PLIST whose car is PROP. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3646 (plist, prop)
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3647 Lisp_Object plist, prop;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3648 {
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3649 while (CONSP (plist) && !EQ (XCAR (plist), prop))
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3650 {
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3651 QUIT;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3652 plist = XCDR (plist);
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3653 plist = CDR (plist);
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3654 }
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3655 return plist;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3656 }
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3657
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3658 DEFUN ("widget-put", Fwidget_put, Swidget_put, 3, 3, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3659 doc: /* In WIDGET, set PROPERTY to VALUE.
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3660 The value can later be retrieved with `widget-get'. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3661 (widget, property, value)
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3662 Lisp_Object widget, property, value;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3663 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
3664 CHECK_CONS (widget);
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39968
diff changeset
3665 XSETCDR (widget, Fplist_put (XCDR (widget), property, value));
23207
302eccdcb73c (Fwidget_put): Return VALUE instead of garbage.
Karl Heuer <kwzh@gnu.org>
parents: 23152
diff changeset
3666 return value;
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3667 }
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3668
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3669 DEFUN ("widget-get", Fwidget_get, Swidget_get, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3670 doc: /* In WIDGET, get the value of PROPERTY.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3671 The value could either be specified when the widget was created, or
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3672 later with `widget-put'. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3673 (widget, property)
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3674 Lisp_Object widget, property;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3675 {
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3676 Lisp_Object tmp;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3677
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3678 while (1)
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3679 {
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3680 if (NILP (widget))
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3681 return Qnil;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
3682 CHECK_CONS (widget);
29953
dad7b11391a3 (Fplist_member): Renamed from Fwidget_plist_member.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29809
diff changeset
3683 tmp = Fplist_member (XCDR (widget), property);
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3684 if (CONSP (tmp))
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3685 {
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3686 tmp = XCDR (tmp);
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3687 return CAR (tmp);
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3688 }
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3689 tmp = XCAR (widget);
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3690 if (NILP (tmp))
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3691 return Qnil;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3692 widget = Fget (tmp, Qwidget_type);
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3693 }
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3694 }
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3695
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3696 DEFUN ("widget-apply", Fwidget_apply, Swidget_apply, 2, MANY, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3697 doc: /* Apply the value of WIDGET's PROPERTY to the widget itself.
40132
75fe73bea452 (Fappend, Fconcat, Fvconcat, Fnconc, Fwidget_apply, Fmake_hash_table):
Miles Bader <miles@gnu.org>
parents: 39977
diff changeset
3698 ARGS are passed as extra arguments to the function.
75fe73bea452 (Fappend, Fconcat, Fvconcat, Fnconc, Fwidget_apply, Fmake_hash_table):
Miles Bader <miles@gnu.org>
parents: 39977
diff changeset
3699 usage: (widget-apply WIDGET PROPERTY &rest ARGS) */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3700 (nargs, args)
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3701 int nargs;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3702 Lisp_Object *args;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3703 {
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3704 /* This function can GC. */
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3705 Lisp_Object newargs[3];
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3706 struct gcpro gcpro1, gcpro2;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3707 Lisp_Object result;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3708
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3709 newargs[0] = Fwidget_get (args[0], args[1]);
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3710 newargs[1] = args[0];
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3711 newargs[2] = Flist (nargs - 2, args + 2);
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3712 GCPRO2 (newargs[0], newargs[2]);
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3713 result = Fapply (3, newargs);
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3714 UNGCPRO;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3715 return result;
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3716 }
49081
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3717
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3718 #ifdef HAVE_LANGINFO_CODESET
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3719 #include <langinfo.h>
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3720 #endif
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3721
51976
26f7a240c793 (Flocale_info): Renamed from Flanginfo. Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 51768
diff changeset
3722 DEFUN ("locale-info", Flocale_info, Slocale_info, 1, 1, 0,
26f7a240c793 (Flocale_info): Renamed from Flanginfo. Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 51768
diff changeset
3723 doc: /* Access locale data ITEM for the current C locale, if available.
26f7a240c793 (Flocale_info): Renamed from Flanginfo. Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 51768
diff changeset
3724 ITEM should be one of the following:
51397
6b7e048da8be Doc fixes.
Dave Love <fx@gnu.org>
parents: 51038
diff changeset
3725
49798
48a58e6b11cc (Flanginfo): Doc fix.
Dave Love <fx@gnu.org>
parents: 49674
diff changeset
3726 `codeset', returning the character set as a string (locale item CODESET);
51397
6b7e048da8be Doc fixes.
Dave Love <fx@gnu.org>
parents: 51038
diff changeset
3727
49798
48a58e6b11cc (Flanginfo): Doc fix.
Dave Love <fx@gnu.org>
parents: 49674
diff changeset
3728 `days', returning a 7-element vector of day names (locale items DAY_n);
51397
6b7e048da8be Doc fixes.
Dave Love <fx@gnu.org>
parents: 51038
diff changeset
3729
49798
48a58e6b11cc (Flanginfo): Doc fix.
Dave Love <fx@gnu.org>
parents: 49674
diff changeset
3730 `months', returning a 12-element vector of month names (locale items MON_n);
51397
6b7e048da8be Doc fixes.
Dave Love <fx@gnu.org>
parents: 51038
diff changeset
3731
51976
26f7a240c793 (Flocale_info): Renamed from Flanginfo. Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 51768
diff changeset
3732 `paper', returning a list (WIDTH HEIGHT) for the default paper size,
26f7a240c793 (Flocale_info): Renamed from Flanginfo. Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 51768
diff changeset
3733 both measured in milimeters (locale items PAPER_WIDTH, PAPER_HEIGHT).
49081
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3734
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3735 If the system can't provide such information through a call to
51976
26f7a240c793 (Flocale_info): Renamed from Flanginfo. Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 51768
diff changeset
3736 `nl_langinfo', or if ITEM isn't from the list above, return nil.
49081
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3737
49798
48a58e6b11cc (Flanginfo): Doc fix.
Dave Love <fx@gnu.org>
parents: 49674
diff changeset
3738 See also Info node `(libc)Locales'.
48a58e6b11cc (Flanginfo): Doc fix.
Dave Love <fx@gnu.org>
parents: 49674
diff changeset
3739
49081
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3740 The data read from the system are decoded using `locale-coding-system'. */)
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3741 (item)
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3742 Lisp_Object item;
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3743 {
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3744 char *str = NULL;
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3745 #ifdef HAVE_LANGINFO_CODESET
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3746 Lisp_Object val;
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3747 if (EQ (item, Qcodeset))
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3748 {
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3749 str = nl_langinfo (CODESET);
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3750 return build_string (str);
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3751 }
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3752 #ifdef DAY_1
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3753 else if (EQ (item, Qdays)) /* e.g. for calendar-day-name-array */
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3754 {
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3755 Lisp_Object v = Fmake_vector (make_number (7), Qnil);
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3756 int days[7] = {DAY_1, DAY_2, DAY_3, DAY_4, DAY_5, DAY_6, DAY_7};
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3757 int i;
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3758 synchronize_system_time_locale ();
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3759 for (i = 0; i < 7; i++)
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3760 {
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3761 str = nl_langinfo (days[i]);
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3762 val = make_unibyte_string (str, strlen (str));
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3763 /* Fixme: Is this coding system necessarily right, even if
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3764 it is consistent with CODESET? If not, what to do? */
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3765 Faset (v, make_number (i),
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3766 code_convert_string_norecord (val, Vlocale_coding_system,
49915
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
3767 0));
49081
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3768 }
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3769 return v;
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3770 }
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3771 #endif /* DAY_1 */
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3772 #ifdef MON_1
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3773 else if (EQ (item, Qmonths)) /* e.g. for calendar-month-name-array */
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3774 {
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3775 struct Lisp_Vector *p = allocate_vector (12);
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3776 int months[12] = {MON_1, MON_2, MON_3, MON_4, MON_5, MON_6, MON_7,
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3777 MON_8, MON_9, MON_10, MON_11, MON_12};
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3778 int i;
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3779 synchronize_system_time_locale ();
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3780 for (i = 0; i < 12; i++)
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3781 {
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3782 str = nl_langinfo (months[i]);
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3783 val = make_unibyte_string (str, strlen (str));
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3784 p->contents[i] =
49915
95557d4395b0 (string_to_multibyte): Remove unused var i.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49815
diff changeset
3785 code_convert_string_norecord (val, Vlocale_coding_system, 0);
49081
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3786 }
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3787 XSETVECTOR (val, p);
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3788 return val;
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3789 }
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3790 #endif /* MON_1 */
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3791 /* LC_PAPER stuff isn't defined as accessible in glibc as of 2.3.1,
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3792 but is in the locale files. This could be used by ps-print. */
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3793 #ifdef PAPER_WIDTH
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3794 else if (EQ (item, Qpaper))
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3795 {
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3796 return list2 (make_number (nl_langinfo (PAPER_WIDTH)),
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3797 make_number (nl_langinfo (PAPER_HEIGHT)));
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3798 }
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3799 #endif /* PAPER_WIDTH */
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3800 #endif /* HAVE_LANGINFO_CODESET*/
51397
6b7e048da8be Doc fixes.
Dave Love <fx@gnu.org>
parents: 51038
diff changeset
3801 return Qnil;
49081
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
3802 }
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
3803
32234
811419e9e769 (Fbase64_encode_region, Fbase64_encode_string)
Dave Love <fx@gnu.org>
parents: 31865
diff changeset
3804 /* base64 encode/decode functions (RFC 2045).
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3805 Based on code from GNU recode. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3806
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3807 #define MIME_LINE_LENGTH 76
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3808
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3809 #define IS_ASCII(Character) \
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3810 ((Character) < 128)
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3811 #define IS_BASE64(Character) \
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3812 (IS_ASCII (Character) && base64_char_to_value[Character] >= 0)
24275
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
3813 #define IS_BASE64_IGNORABLE(Character) \
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
3814 ((Character) == ' ' || (Character) == '\t' || (Character) == '\n' \
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
3815 || (Character) == '\f' || (Character) == '\r')
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
3816
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
3817 /* Used by base64_decode_1 to retrieve a non-base64-ignorable
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
3818 character or return retval if there are no characters left to
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
3819 process. */
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
3820 #define READ_QUADRUPLET_BYTE(retval) \
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
3821 do \
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
3822 { \
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
3823 if (i == length) \
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
3824 { \
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
3825 if (nchars_return) \
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
3826 *nchars_return = nchars; \
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
3827 return (retval); \
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
3828 } \
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
3829 c = from[i++]; \
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
3830 } \
24275
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
3831 while (IS_BASE64_IGNORABLE (c))
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3832
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3833 /* Table of characters coding the 64 values. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3834 static char base64_value_to_char[64] =
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3835 {
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3836 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', /* 0- 9 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3837 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', /* 10-19 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3838 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', /* 20-29 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3839 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', /* 30-39 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3840 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', /* 40-49 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3841 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', /* 50-59 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3842 '8', '9', '+', '/' /* 60-63 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3843 };
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3844
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3845 /* Table of base64 values for first 128 characters. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3846 static short base64_char_to_value[128] =
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3847 {
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3848 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0- 9 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3849 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 10- 19 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3850 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 20- 29 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3851 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 30- 39 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3852 -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, /* 40- 49 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3853 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, /* 50- 59 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3854 -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, /* 60- 69 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3855 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* 70- 79 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3856 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, /* 80- 89 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3857 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, /* 90- 99 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3858 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, /* 100-109 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3859 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, /* 110-119 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3860 49, 50, 51, -1, -1, -1, -1, -1 /* 120-127 */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3861 };
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3862
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3863 /* The following diagram shows the logical steps by which three octets
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3864 get transformed into four base64 characters.
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3865
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3866 .--------. .--------. .--------.
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3867 |aaaaaabb| |bbbbcccc| |ccdddddd|
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3868 `--------' `--------' `--------'
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3869 6 2 4 4 2 6
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3870 .--------+--------+--------+--------.
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3871 |00aaaaaa|00bbbbbb|00cccccc|00dddddd|
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3872 `--------+--------+--------+--------'
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3873
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3874 .--------+--------+--------+--------.
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3875 |AAAAAAAA|BBBBBBBB|CCCCCCCC|DDDDDDDD|
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3876 `--------+--------+--------+--------'
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3877
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3878 The octets are divided into 6 bit chunks, which are then encoded into
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3879 base64 characters. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3880
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3881
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3882 static int base64_encode_1 P_ ((const char *, char *, int, int, int));
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
3883 static int base64_decode_1 P_ ((const char *, char *, int, int, int *));
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3884
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3885 DEFUN ("base64-encode-region", Fbase64_encode_region, Sbase64_encode_region,
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3886 2, 3, "r",
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3887 doc: /* Base64-encode the region between BEG and END.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3888 Return the length of the encoded text.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3889 Optional third argument NO-LINE-BREAK means do not break long lines
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3890 into shorter lines. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3891 (beg, end, no_line_break)
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3892 Lisp_Object beg, end, no_line_break;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3893 {
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3894 char *encoded;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3895 int allength, length;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3896 int ibeg, iend, encoded_length;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3897 int old_pos = PT;
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3898 USE_SAFE_ALLOCA;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3899
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3900 validate_region (&beg, &end);
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3901
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3902 ibeg = CHAR_TO_BYTE (XFASTINT (beg));
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3903 iend = CHAR_TO_BYTE (XFASTINT (end));
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3904 move_gap_both (XFASTINT (beg), ibeg);
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3905
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3906 /* We need to allocate enough room for encoding the text.
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3907 We need 33 1/3% more space, plus a newline every 76
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3908 characters, and then we round up. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3909 length = iend - ibeg;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3910 allength = length + length/3 + 1;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3911 allength += allength / MIME_LINE_LENGTH + 1 + 6;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3912
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3913 SAFE_ALLOCA (encoded, char *, allength);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3914 encoded_length = base64_encode_1 (BYTE_POS_ADDR (ibeg), encoded, length,
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3915 NILP (no_line_break),
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3916 !NILP (current_buffer->enable_multibyte_characters));
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3917 if (encoded_length > allength)
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3918 abort ();
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3919
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3920 if (encoded_length < 0)
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3921 {
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3922 /* The encoding wasn't possible. */
57726
66e97a54985f Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents: 57482
diff changeset
3923 SAFE_FREE ();
32234
811419e9e769 (Fbase64_encode_region, Fbase64_encode_string)
Dave Love <fx@gnu.org>
parents: 31865
diff changeset
3924 error ("Multibyte character in data for base64 encoding");
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3925 }
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3926
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3927 /* Now we have encoded the region, so we insert the new contents
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3928 and delete the old. (Insert first in order to preserve markers.) */
23579
3d1bb0100afb (Fbase64_encode_region): Use SET_PT_BOTH instead of SET_PT
Andreas Schwab <schwab@suse.de>
parents: 23557
diff changeset
3929 SET_PT_BOTH (XFASTINT (beg), ibeg);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3930 insert (encoded, encoded_length);
57726
66e97a54985f Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents: 57482
diff changeset
3931 SAFE_FREE ();
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3932 del_range_byte (ibeg + encoded_length, iend + encoded_length, 1);
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3933
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3934 /* If point was outside of the region, restore it exactly; else just
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3935 move to the beginning of the region. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3936 if (old_pos >= XFASTINT (end))
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3937 old_pos += encoded_length - (XFASTINT (end) - XFASTINT (beg));
23579
3d1bb0100afb (Fbase64_encode_region): Use SET_PT_BOTH instead of SET_PT
Andreas Schwab <schwab@suse.de>
parents: 23557
diff changeset
3938 else if (old_pos > XFASTINT (beg))
3d1bb0100afb (Fbase64_encode_region): Use SET_PT_BOTH instead of SET_PT
Andreas Schwab <schwab@suse.de>
parents: 23557
diff changeset
3939 old_pos = XFASTINT (beg);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3940 SET_PT (old_pos);
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3941
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3942 /* We return the length of the encoded text. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3943 return make_number (encoded_length);
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3944 }
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3945
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3946 DEFUN ("base64-encode-string", Fbase64_encode_string, Sbase64_encode_string,
24334
c56b72e5f29d (Fbase64_encode_string): New optional argument `NO_LINE_BREAK'.
Kenichi Handa <handa@m17n.org>
parents: 24280
diff changeset
3947 1, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3948 doc: /* Base64-encode STRING and return the result.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
3949 Optional second argument NO-LINE-BREAK means do not break long lines
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3950 into shorter lines. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
3951 (string, no_line_break)
24377
f881dd22ec7d (Fbase64_encode_string): Fix last change.
Andreas Schwab <schwab@suse.de>
parents: 24334
diff changeset
3952 Lisp_Object string, no_line_break;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3953 {
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3954 int allength, length, encoded_length;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3955 char *encoded;
23690
5149f79d6dfd (MAX_ALLOCA): New macro.
Eli Zaretskii <eliz@gnu.org>
parents: 23595
diff changeset
3956 Lisp_Object encoded_string;
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3957 USE_SAFE_ALLOCA;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3958
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
3959 CHECK_STRING (string);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3960
24437
8a9d8919ebe8 (Fbase64_encode_string): Allocate sufficient memory for
Kenichi Handa <handa@m17n.org>
parents: 24377
diff changeset
3961 /* We need to allocate enough room for encoding the text.
8a9d8919ebe8 (Fbase64_encode_string): Allocate sufficient memory for
Kenichi Handa <handa@m17n.org>
parents: 24377
diff changeset
3962 We need 33 1/3% more space, plus a newline every 76
8a9d8919ebe8 (Fbase64_encode_string): Allocate sufficient memory for
Kenichi Handa <handa@m17n.org>
parents: 24377
diff changeset
3963 characters, and then we round up. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3964 length = SBYTES (string);
24437
8a9d8919ebe8 (Fbase64_encode_string): Allocate sufficient memory for
Kenichi Handa <handa@m17n.org>
parents: 24377
diff changeset
3965 allength = length + length/3 + 1;
8a9d8919ebe8 (Fbase64_encode_string): Allocate sufficient memory for
Kenichi Handa <handa@m17n.org>
parents: 24377
diff changeset
3966 allength += allength / MIME_LINE_LENGTH + 1 + 6;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3967
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3968 /* We need to allocate enough room for decoding the text. */
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
3969 SAFE_ALLOCA (encoded, char *, allength);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3970
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3971 encoded_length = base64_encode_1 (SDATA (string),
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3972 encoded, length, NILP (no_line_break),
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3973 STRING_MULTIBYTE (string));
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3974 if (encoded_length > allength)
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3975 abort ();
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3976
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3977 if (encoded_length < 0)
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3978 {
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3979 /* The encoding wasn't possible. */
57726
66e97a54985f Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents: 57482
diff changeset
3980 SAFE_FREE ();
32234
811419e9e769 (Fbase64_encode_region, Fbase64_encode_string)
Dave Love <fx@gnu.org>
parents: 31865
diff changeset
3981 error ("Multibyte character in data for base64 encoding");
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3982 }
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3983
23690
5149f79d6dfd (MAX_ALLOCA): New macro.
Eli Zaretskii <eliz@gnu.org>
parents: 23595
diff changeset
3984 encoded_string = make_unibyte_string (encoded, encoded_length);
57726
66e97a54985f Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents: 57482
diff changeset
3985 SAFE_FREE ();
23690
5149f79d6dfd (MAX_ALLOCA): New macro.
Eli Zaretskii <eliz@gnu.org>
parents: 23595
diff changeset
3986
5149f79d6dfd (MAX_ALLOCA): New macro.
Eli Zaretskii <eliz@gnu.org>
parents: 23595
diff changeset
3987 return encoded_string;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3988 }
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3989
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3990 static int
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3991 base64_encode_1 (from, to, length, line_break, multibyte)
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3992 const char *from;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3993 char *to;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3994 int length;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3995 int line_break;
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
3996 int multibyte;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3997 {
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3998 int counter = 0, i = 0;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
3999 char *e = to;
31865
dd9aa7db6710 (base64_encode_1): Fix last change.
Dave Love <fx@gnu.org>
parents: 31842
diff changeset
4000 int c;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4001 unsigned int value;
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4002 int bytes;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4003
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4004 while (i < length)
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4005 {
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4006 if (multibyte)
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4007 {
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4008 c = STRING_CHAR_AND_LENGTH (from + i, length - i, bytes);
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4009 if (c >= 256)
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4010 return -1;
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4011 i += bytes;
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4012 }
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4013 else
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4014 c = from[i++];
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4015
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4016 /* Wrap line every 76 characters. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4017
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4018 if (line_break)
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4019 {
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4020 if (counter < MIME_LINE_LENGTH / 4)
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4021 counter++;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4022 else
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4023 {
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4024 *e++ = '\n';
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4025 counter = 1;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4026 }
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4027 }
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4028
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4029 /* Process first byte of a triplet. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4030
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4031 *e++ = base64_value_to_char[0x3f & c >> 2];
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4032 value = (0x03 & c) << 4;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4033
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4034 /* Process second byte of a triplet. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4035
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4036 if (i == length)
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4037 {
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4038 *e++ = base64_value_to_char[value];
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4039 *e++ = '=';
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4040 *e++ = '=';
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4041 break;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4042 }
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4043
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4044 if (multibyte)
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4045 {
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4046 c = STRING_CHAR_AND_LENGTH (from + i, length - i, bytes);
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4047 if (c >= 256)
31865
dd9aa7db6710 (base64_encode_1): Fix last change.
Dave Love <fx@gnu.org>
parents: 31842
diff changeset
4048 return -1;
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4049 i += bytes;
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4050 }
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4051 else
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4052 c = from[i++];
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4053
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4054 *e++ = base64_value_to_char[value | (0x0f & c >> 4)];
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4055 value = (0x0f & c) << 2;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4056
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4057 /* Process third byte of a triplet. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4058
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4059 if (i == length)
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4060 {
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4061 *e++ = base64_value_to_char[value];
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4062 *e++ = '=';
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4063 break;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4064 }
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4065
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4066 if (multibyte)
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4067 {
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4068 c = STRING_CHAR_AND_LENGTH (from + i, length - i, bytes);
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4069 if (c >= 256)
31865
dd9aa7db6710 (base64_encode_1): Fix last change.
Dave Love <fx@gnu.org>
parents: 31842
diff changeset
4070 return -1;
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4071 i += bytes;
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4072 }
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4073 else
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4074 c = from[i++];
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4075
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4076 *e++ = base64_value_to_char[value | (0x03 & c >> 6)];
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4077 *e++ = base64_value_to_char[0x3f & c];
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4078 }
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4079
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4080 return e - to;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4081 }
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4082
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4083
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4084 DEFUN ("base64-decode-region", Fbase64_decode_region, Sbase64_decode_region,
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
4085 2, 2, "r",
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
4086 doc: /* Base64-decode the region between BEG and END.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
4087 Return the length of the decoded text.
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
4088 If the region can't be decoded, signal an error and don't modify the buffer. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
4089 (beg, end)
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4090 Lisp_Object beg, end;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4091 {
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4092 int ibeg, iend, length, allength;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4093 char *decoded;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4094 int old_pos = PT;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4095 int decoded_length;
23536
0154f51c56d8 (Fbase64_decode_region): Pay attention to the byte
Kenichi Handa <handa@m17n.org>
parents: 23453
diff changeset
4096 int inserted_chars;
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4097 int multibyte = !NILP (current_buffer->enable_multibyte_characters);
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
4098 USE_SAFE_ALLOCA;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4099
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4100 validate_region (&beg, &end);
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4101
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4102 ibeg = CHAR_TO_BYTE (XFASTINT (beg));
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4103 iend = CHAR_TO_BYTE (XFASTINT (end));
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4104
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4105 length = iend - ibeg;
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4106
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4107 /* We need to allocate enough room for decoding the text. If we are
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4108 working on a multibyte buffer, each decoded code may occupy at
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4109 most two bytes. */
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4110 allength = multibyte ? length * 2 : length;
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
4111 SAFE_ALLOCA (decoded, char *, allength);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4112
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4113 move_gap_both (XFASTINT (beg), ibeg);
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4114 decoded_length = base64_decode_1 (BYTE_POS_ADDR (ibeg), decoded, length,
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4115 multibyte, &inserted_chars);
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4116 if (decoded_length > allength)
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4117 abort ();
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4118
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4119 if (decoded_length < 0)
23901
974c8a7b79e8 (Fbase64_decode_region, Fbase64_decode_string):
Karl Heuer <kwzh@gnu.org>
parents: 23877
diff changeset
4120 {
974c8a7b79e8 (Fbase64_decode_region, Fbase64_decode_string):
Karl Heuer <kwzh@gnu.org>
parents: 23877
diff changeset
4121 /* The decoding wasn't possible. */
57726
66e97a54985f Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents: 57482
diff changeset
4122 SAFE_FREE ();
32234
811419e9e769 (Fbase64_encode_region, Fbase64_encode_string)
Dave Love <fx@gnu.org>
parents: 31865
diff changeset
4123 error ("Invalid base64 data");
23901
974c8a7b79e8 (Fbase64_decode_region, Fbase64_decode_string):
Karl Heuer <kwzh@gnu.org>
parents: 23877
diff changeset
4124 }
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4125
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4126 /* Now we have decoded the region, so we insert the new contents
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4127 and delete the old. (Insert first in order to preserve markers.) */
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4128 TEMP_SET_PT_BOTH (XFASTINT (beg), ibeg);
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4129 insert_1_both (decoded, inserted_chars, decoded_length, 0, 1, 0);
57726
66e97a54985f Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents: 57482
diff changeset
4130 SAFE_FREE ();
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
4131
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4132 /* Delete the original text. */
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4133 del_range_both (PT, PT_BYTE, XFASTINT (end) + inserted_chars,
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4134 iend + decoded_length, 1);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4135
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4136 /* If point was outside of the region, restore it exactly; else just
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4137 move to the beginning of the region. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4138 if (old_pos >= XFASTINT (end))
23536
0154f51c56d8 (Fbase64_decode_region): Pay attention to the byte
Kenichi Handa <handa@m17n.org>
parents: 23453
diff changeset
4139 old_pos += inserted_chars - (XFASTINT (end) - XFASTINT (beg));
0154f51c56d8 (Fbase64_decode_region): Pay attention to the byte
Kenichi Handa <handa@m17n.org>
parents: 23453
diff changeset
4140 else if (old_pos > XFASTINT (beg))
0154f51c56d8 (Fbase64_decode_region): Pay attention to the byte
Kenichi Handa <handa@m17n.org>
parents: 23453
diff changeset
4141 old_pos = XFASTINT (beg);
25607
e1f5592218c1 (Fbase64_decode_region): Don't place point outside of the
Richard M. Stallman <rms@gnu.org>
parents: 25590
diff changeset
4142 SET_PT (old_pos > ZV ? ZV : old_pos);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4143
23536
0154f51c56d8 (Fbase64_decode_region): Pay attention to the byte
Kenichi Handa <handa@m17n.org>
parents: 23453
diff changeset
4144 return make_number (inserted_chars);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4145 }
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4146
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4147 DEFUN ("base64-decode-string", Fbase64_decode_string, Sbase64_decode_string,
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4148 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
4149 doc: /* Base64-decode STRING and return the result. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
4150 (string)
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4151 Lisp_Object string;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4152 {
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4153 char *decoded;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4154 int length, decoded_length;
23690
5149f79d6dfd (MAX_ALLOCA): New macro.
Eli Zaretskii <eliz@gnu.org>
parents: 23595
diff changeset
4155 Lisp_Object decoded_string;
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
4156 USE_SAFE_ALLOCA;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4157
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
4158 CHECK_STRING (string);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4159
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
4160 length = SBYTES (string);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4161 /* We need to allocate enough room for decoding the text. */
56195
3204d2175b6a * fns.c (string_make_multibyte, string_to_multibyte)
Kim F. Storm <storm@cua.dk>
parents: 56147
diff changeset
4162 SAFE_ALLOCA (decoded, char *, length);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4163
32753
401f661f11d4 2000-10-22 15:07:47 ShengHuo ZHU <zsh@cs.rochester.edu>
ShengHuo ZHU <zsh@cs.rochester.edu>
parents: 32351
diff changeset
4164 /* The decoded result should be unibyte. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
4165 decoded_length = base64_decode_1 (SDATA (string), decoded, length,
32753
401f661f11d4 2000-10-22 15:07:47 ShengHuo ZHU <zsh@cs.rochester.edu>
ShengHuo ZHU <zsh@cs.rochester.edu>
parents: 32351
diff changeset
4166 0, NULL);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4167 if (decoded_length > length)
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4168 abort ();
28493
9ffea423a7b0 (Fbase64_decode_region, Fbase64_decode_string): Signal
Gerd Moellmann <gerd@gnu.org>
parents: 28481
diff changeset
4169 else if (decoded_length >= 0)
29010
f62cfa81b0c4 (concat): Handle 8-bit characters correctly.
Kenichi Handa <handa@m17n.org>
parents: 28965
diff changeset
4170 decoded_string = make_unibyte_string (decoded, decoded_length);
28493
9ffea423a7b0 (Fbase64_decode_region, Fbase64_decode_string): Signal
Gerd Moellmann <gerd@gnu.org>
parents: 28481
diff changeset
4171 else
23901
974c8a7b79e8 (Fbase64_decode_region, Fbase64_decode_string):
Karl Heuer <kwzh@gnu.org>
parents: 23877
diff changeset
4172 decoded_string = Qnil;
974c8a7b79e8 (Fbase64_decode_region, Fbase64_decode_string):
Karl Heuer <kwzh@gnu.org>
parents: 23877
diff changeset
4173
57726
66e97a54985f Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Kim F. Storm <storm@cua.dk>
parents: 57482
diff changeset
4174 SAFE_FREE ();
28493
9ffea423a7b0 (Fbase64_decode_region, Fbase64_decode_string): Signal
Gerd Moellmann <gerd@gnu.org>
parents: 28481
diff changeset
4175 if (!STRINGP (decoded_string))
32234
811419e9e769 (Fbase64_encode_region, Fbase64_encode_string)
Dave Love <fx@gnu.org>
parents: 31865
diff changeset
4176 error ("Invalid base64 data");
23690
5149f79d6dfd (MAX_ALLOCA): New macro.
Eli Zaretskii <eliz@gnu.org>
parents: 23595
diff changeset
4177
5149f79d6dfd (MAX_ALLOCA): New macro.
Eli Zaretskii <eliz@gnu.org>
parents: 23595
diff changeset
4178 return decoded_string;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4179 }
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4180
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4181 /* Base64-decode the data at FROM of LENGHT bytes into TO. If
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4182 MULTIBYTE is nonzero, the decoded result should be in multibyte
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4183 form. If NCHARS_RETRUN is not NULL, store the number of produced
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4184 characters in *NCHARS_RETURN. */
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4185
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4186 static int
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4187 base64_decode_1 (from, to, length, multibyte, nchars_return)
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4188 const char *from;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4189 char *to;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4190 int length;
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4191 int multibyte;
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4192 int *nchars_return;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4193 {
24275
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
4194 int i = 0;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4195 char *e = to;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4196 unsigned char c;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4197 unsigned long value;
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4198 int nchars = 0;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4199
24275
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
4200 while (1)
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4201 {
24275
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
4202 /* Process first byte of a quadruplet. */
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
4203
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
4204 READ_QUADRUPLET_BYTE (e-to);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4205
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4206 if (!IS_BASE64 (c))
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4207 return -1;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4208 value = base64_char_to_value[c] << 18;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4209
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4210 /* Process second byte of a quadruplet. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4211
24275
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
4212 READ_QUADRUPLET_BYTE (-1);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4213
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4214 if (!IS_BASE64 (c))
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4215 return -1;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4216 value |= base64_char_to_value[c] << 12;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4217
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4218 c = (unsigned char) (value >> 16);
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4219 if (multibyte)
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4220 e += CHAR_STRING (c, e);
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4221 else
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4222 *e++ = c;
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4223 nchars++;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4224
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4225 /* Process third byte of a quadruplet. */
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4226
24275
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
4227 READ_QUADRUPLET_BYTE (-1);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4228
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4229 if (c == '=')
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4230 {
24275
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
4231 READ_QUADRUPLET_BYTE (-1);
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4232
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4233 if (c != '=')
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4234 return -1;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4235 continue;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4236 }
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4237
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4238 if (!IS_BASE64 (c))
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4239 return -1;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4240 value |= base64_char_to_value[c] << 6;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4241
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4242 c = (unsigned char) (0xff & value >> 8);
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4243 if (multibyte)
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4244 e += CHAR_STRING (c, e);
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4245 else
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4246 *e++ = c;
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4247 nchars++;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4248
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4249 /* Process fourth byte of a quadruplet. */
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4250
24275
e30a84ad7aa0 (IS_BASE64_IGNORABLE, READ_QUADRUPLET_BYTE): New macros.
Paul Fisher <rao@gnu.org>
parents: 24255
diff changeset
4251 READ_QUADRUPLET_BYTE (-1);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4252
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4253 if (c == '=')
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4254 continue;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4255
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4256 if (!IS_BASE64 (c))
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4257 return -1;
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4258 value |= base64_char_to_value[c];
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4259
32351
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4260 c = (unsigned char) (0xff & value);
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4261 if (multibyte)
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4262 e += CHAR_STRING (c, e);
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4263 else
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4264 *e++ = c;
4ecfc281cce1 (READ_QUADRUPLET_BYTE): Set *NCHARS_RETURN before
Kenichi Handa <handa@m17n.org>
parents: 32234
diff changeset
4265 nchars++;
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4266 }
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
4267 }
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4268
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4269
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4270
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4271 /***********************************************************************
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4272 ***** *****
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4273 ***** Hash Tables *****
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4274 ***** *****
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4275 ***********************************************************************/
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4276
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4277 /* Implemented by gerd@gnu.org. This hash table implementation was
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4278 inspired by CMUCL hash tables. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4279
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4280 /* Ideas:
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4281
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4282 1. For small tables, association lists are probably faster than
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4283 hash tables because they have lower overhead.
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4284
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4285 For uses of hash tables where the O(1) behavior of table
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4286 operations is not a requirement, it might therefore be a good idea
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4287 not to hash. Instead, we could just do a linear search in the
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4288 key_and_value vector of the hash table. This could be done
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4289 if a `:linear-search t' argument is given to make-hash-table. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4290
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4291
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4292 /* The list of all weak hash tables. Don't staticpro this one. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4293
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4294 Lisp_Object Vweak_hash_tables;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4295
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4296 /* Various symbols. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4297
25365
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4298 Lisp_Object Qhash_table_p, Qeq, Qeql, Qequal, Qkey, Qvalue;
25455
8c2f3438bb2c (QCweakness): Replaces QCweak.
Gerd Moellmann <gerd@gnu.org>
parents: 25365
diff changeset
4299 Lisp_Object QCtest, QCsize, QCrehash_size, QCrehash_threshold, QCweakness;
30496
25d798a40775 (Qkey_or_value, Qkey_and_value): New variables.
Gerd Moellmann <gerd@gnu.org>
parents: 30488
diff changeset
4300 Lisp_Object Qhash_table_test, Qkey_or_value, Qkey_and_value;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4301
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4302 /* Function prototypes. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4303
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4304 static struct Lisp_Hash_Table *check_hash_table P_ ((Lisp_Object));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4305 static int get_key_arg P_ ((Lisp_Object, int, Lisp_Object *, char *));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4306 static void maybe_resize_hash_table P_ ((struct Lisp_Hash_Table *));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4307 static int cmpfn_eql P_ ((struct Lisp_Hash_Table *, Lisp_Object, unsigned,
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4308 Lisp_Object, unsigned));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4309 static int cmpfn_equal P_ ((struct Lisp_Hash_Table *, Lisp_Object, unsigned,
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4310 Lisp_Object, unsigned));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4311 static int cmpfn_user_defined P_ ((struct Lisp_Hash_Table *, Lisp_Object,
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4312 unsigned, Lisp_Object, unsigned));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4313 static unsigned hashfn_eq P_ ((struct Lisp_Hash_Table *, Lisp_Object));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4314 static unsigned hashfn_eql P_ ((struct Lisp_Hash_Table *, Lisp_Object));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4315 static unsigned hashfn_equal P_ ((struct Lisp_Hash_Table *, Lisp_Object));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4316 static unsigned hashfn_user_defined P_ ((struct Lisp_Hash_Table *,
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4317 Lisp_Object));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4318 static unsigned sxhash_string P_ ((unsigned char *, int));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4319 static unsigned sxhash_list P_ ((Lisp_Object, int));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4320 static unsigned sxhash_vector P_ ((Lisp_Object, int));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4321 static unsigned sxhash_bool_vector P_ ((Lisp_Object));
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4322 static int sweep_weak_table P_ ((struct Lisp_Hash_Table *, int));
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4323
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4324
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4325
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4326 /***********************************************************************
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4327 Utilities
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4328 ***********************************************************************/
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4329
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4330 /* If OBJ is a Lisp hash table, return a pointer to its struct
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4331 Lisp_Hash_Table. Otherwise, signal an error. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4332
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4333 static struct Lisp_Hash_Table *
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4334 check_hash_table (obj)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4335 Lisp_Object obj;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4336 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
4337 CHECK_HASH_TABLE (obj);
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4338 return XHASH_TABLE (obj);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4339 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4340
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4341
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4342 /* Value is the next integer I >= N, N >= 0 which is "almost" a prime
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4343 number. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4344
29979
6fe8f444b6a3 (next_almost_prime): Make it externally visible.
Gerd Moellmann <gerd@gnu.org>
parents: 29953
diff changeset
4345 int
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4346 next_almost_prime (n)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4347 int n;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4348 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4349 if (n % 2 == 0)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4350 n += 1;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4351 if (n % 3 == 0)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4352 n += 2;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4353 if (n % 7 == 0)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4354 n += 4;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4355 return n;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4356 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4357
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4358
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4359 /* Find KEY in ARGS which has size NARGS. Don't consider indices for
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4360 which USED[I] is non-zero. If found at index I in ARGS, set
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4361 USED[I] and USED[I + 1] to 1, and return I + 1. Otherwise return
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4362 -1. This function is used to extract a keyword/argument pair from
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4363 a DEFUN parameter list. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4364
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4365 static int
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4366 get_key_arg (key, nargs, args, used)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4367 Lisp_Object key;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4368 int nargs;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4369 Lisp_Object *args;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4370 char *used;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4371 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4372 int i;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4373
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4374 for (i = 0; i < nargs - 1; ++i)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4375 if (!used[i] && EQ (args[i], key))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4376 break;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4377
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4378 if (i >= nargs - 1)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4379 i = -1;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4380 else
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4381 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4382 used[i++] = 1;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4383 used[i] = 1;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4384 }
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4385
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4386 return i;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4387 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4388
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4389
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4390 /* Return a Lisp vector which has the same contents as VEC but has
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4391 size NEW_SIZE, NEW_SIZE >= VEC->size. Entries in the resulting
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4392 vector that are not copied from VEC are set to INIT. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4393
28481
3caab3235bc1 (larger_vector): Make externally visible.
Gerd Moellmann <gerd@gnu.org>
parents: 28222
diff changeset
4394 Lisp_Object
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4395 larger_vector (vec, new_size, init)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4396 Lisp_Object vec;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4397 int new_size;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4398 Lisp_Object init;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4399 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4400 struct Lisp_Vector *v;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4401 int i, old_size;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4402
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4403 xassert (VECTORP (vec));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4404 old_size = XVECTOR (vec)->size;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4405 xassert (new_size >= old_size);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4406
36431
c10e67afd7ec (Fdelete, larger_vector): Use allocate_vector.
Gerd Moellmann <gerd@gnu.org>
parents: 36256
diff changeset
4407 v = allocate_vector (new_size);
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4408 bcopy (XVECTOR (vec)->contents, v->contents,
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4409 old_size * sizeof *v->contents);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4410 for (i = old_size; i < new_size; ++i)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4411 v->contents[i] = init;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4412 XSETVECTOR (vec, v);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4413 return vec;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4414 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4415
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4416
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4417 /***********************************************************************
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4418 Low-level Functions
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4419 ***********************************************************************/
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4420
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4421 /* Compare KEY1 which has hash code HASH1 and KEY2 with hash code
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4422 HASH2 in hash table H using `eql'. Value is non-zero if KEY1 and
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4423 KEY2 are the same. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4424
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4425 static int
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4426 cmpfn_eql (h, key1, hash1, key2, hash2)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4427 struct Lisp_Hash_Table *h;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4428 Lisp_Object key1, key2;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4429 unsigned hash1, hash2;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4430 {
25349
ee30c32ea191 (hash_lookup): Test with EQ before calling key comparion
Gerd Moellmann <gerd@gnu.org>
parents: 25149
diff changeset
4431 return (FLOATP (key1)
ee30c32ea191 (hash_lookup): Test with EQ before calling key comparion
Gerd Moellmann <gerd@gnu.org>
parents: 25149
diff changeset
4432 && FLOATP (key2)
25495
5051c1d824fa (Fhash_table_weakness): Replaces F_hash_table_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25455
diff changeset
4433 && XFLOAT_DATA (key1) == XFLOAT_DATA (key2));
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4434 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4435
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4436
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4437 /* Compare KEY1 which has hash code HASH1 and KEY2 with hash code
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4438 HASH2 in hash table H using `equal'. Value is non-zero if KEY1 and
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4439 KEY2 are the same. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4440
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4441 static int
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4442 cmpfn_equal (h, key1, hash1, key2, hash2)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4443 struct Lisp_Hash_Table *h;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4444 Lisp_Object key1, key2;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4445 unsigned hash1, hash2;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4446 {
25349
ee30c32ea191 (hash_lookup): Test with EQ before calling key comparion
Gerd Moellmann <gerd@gnu.org>
parents: 25149
diff changeset
4447 return hash1 == hash2 && !NILP (Fequal (key1, key2));
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4448 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4449
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4450
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4451 /* Compare KEY1 which has hash code HASH1, and KEY2 with hash code
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4452 HASH2 in hash table H using H->user_cmp_function. Value is non-zero
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4453 if KEY1 and KEY2 are the same. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4454
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4455 static int
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4456 cmpfn_user_defined (h, key1, hash1, key2, hash2)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4457 struct Lisp_Hash_Table *h;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4458 Lisp_Object key1, key2;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4459 unsigned hash1, hash2;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4460 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4461 if (hash1 == hash2)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4462 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4463 Lisp_Object args[3];
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4464
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4465 args[0] = h->user_cmp_function;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4466 args[1] = key1;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4467 args[2] = key2;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4468 return !NILP (Ffuncall (3, args));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4469 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4470 else
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4471 return 0;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4472 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4473
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4474
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4475 /* Value is a hash code for KEY for use in hash table H which uses
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4476 `eq' to compare keys. The hash code returned is guaranteed to fit
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4477 in a Lisp integer. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4478
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4479 static unsigned
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4480 hashfn_eq (h, key)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4481 struct Lisp_Hash_Table *h;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4482 Lisp_Object key;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4483 {
30760
c5077abd4ef2 (hashfn_eq, hashfn_eql): Don't handle strings specially
Gerd Moellmann <gerd@gnu.org>
parents: 30637
diff changeset
4484 unsigned hash = XUINT (key) ^ XGCTYPE (key);
53090
86e42266b65e (hashfn_eq, hashfn_eql, hashfn_equal, hash_put)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53042
diff changeset
4485 xassert ((hash & ~INTMASK) == 0);
30760
c5077abd4ef2 (hashfn_eq, hashfn_eql): Don't handle strings specially
Gerd Moellmann <gerd@gnu.org>
parents: 30637
diff changeset
4486 return hash;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4487 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4488
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4489
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4490 /* Value is a hash code for KEY for use in hash table H which uses
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4491 `eql' to compare keys. The hash code returned is guaranteed to fit
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4492 in a Lisp integer. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4493
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4494 static unsigned
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4495 hashfn_eql (h, key)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4496 struct Lisp_Hash_Table *h;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4497 Lisp_Object key;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4498 {
30760
c5077abd4ef2 (hashfn_eq, hashfn_eql): Don't handle strings specially
Gerd Moellmann <gerd@gnu.org>
parents: 30637
diff changeset
4499 unsigned hash;
c5077abd4ef2 (hashfn_eq, hashfn_eql): Don't handle strings specially
Gerd Moellmann <gerd@gnu.org>
parents: 30637
diff changeset
4500 if (FLOATP (key))
c5077abd4ef2 (hashfn_eq, hashfn_eql): Don't handle strings specially
Gerd Moellmann <gerd@gnu.org>
parents: 30637
diff changeset
4501 hash = sxhash (key, 0);
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4502 else
30760
c5077abd4ef2 (hashfn_eq, hashfn_eql): Don't handle strings specially
Gerd Moellmann <gerd@gnu.org>
parents: 30637
diff changeset
4503 hash = XUINT (key) ^ XGCTYPE (key);
53090
86e42266b65e (hashfn_eq, hashfn_eql, hashfn_equal, hash_put)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53042
diff changeset
4504 xassert ((hash & ~INTMASK) == 0);
30760
c5077abd4ef2 (hashfn_eq, hashfn_eql): Don't handle strings specially
Gerd Moellmann <gerd@gnu.org>
parents: 30637
diff changeset
4505 return hash;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4506 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4507
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4508
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4509 /* Value is a hash code for KEY for use in hash table H which uses
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4510 `equal' to compare keys. The hash code returned is guaranteed to fit
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4511 in a Lisp integer. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4512
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4513 static unsigned
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4514 hashfn_equal (h, key)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4515 struct Lisp_Hash_Table *h;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4516 Lisp_Object key;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4517 {
30760
c5077abd4ef2 (hashfn_eq, hashfn_eql): Don't handle strings specially
Gerd Moellmann <gerd@gnu.org>
parents: 30637
diff changeset
4518 unsigned hash = sxhash (key, 0);
53090
86e42266b65e (hashfn_eq, hashfn_eql, hashfn_equal, hash_put)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53042
diff changeset
4519 xassert ((hash & ~INTMASK) == 0);
30760
c5077abd4ef2 (hashfn_eq, hashfn_eql): Don't handle strings specially
Gerd Moellmann <gerd@gnu.org>
parents: 30637
diff changeset
4520 return hash;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4521 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4522
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4523
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4524 /* Value is a hash code for KEY for use in hash table H which uses as
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4525 user-defined function to compare keys. The hash code returned is
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4526 guaranteed to fit in a Lisp integer. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4527
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4528 static unsigned
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4529 hashfn_user_defined (h, key)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4530 struct Lisp_Hash_Table *h;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4531 Lisp_Object key;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4532 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4533 Lisp_Object args[2], hash;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4534
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4535 args[0] = h->user_hash_function;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4536 args[1] = key;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4537 hash = Ffuncall (2, args);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4538 if (!INTEGERP (hash))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4539 Fsignal (Qerror,
30602
4f195cb24338 Replace `illegal' with `invalid'.
Gerd Moellmann <gerd@gnu.org>
parents: 30597
diff changeset
4540 list2 (build_string ("Invalid hash code returned from \
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4541 user-supplied hash function"),
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4542 hash));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4543 return XUINT (hash);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4544 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4545
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4546
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4547 /* Create and initialize a new hash table.
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4548
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4549 TEST specifies the test the hash table will use to compare keys.
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4550 It must be either one of the predefined tests `eq', `eql' or
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4551 `equal' or a symbol denoting a user-defined test named TEST with
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4552 test and hash functions USER_TEST and USER_HASH.
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4553
30602
4f195cb24338 Replace `illegal' with `invalid'.
Gerd Moellmann <gerd@gnu.org>
parents: 30597
diff changeset
4554 Give the table initial capacity SIZE, SIZE >= 0, an integer.
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4555
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4556 If REHASH_SIZE is an integer, it must be > 0, and this hash table's
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4557 new size when it becomes full is computed by adding REHASH_SIZE to
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4558 its old size. If REHASH_SIZE is a float, it must be > 1.0, and the
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4559 table's new size is computed by multiplying its old size with
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4560 REHASH_SIZE.
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4561
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4562 REHASH_THRESHOLD must be a float <= 1.0, and > 0. The table will
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4563 be resized when the ratio of (number of entries in the table) /
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4564 (table size) is >= REHASH_THRESHOLD.
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4565
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4566 WEAK specifies the weakness of the table. If non-nil, it must be
30496
25d798a40775 (Qkey_or_value, Qkey_and_value): New variables.
Gerd Moellmann <gerd@gnu.org>
parents: 30488
diff changeset
4567 one of the symbols `key', `value', `key-or-value', or `key-and-value'. */
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4568
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4569 Lisp_Object
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4570 make_hash_table (test, size, rehash_size, rehash_threshold, weak,
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4571 user_test, user_hash)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4572 Lisp_Object test, size, rehash_size, rehash_threshold, weak;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4573 Lisp_Object user_test, user_hash;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4574 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4575 struct Lisp_Hash_Table *h;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4576 Lisp_Object table;
36431
c10e67afd7ec (Fdelete, larger_vector): Use allocate_vector.
Gerd Moellmann <gerd@gnu.org>
parents: 36256
diff changeset
4577 int index_size, i, sz;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4578
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4579 /* Preconditions. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4580 xassert (SYMBOLP (test));
30602
4f195cb24338 Replace `illegal' with `invalid'.
Gerd Moellmann <gerd@gnu.org>
parents: 30597
diff changeset
4581 xassert (INTEGERP (size) && XINT (size) >= 0);
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4582 xassert ((INTEGERP (rehash_size) && XINT (rehash_size) > 0)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4583 || (FLOATP (rehash_size) && XFLOATINT (rehash_size) > 1.0));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4584 xassert (FLOATP (rehash_threshold)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4585 && XFLOATINT (rehash_threshold) > 0
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4586 && XFLOATINT (rehash_threshold) <= 1.0);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4587
30602
4f195cb24338 Replace `illegal' with `invalid'.
Gerd Moellmann <gerd@gnu.org>
parents: 30597
diff changeset
4588 if (XFASTINT (size) == 0)
4f195cb24338 Replace `illegal' with `invalid'.
Gerd Moellmann <gerd@gnu.org>
parents: 30597
diff changeset
4589 size = make_number (1);
4f195cb24338 Replace `illegal' with `invalid'.
Gerd Moellmann <gerd@gnu.org>
parents: 30597
diff changeset
4590
36431
c10e67afd7ec (Fdelete, larger_vector): Use allocate_vector.
Gerd Moellmann <gerd@gnu.org>
parents: 36256
diff changeset
4591 /* Allocate a table and initialize it. */
c10e67afd7ec (Fdelete, larger_vector): Use allocate_vector.
Gerd Moellmann <gerd@gnu.org>
parents: 36256
diff changeset
4592 h = allocate_hash_table ();
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4593
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4594 /* Initialize hash table slots. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4595 sz = XFASTINT (size);
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4596
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4597 h->test = test;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4598 if (EQ (test, Qeql))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4599 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4600 h->cmpfn = cmpfn_eql;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4601 h->hashfn = hashfn_eql;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4602 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4603 else if (EQ (test, Qeq))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4604 {
25349
ee30c32ea191 (hash_lookup): Test with EQ before calling key comparion
Gerd Moellmann <gerd@gnu.org>
parents: 25149
diff changeset
4605 h->cmpfn = NULL;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4606 h->hashfn = hashfn_eq;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4607 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4608 else if (EQ (test, Qequal))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4609 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4610 h->cmpfn = cmpfn_equal;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4611 h->hashfn = hashfn_equal;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4612 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4613 else
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4614 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4615 h->user_cmp_function = user_test;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4616 h->user_hash_function = user_hash;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4617 h->cmpfn = cmpfn_user_defined;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4618 h->hashfn = hashfn_user_defined;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4619 }
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4620
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4621 h->weak = weak;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4622 h->rehash_threshold = rehash_threshold;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4623 h->rehash_size = rehash_size;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4624 h->count = make_number (0);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4625 h->key_and_value = Fmake_vector (make_number (2 * sz), Qnil);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4626 h->hash = Fmake_vector (size, Qnil);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4627 h->next = Fmake_vector (size, Qnil);
29809
88aa46c9dfde (make_hash_table, maybe_resize_hash_table): Cast arg of
Dave Love <fx@gnu.org>
parents: 29232
diff changeset
4628 /* Cast to int here avoids losing with gcc 2.95 on Tru64/Alpha... */
88aa46c9dfde (make_hash_table, maybe_resize_hash_table): Cast arg of
Dave Love <fx@gnu.org>
parents: 29232
diff changeset
4629 index_size = next_almost_prime ((int) (sz / XFLOATINT (rehash_threshold)));
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4630 h->index = Fmake_vector (make_number (index_size), Qnil);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4631
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4632 /* Set up the free list. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4633 for (i = 0; i < sz - 1; ++i)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4634 HASH_NEXT (h, i) = make_number (i + 1);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4635 h->next_free = make_number (0);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4636
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4637 XSET_HASH_TABLE (table, h);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4638 xassert (HASH_TABLE_P (table));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4639 xassert (XHASH_TABLE (table) == h);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4640
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4641 /* Maybe add this hash table to the list of all weak hash tables. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4642 if (NILP (h->weak))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4643 h->next_weak = Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4644 else
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4645 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4646 h->next_weak = Vweak_hash_tables;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4647 Vweak_hash_tables = table;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4648 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4649
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4650 return table;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4651 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4652
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4653
25365
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4654 /* Return a copy of hash table H1. Keys and values are not copied,
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4655 only the table itself is. */
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4656
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4657 Lisp_Object
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4658 copy_hash_table (h1)
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4659 struct Lisp_Hash_Table *h1;
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4660 {
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4661 Lisp_Object table;
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4662 struct Lisp_Hash_Table *h2;
40769
fa1546836808 (copy_hash_table): Remove unused variable `v'.
Pavel Janík <Pavel@Janik.cz>
parents: 40734
diff changeset
4663 struct Lisp_Vector *next;
36431
c10e67afd7ec (Fdelete, larger_vector): Use allocate_vector.
Gerd Moellmann <gerd@gnu.org>
parents: 36256
diff changeset
4664
c10e67afd7ec (Fdelete, larger_vector): Use allocate_vector.
Gerd Moellmann <gerd@gnu.org>
parents: 36256
diff changeset
4665 h2 = allocate_hash_table ();
25365
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4666 next = h2->vec_next;
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4667 bcopy (h1, h2, sizeof *h2);
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4668 h2->vec_next = next;
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4669 h2->key_and_value = Fcopy_sequence (h1->key_and_value);
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4670 h2->hash = Fcopy_sequence (h1->hash);
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4671 h2->next = Fcopy_sequence (h1->next);
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4672 h2->index = Fcopy_sequence (h1->index);
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4673 XSET_HASH_TABLE (table, h2);
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4674
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4675 /* Maybe add this hash table to the list of all weak hash tables. */
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4676 if (!NILP (h2->weak))
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4677 {
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4678 h2->next_weak = Vweak_hash_tables;
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4679 Vweak_hash_tables = table;
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4680 }
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4681
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4682 return table;
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4683 }
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4684
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
4685
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4686 /* Resize hash table H if it's too full. If H cannot be resized
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4687 because it's already too large, throw an error. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4688
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4689 static INLINE void
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4690 maybe_resize_hash_table (h)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4691 struct Lisp_Hash_Table *h;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4692 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4693 if (NILP (h->next_free))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4694 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4695 int old_size = HASH_TABLE_SIZE (h);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4696 int i, new_size, index_size;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4697
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4698 if (INTEGERP (h->rehash_size))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4699 new_size = old_size + XFASTINT (h->rehash_size);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4700 else
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4701 new_size = old_size * XFLOATINT (h->rehash_size);
27901
70c1647c2bfc (maybe_resize_hash_table): Handle case of new size
Gerd Moellmann <gerd@gnu.org>
parents: 27727
diff changeset
4702 new_size = max (old_size + 1, new_size);
29809
88aa46c9dfde (make_hash_table, maybe_resize_hash_table): Cast arg of
Dave Love <fx@gnu.org>
parents: 29232
diff changeset
4703 index_size = next_almost_prime ((int)
88aa46c9dfde (make_hash_table, maybe_resize_hash_table): Cast arg of
Dave Love <fx@gnu.org>
parents: 29232
diff changeset
4704 (new_size
88aa46c9dfde (make_hash_table, maybe_resize_hash_table): Cast arg of
Dave Love <fx@gnu.org>
parents: 29232
diff changeset
4705 / XFLOATINT (h->rehash_threshold)));
53090
86e42266b65e (hashfn_eq, hashfn_eql, hashfn_equal, hash_put)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53042
diff changeset
4706 if (max (index_size, 2 * new_size) > MOST_POSITIVE_FIXNUM)
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4707 error ("Hash table too large to resize");
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4708
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4709 h->key_and_value = larger_vector (h->key_and_value, 2 * new_size, Qnil);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4710 h->next = larger_vector (h->next, new_size, Qnil);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4711 h->hash = larger_vector (h->hash, new_size, Qnil);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4712 h->index = Fmake_vector (make_number (index_size), Qnil);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4713
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4714 /* Update the free list. Do it so that new entries are added at
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4715 the end of the free list. This makes some operations like
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4716 maphash faster. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4717 for (i = old_size; i < new_size - 1; ++i)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4718 HASH_NEXT (h, i) = make_number (i + 1);
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4719
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4720 if (!NILP (h->next_free))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4721 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4722 Lisp_Object last, next;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4723
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4724 last = h->next_free;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4725 while (next = HASH_NEXT (h, XFASTINT (last)),
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4726 !NILP (next))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4727 last = next;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4728
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4729 HASH_NEXT (h, XFASTINT (last)) = make_number (old_size);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4730 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4731 else
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4732 XSETFASTINT (h->next_free, old_size);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4733
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4734 /* Rehash. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4735 for (i = 0; i < old_size; ++i)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4736 if (!NILP (HASH_HASH (h, i)))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4737 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4738 unsigned hash_code = XUINT (HASH_HASH (h, i));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4739 int start_of_bucket = hash_code % XVECTOR (h->index)->size;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4740 HASH_NEXT (h, i) = HASH_INDEX (h, start_of_bucket);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4741 HASH_INDEX (h, start_of_bucket) = make_number (i);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4742 }
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4743 }
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4744 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4745
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4746
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4747 /* Lookup KEY in hash table H. If HASH is non-null, return in *HASH
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4748 the hash code of KEY. Value is the index of the entry in H
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4749 matching KEY, or -1 if not found. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4750
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4751 int
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4752 hash_lookup (h, key, hash)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4753 struct Lisp_Hash_Table *h;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4754 Lisp_Object key;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4755 unsigned *hash;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4756 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4757 unsigned hash_code;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4758 int start_of_bucket;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4759 Lisp_Object idx;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4760
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4761 hash_code = h->hashfn (h, key);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4762 if (hash)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4763 *hash = hash_code;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4764
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4765 start_of_bucket = hash_code % XVECTOR (h->index)->size;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4766 idx = HASH_INDEX (h, start_of_bucket);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4767
28555
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
4768 /* We need not gcpro idx since it's either an integer or nil. */
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4769 while (!NILP (idx))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4770 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4771 int i = XFASTINT (idx);
25349
ee30c32ea191 (hash_lookup): Test with EQ before calling key comparion
Gerd Moellmann <gerd@gnu.org>
parents: 25149
diff changeset
4772 if (EQ (key, HASH_KEY (h, i))
ee30c32ea191 (hash_lookup): Test with EQ before calling key comparion
Gerd Moellmann <gerd@gnu.org>
parents: 25149
diff changeset
4773 || (h->cmpfn
ee30c32ea191 (hash_lookup): Test with EQ before calling key comparion
Gerd Moellmann <gerd@gnu.org>
parents: 25149
diff changeset
4774 && h->cmpfn (h, key, hash_code,
28507
b6f06a755c7d make_number/XINT/XUINT conversions; EQ/== fixes; ==Qnil -> NILP
Ken Raeburn <raeburn@raeburn.org>
parents: 28493
diff changeset
4775 HASH_KEY (h, i), XUINT (HASH_HASH (h, i)))))
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4776 break;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4777 idx = HASH_NEXT (h, i);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4778 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4779
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4780 return NILP (idx) ? -1 : XFASTINT (idx);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4781 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4782
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4783
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4784 /* Put an entry into hash table H that associates KEY with VALUE.
26856
c629af522c09 (Flength): The length of char-table is MAX_CHAR.
Kenichi Handa <handa@m17n.org>
parents: 26596
diff changeset
4785 HASH is a previously computed hash code of KEY.
c629af522c09 (Flength): The length of char-table is MAX_CHAR.
Kenichi Handa <handa@m17n.org>
parents: 26596
diff changeset
4786 Value is the index of the entry in H matching KEY. */
c629af522c09 (Flength): The length of char-table is MAX_CHAR.
Kenichi Handa <handa@m17n.org>
parents: 26596
diff changeset
4787
c629af522c09 (Flength): The length of char-table is MAX_CHAR.
Kenichi Handa <handa@m17n.org>
parents: 26596
diff changeset
4788 int
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4789 hash_put (h, key, value, hash)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4790 struct Lisp_Hash_Table *h;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4791 Lisp_Object key, value;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4792 unsigned hash;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4793 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4794 int start_of_bucket, i;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4795
53090
86e42266b65e (hashfn_eq, hashfn_eql, hashfn_equal, hash_put)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53042
diff changeset
4796 xassert ((hash & ~INTMASK) == 0);
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4797
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4798 /* Increment count after resizing because resizing may fail. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4799 maybe_resize_hash_table (h);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4800 h->count = make_number (XFASTINT (h->count) + 1);
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4801
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4802 /* Store key/value in the key_and_value vector. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4803 i = XFASTINT (h->next_free);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4804 h->next_free = HASH_NEXT (h, i);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4805 HASH_KEY (h, i) = key;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4806 HASH_VALUE (h, i) = value;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4807
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4808 /* Remember its hash code. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4809 HASH_HASH (h, i) = make_number (hash);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4810
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4811 /* Add new entry to its collision chain. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4812 start_of_bucket = hash % XVECTOR (h->index)->size;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4813 HASH_NEXT (h, i) = HASH_INDEX (h, start_of_bucket);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4814 HASH_INDEX (h, start_of_bucket) = make_number (i);
26856
c629af522c09 (Flength): The length of char-table is MAX_CHAR.
Kenichi Handa <handa@m17n.org>
parents: 26596
diff changeset
4815 return i;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4816 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4817
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4818
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4819 /* Remove the entry matching KEY from hash table H, if there is one. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4820
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4821 void
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4822 hash_remove (h, key)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4823 struct Lisp_Hash_Table *h;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4824 Lisp_Object key;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4825 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4826 unsigned hash_code;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4827 int start_of_bucket;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4828 Lisp_Object idx, prev;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4829
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4830 hash_code = h->hashfn (h, key);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4831 start_of_bucket = hash_code % XVECTOR (h->index)->size;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4832 idx = HASH_INDEX (h, start_of_bucket);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4833 prev = Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4834
28555
976bc44944da (mapcar1): Test for null vals to support mapc.
Dave Love <fx@gnu.org>
parents: 28507
diff changeset
4835 /* We need not gcpro idx, prev since they're either integers or nil. */
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4836 while (!NILP (idx))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4837 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4838 int i = XFASTINT (idx);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4839
25349
ee30c32ea191 (hash_lookup): Test with EQ before calling key comparion
Gerd Moellmann <gerd@gnu.org>
parents: 25149
diff changeset
4840 if (EQ (key, HASH_KEY (h, i))
ee30c32ea191 (hash_lookup): Test with EQ before calling key comparion
Gerd Moellmann <gerd@gnu.org>
parents: 25149
diff changeset
4841 || (h->cmpfn
ee30c32ea191 (hash_lookup): Test with EQ before calling key comparion
Gerd Moellmann <gerd@gnu.org>
parents: 25149
diff changeset
4842 && h->cmpfn (h, key, hash_code,
28507
b6f06a755c7d make_number/XINT/XUINT conversions; EQ/== fixes; ==Qnil -> NILP
Ken Raeburn <raeburn@raeburn.org>
parents: 28493
diff changeset
4843 HASH_KEY (h, i), XUINT (HASH_HASH (h, i)))))
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4844 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4845 /* Take entry out of collision chain. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4846 if (NILP (prev))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4847 HASH_INDEX (h, start_of_bucket) = HASH_NEXT (h, i);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4848 else
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4849 HASH_NEXT (h, XFASTINT (prev)) = HASH_NEXT (h, i);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4850
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4851 /* Clear slots in key_and_value and add the slots to
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4852 the free list. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4853 HASH_KEY (h, i) = HASH_VALUE (h, i) = HASH_HASH (h, i) = Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4854 HASH_NEXT (h, i) = h->next_free;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4855 h->next_free = make_number (i);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4856 h->count = make_number (XFASTINT (h->count) - 1);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4857 xassert (XINT (h->count) >= 0);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4858 break;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4859 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4860 else
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4861 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4862 prev = idx;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4863 idx = HASH_NEXT (h, i);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4864 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4865 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4866 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4867
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4868
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4869 /* Clear hash table H. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4870
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4871 void
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4872 hash_clear (h)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4873 struct Lisp_Hash_Table *h;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4874 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4875 if (XFASTINT (h->count) > 0)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4876 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4877 int i, size = HASH_TABLE_SIZE (h);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4878
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4879 for (i = 0; i < size; ++i)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4880 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4881 HASH_NEXT (h, i) = i < size - 1 ? make_number (i + 1) : Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4882 HASH_KEY (h, i) = Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4883 HASH_VALUE (h, i) = Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4884 HASH_HASH (h, i) = Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4885 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4886
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4887 for (i = 0; i < XVECTOR (h->index)->size; ++i)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4888 XVECTOR (h->index)->contents[i] = Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4889
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4890 h->next_free = make_number (0);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4891 h->count = make_number (0);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4892 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4893 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4894
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4895
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4896
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4897 /************************************************************************
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4898 Weak Hash Tables
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4899 ************************************************************************/
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4900
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4901 /* Sweep weak hash table H. REMOVE_ENTRIES_P non-zero means remove
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4902 entries from the table that don't survive the current GC.
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4903 REMOVE_ENTRIES_P zero means mark entries that are in use. Value is
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4904 non-zero if anything was marked. */
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4905
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4906 static int
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4907 sweep_weak_table (h, remove_entries_p)
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4908 struct Lisp_Hash_Table *h;
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4909 int remove_entries_p;
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4910 {
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4911 int bucket, n, marked;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4912
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4913 n = XVECTOR (h->index)->size & ~ARRAY_MARK_FLAG;
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4914 marked = 0;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4915
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4916 for (bucket = 0; bucket < n; ++bucket)
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4917 {
35513
0fbf1517a670 (sweep_weak_table): Fix code taking items out of
Gerd Moellmann <gerd@gnu.org>
parents: 35479
diff changeset
4918 Lisp_Object idx, next, prev;
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4919
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4920 /* Follow collision chain, removing entries that
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4921 don't survive this garbage collection. */
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4922 prev = Qnil;
35513
0fbf1517a670 (sweep_weak_table): Fix code taking items out of
Gerd Moellmann <gerd@gnu.org>
parents: 35479
diff changeset
4923 for (idx = HASH_INDEX (h, bucket); !GC_NILP (idx); idx = next)
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4924 {
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4925 int i = XFASTINT (idx);
35513
0fbf1517a670 (sweep_weak_table): Fix code taking items out of
Gerd Moellmann <gerd@gnu.org>
parents: 35479
diff changeset
4926 int key_known_to_survive_p = survives_gc_p (HASH_KEY (h, i));
0fbf1517a670 (sweep_weak_table): Fix code taking items out of
Gerd Moellmann <gerd@gnu.org>
parents: 35479
diff changeset
4927 int value_known_to_survive_p = survives_gc_p (HASH_VALUE (h, i));
0fbf1517a670 (sweep_weak_table): Fix code taking items out of
Gerd Moellmann <gerd@gnu.org>
parents: 35479
diff changeset
4928 int remove_p;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4929
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4930 if (EQ (h->weak, Qkey))
30007
d9c85e2f07ba (sweep_weak_table): Mark only objects that are not
Gerd Moellmann <gerd@gnu.org>
parents: 29991
diff changeset
4931 remove_p = !key_known_to_survive_p;
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4932 else if (EQ (h->weak, Qvalue))
30007
d9c85e2f07ba (sweep_weak_table): Mark only objects that are not
Gerd Moellmann <gerd@gnu.org>
parents: 29991
diff changeset
4933 remove_p = !value_known_to_survive_p;
30496
25d798a40775 (Qkey_or_value, Qkey_and_value): New variables.
Gerd Moellmann <gerd@gnu.org>
parents: 30488
diff changeset
4934 else if (EQ (h->weak, Qkey_or_value))
30637
b54946f3cbbc (sweep_weak_table): Fix survival conditions for
Gerd Moellmann <gerd@gnu.org>
parents: 30634
diff changeset
4935 remove_p = !(key_known_to_survive_p || value_known_to_survive_p);
30496
25d798a40775 (Qkey_or_value, Qkey_and_value): New variables.
Gerd Moellmann <gerd@gnu.org>
parents: 30488
diff changeset
4936 else if (EQ (h->weak, Qkey_and_value))
30637
b54946f3cbbc (sweep_weak_table): Fix survival conditions for
Gerd Moellmann <gerd@gnu.org>
parents: 30634
diff changeset
4937 remove_p = !(key_known_to_survive_p && value_known_to_survive_p);
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4938 else
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4939 abort ();
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4940
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4941 next = HASH_NEXT (h, i);
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4942
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4943 if (remove_entries_p)
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4944 {
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4945 if (remove_p)
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4946 {
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4947 /* Take out of collision chain. */
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4948 if (GC_NILP (prev))
35513
0fbf1517a670 (sweep_weak_table): Fix code taking items out of
Gerd Moellmann <gerd@gnu.org>
parents: 35479
diff changeset
4949 HASH_INDEX (h, bucket) = next;
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4950 else
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4951 HASH_NEXT (h, XFASTINT (prev)) = next;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4952
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4953 /* Add to free list. */
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4954 HASH_NEXT (h, i) = h->next_free;
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4955 h->next_free = idx;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4956
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4957 /* Clear key, value, and hash. */
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4958 HASH_KEY (h, i) = HASH_VALUE (h, i) = Qnil;
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4959 HASH_HASH (h, i) = Qnil;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
4960
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4961 h->count = make_number (XFASTINT (h->count) - 1);
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4962 }
59630
e35417abe6a6 (sweep_weak_table): Advance prev pointer when we keep a pair.
Kim F. Storm <storm@cua.dk>
parents: 59490
diff changeset
4963 else
e35417abe6a6 (sweep_weak_table): Advance prev pointer when we keep a pair.
Kim F. Storm <storm@cua.dk>
parents: 59490
diff changeset
4964 {
e35417abe6a6 (sweep_weak_table): Advance prev pointer when we keep a pair.
Kim F. Storm <storm@cua.dk>
parents: 59490
diff changeset
4965 prev = idx;
e35417abe6a6 (sweep_weak_table): Advance prev pointer when we keep a pair.
Kim F. Storm <storm@cua.dk>
parents: 59490
diff changeset
4966 }
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4967 }
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4968 else
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4969 {
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4970 if (!remove_p)
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4971 {
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4972 /* Make sure key and value survive. */
30007
d9c85e2f07ba (sweep_weak_table): Mark only objects that are not
Gerd Moellmann <gerd@gnu.org>
parents: 29991
diff changeset
4973 if (!key_known_to_survive_p)
d9c85e2f07ba (sweep_weak_table): Mark only objects that are not
Gerd Moellmann <gerd@gnu.org>
parents: 29991
diff changeset
4974 {
51768
31f2f6a2df06 (sweep_weak_table): Update calls to mark_object.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51397
diff changeset
4975 mark_object (HASH_KEY (h, i));
30007
d9c85e2f07ba (sweep_weak_table): Mark only objects that are not
Gerd Moellmann <gerd@gnu.org>
parents: 29991
diff changeset
4976 marked = 1;
d9c85e2f07ba (sweep_weak_table): Mark only objects that are not
Gerd Moellmann <gerd@gnu.org>
parents: 29991
diff changeset
4977 }
d9c85e2f07ba (sweep_weak_table): Mark only objects that are not
Gerd Moellmann <gerd@gnu.org>
parents: 29991
diff changeset
4978
d9c85e2f07ba (sweep_weak_table): Mark only objects that are not
Gerd Moellmann <gerd@gnu.org>
parents: 29991
diff changeset
4979 if (!value_known_to_survive_p)
d9c85e2f07ba (sweep_weak_table): Mark only objects that are not
Gerd Moellmann <gerd@gnu.org>
parents: 29991
diff changeset
4980 {
51768
31f2f6a2df06 (sweep_weak_table): Update calls to mark_object.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51397
diff changeset
4981 mark_object (HASH_VALUE (h, i));
30007
d9c85e2f07ba (sweep_weak_table): Mark only objects that are not
Gerd Moellmann <gerd@gnu.org>
parents: 29991
diff changeset
4982 marked = 1;
d9c85e2f07ba (sweep_weak_table): Mark only objects that are not
Gerd Moellmann <gerd@gnu.org>
parents: 29991
diff changeset
4983 }
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4984 }
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4985 }
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4986 }
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4987 }
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4988
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4989 return marked;
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4990 }
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
4991
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4992 /* Remove elements from weak hash tables that don't survive the
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4993 current garbage collection. Remove weak tables that don't survive
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4994 from Vweak_hash_tables. Called from gc_sweep. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4995
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4996 void
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4997 sweep_weak_hash_tables ()
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
4998 {
30634
d833a6450e10 (sweep_weak_hash_tables): Fix the code taking unmarked
Gerd Moellmann <gerd@gnu.org>
parents: 30602
diff changeset
4999 Lisp_Object table, used, next;
d833a6450e10 (sweep_weak_hash_tables): Fix the code taking unmarked
Gerd Moellmann <gerd@gnu.org>
parents: 30602
diff changeset
5000 struct Lisp_Hash_Table *h;
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5001 int marked;
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5002
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5003 /* Mark all keys and values that are in use. Keep on marking until
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5004 there is no more change. This is necessary for cases like
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5005 value-weak table A containing an entry X -> Y, where Y is used in a
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5006 key-weak table B, Z -> Y. If B comes after A in the list of weak
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5007 tables, X -> Y might be removed from A, although when looking at B
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5008 one finds that it shouldn't. */
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5009 do
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5010 {
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5011 marked = 0;
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5012 for (table = Vweak_hash_tables; !GC_NILP (table); table = h->next_weak)
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5013 {
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5014 h = XHASH_TABLE (table);
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5015 if (h->size & ARRAY_MARK_FLAG)
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5016 marked |= sweep_weak_table (h, 0);
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5017 }
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5018 }
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5019 while (marked);
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5020
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5021 /* Remove tables and entries that aren't used. */
30634
d833a6450e10 (sweep_weak_hash_tables): Fix the code taking unmarked
Gerd Moellmann <gerd@gnu.org>
parents: 30602
diff changeset
5022 for (table = Vweak_hash_tables, used = Qnil; !GC_NILP (table); table = next)
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5023 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5024 h = XHASH_TABLE (table);
30634
d833a6450e10 (sweep_weak_hash_tables): Fix the code taking unmarked
Gerd Moellmann <gerd@gnu.org>
parents: 30602
diff changeset
5025 next = h->next_weak;
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5026
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5027 if (h->size & ARRAY_MARK_FLAG)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5028 {
30634
d833a6450e10 (sweep_weak_hash_tables): Fix the code taking unmarked
Gerd Moellmann <gerd@gnu.org>
parents: 30602
diff changeset
5029 /* TABLE is marked as used. Sweep its contents. */
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5030 if (XFASTINT (h->count) > 0)
27530
774df97ad330 (sweep_weak_table): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 26856
diff changeset
5031 sweep_weak_table (h, 1);
30634
d833a6450e10 (sweep_weak_hash_tables): Fix the code taking unmarked
Gerd Moellmann <gerd@gnu.org>
parents: 30602
diff changeset
5032
d833a6450e10 (sweep_weak_hash_tables): Fix the code taking unmarked
Gerd Moellmann <gerd@gnu.org>
parents: 30602
diff changeset
5033 /* Add table to the list of used weak hash tables. */
d833a6450e10 (sweep_weak_hash_tables): Fix the code taking unmarked
Gerd Moellmann <gerd@gnu.org>
parents: 30602
diff changeset
5034 h->next_weak = used;
d833a6450e10 (sweep_weak_hash_tables): Fix the code taking unmarked
Gerd Moellmann <gerd@gnu.org>
parents: 30602
diff changeset
5035 used = table;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5036 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5037 }
30634
d833a6450e10 (sweep_weak_hash_tables): Fix the code taking unmarked
Gerd Moellmann <gerd@gnu.org>
parents: 30602
diff changeset
5038
d833a6450e10 (sweep_weak_hash_tables): Fix the code taking unmarked
Gerd Moellmann <gerd@gnu.org>
parents: 30602
diff changeset
5039 Vweak_hash_tables = used;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5040 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5041
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5042
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5043
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5044 /***********************************************************************
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5045 Hash Code Computation
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5046 ***********************************************************************/
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5047
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5048 /* Maximum depth up to which to dive into Lisp structures. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5049
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5050 #define SXHASH_MAX_DEPTH 3
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5051
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5052 /* Maximum length up to which to take list and vector elements into
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5053 account. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5054
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5055 #define SXHASH_MAX_LEN 7
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5056
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5057 /* Combine two integers X and Y for hashing. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5058
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5059 #define SXHASH_COMBINE(X, Y) \
25709
ba4e2a641663 (SXHASH_COMBINE): Add missing parentheses.
Gerd Moellmann <gerd@gnu.org>
parents: 25690
diff changeset
5060 ((((unsigned)(X) << 4) + (((unsigned)(X) >> 24) & 0x0fffffff)) \
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5061 + (unsigned)(Y))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5062
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5063
30760
c5077abd4ef2 (hashfn_eq, hashfn_eql): Don't handle strings specially
Gerd Moellmann <gerd@gnu.org>
parents: 30637
diff changeset
5064 /* Return a hash for string PTR which has length LEN. The hash
c5077abd4ef2 (hashfn_eq, hashfn_eql): Don't handle strings specially
Gerd Moellmann <gerd@gnu.org>
parents: 30637
diff changeset
5065 code returned is guaranteed to fit in a Lisp integer. */
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5066
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5067 static unsigned
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5068 sxhash_string (ptr, len)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5069 unsigned char *ptr;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5070 int len;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5071 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5072 unsigned char *p = ptr;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5073 unsigned char *end = p + len;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5074 unsigned char c;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5075 unsigned hash = 0;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5076
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5077 while (p != end)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5078 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5079 c = *p++;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5080 if (c >= 0140)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5081 c -= 40;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5082 hash = ((hash << 3) + (hash >> 28) + c);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5083 }
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5084
53090
86e42266b65e (hashfn_eq, hashfn_eql, hashfn_equal, hash_put)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53042
diff changeset
5085 return hash & INTMASK;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5086 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5087
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5088
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5089 /* Return a hash for list LIST. DEPTH is the current depth in the
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5090 list. We don't recurse deeper than SXHASH_MAX_DEPTH in it. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5091
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5092 static unsigned
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5093 sxhash_list (list, depth)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5094 Lisp_Object list;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5095 int depth;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5096 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5097 unsigned hash = 0;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5098 int i;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5099
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5100 if (depth < SXHASH_MAX_DEPTH)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5101 for (i = 0;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5102 CONSP (list) && i < SXHASH_MAX_LEN;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5103 list = XCDR (list), ++i)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5104 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5105 unsigned hash2 = sxhash (XCAR (list), depth + 1);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5106 hash = SXHASH_COMBINE (hash, hash2);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5107 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5108
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5109 return hash;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5110 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5111
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5112
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5113 /* Return a hash for vector VECTOR. DEPTH is the current depth in
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5114 the Lisp structure. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5115
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5116 static unsigned
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5117 sxhash_vector (vec, depth)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5118 Lisp_Object vec;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5119 int depth;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5120 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5121 unsigned hash = XVECTOR (vec)->size;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5122 int i, n;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5123
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5124 n = min (SXHASH_MAX_LEN, XVECTOR (vec)->size);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5125 for (i = 0; i < n; ++i)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5126 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5127 unsigned hash2 = sxhash (XVECTOR (vec)->contents[i], depth + 1);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5128 hash = SXHASH_COMBINE (hash, hash2);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5129 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5130
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5131 return hash;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5132 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5133
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5134
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5135 /* Return a hash for bool-vector VECTOR. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5136
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5137 static unsigned
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5138 sxhash_bool_vector (vec)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5139 Lisp_Object vec;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5140 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5141 unsigned hash = XBOOL_VECTOR (vec)->size;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5142 int i, n;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5143
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5144 n = min (SXHASH_MAX_LEN, XBOOL_VECTOR (vec)->vector_size);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5145 for (i = 0; i < n; ++i)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5146 hash = SXHASH_COMBINE (hash, XBOOL_VECTOR (vec)->data[i]);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5147
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5148 return hash;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5149 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5150
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5151
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5152 /* Return a hash code for OBJ. DEPTH is the current depth in the Lisp
53090
86e42266b65e (hashfn_eq, hashfn_eql, hashfn_equal, hash_put)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53042
diff changeset
5153 structure. Value is an unsigned integer clipped to INTMASK. */
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5154
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5155 unsigned
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5156 sxhash (obj, depth)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5157 Lisp_Object obj;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5158 int depth;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5159 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5160 unsigned hash;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5161
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5162 if (depth > SXHASH_MAX_DEPTH)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5163 return 0;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5164
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5165 switch (XTYPE (obj))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5166 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5167 case Lisp_Int:
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5168 hash = XUINT (obj);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5169 break;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5170
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5171 case Lisp_Misc:
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5172 hash = XUINT (obj);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5173 break;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5174
57988
75429b9aa2f2 (sxhash): As far as possible, merge calculation of
Eli Zaretskii <eliz@gnu.org>
parents: 57726
diff changeset
5175 case Lisp_Symbol:
75429b9aa2f2 (sxhash): As far as possible, merge calculation of
Eli Zaretskii <eliz@gnu.org>
parents: 57726
diff changeset
5176 obj = SYMBOL_NAME (obj);
75429b9aa2f2 (sxhash): As far as possible, merge calculation of
Eli Zaretskii <eliz@gnu.org>
parents: 57726
diff changeset
5177 /* Fall through. */
75429b9aa2f2 (sxhash): As far as possible, merge calculation of
Eli Zaretskii <eliz@gnu.org>
parents: 57726
diff changeset
5178
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5179 case Lisp_String:
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
5180 hash = sxhash_string (SDATA (obj), SCHARS (obj));
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5181 break;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5182
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5183 /* This can be everything from a vector to an overlay. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5184 case Lisp_Vectorlike:
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5185 if (VECTORP (obj))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5186 /* According to the CL HyperSpec, two arrays are equal only if
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5187 they are `eq', except for strings and bit-vectors. In
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5188 Emacs, this works differently. We have to compare element
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5189 by element. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5190 hash = sxhash_vector (obj, depth);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5191 else if (BOOL_VECTOR_P (obj))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5192 hash = sxhash_bool_vector (obj);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5193 else
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5194 /* Others are `equal' if they are `eq', so let's take their
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5195 address as hash. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5196 hash = XUINT (obj);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5197 break;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5198
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5199 case Lisp_Cons:
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5200 hash = sxhash_list (obj, depth);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5201 break;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5202
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5203 case Lisp_Float:
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5204 {
25495
5051c1d824fa (Fhash_table_weakness): Replaces F_hash_table_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25455
diff changeset
5205 unsigned char *p = (unsigned char *) &XFLOAT_DATA (obj);
5051c1d824fa (Fhash_table_weakness): Replaces F_hash_table_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25455
diff changeset
5206 unsigned char *e = p + sizeof XFLOAT_DATA (obj);
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5207 for (hash = 0; p < e; ++p)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5208 hash = SXHASH_COMBINE (hash, *p);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5209 break;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5210 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5211
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5212 default:
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5213 abort ();
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5214 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5215
53090
86e42266b65e (hashfn_eq, hashfn_eql, hashfn_equal, hash_put)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53042
diff changeset
5216 return hash & INTMASK;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5217 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5218
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5219
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5220
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5221 /***********************************************************************
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5222 Lisp Interface
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5223 ***********************************************************************/
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5224
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5225
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5226 DEFUN ("sxhash", Fsxhash, Ssxhash, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5227 doc: /* Compute a hash code for OBJ and return it as integer. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5228 (obj)
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5229 Lisp_Object obj;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5230 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5231 unsigned hash = sxhash (obj, 0);;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5232 return make_number (hash);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5233 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5234
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5235
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5236 DEFUN ("make-hash-table", Fmake_hash_table, Smake_hash_table, 0, MANY, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5237 doc: /* Create and return a new hash table.
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5238
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5239 Arguments are specified as keyword/argument pairs. The following
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5240 arguments are defined:
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5241
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5242 :test TEST -- TEST must be a symbol that specifies how to compare
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5243 keys. Default is `eql'. Predefined are the tests `eq', `eql', and
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5244 `equal'. User-supplied test and hash functions can be specified via
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5245 `define-hash-table-test'.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5246
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5247 :size SIZE -- A hint as to how many elements will be put in the table.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5248 Default is 65.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5249
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5250 :rehash-size REHASH-SIZE - Indicates how to expand the table when it
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5251 fills up. If REHASH-SIZE is an integer, add that many space. If it
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5252 is a float, it must be > 1.0, and the new size is computed by
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5253 multiplying the old size with that factor. Default is 1.5.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5254
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5255 :rehash-threshold THRESHOLD -- THRESHOLD must a float > 0, and <= 1.0.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5256 Resize the hash table when ratio of the number of entries in the
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5257 table. Default is 0.8.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5258
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5259 :weakness WEAK -- WEAK must be one of nil, t, `key', `value',
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5260 `key-or-value', or `key-and-value'. If WEAK is not nil, the table
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5261 returned is a weak table. Key/value pairs are removed from a weak
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5262 hash table when there are no non-weak references pointing to their
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5263 key, value, one of key or value, or both key and value, depending on
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5264 WEAK. WEAK t is equivalent to `key-and-value'. Default value of WEAK
40132
75fe73bea452 (Fappend, Fconcat, Fvconcat, Fnconc, Fwidget_apply, Fmake_hash_table):
Miles Bader <miles@gnu.org>
parents: 39977
diff changeset
5265 is nil.
75fe73bea452 (Fappend, Fconcat, Fvconcat, Fnconc, Fwidget_apply, Fmake_hash_table):
Miles Bader <miles@gnu.org>
parents: 39977
diff changeset
5266
75fe73bea452 (Fappend, Fconcat, Fvconcat, Fnconc, Fwidget_apply, Fmake_hash_table):
Miles Bader <miles@gnu.org>
parents: 39977
diff changeset
5267 usage: (make-hash-table &rest KEYWORD-ARGS) */)
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5268 (nargs, args)
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5269 int nargs;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5270 Lisp_Object *args;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5271 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5272 Lisp_Object test, size, rehash_size, rehash_threshold, weak;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5273 Lisp_Object user_test, user_hash;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5274 char *used;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5275 int i;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5276
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5277 /* The vector `used' is used to keep track of arguments that
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5278 have been consumed. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5279 used = (char *) alloca (nargs * sizeof *used);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5280 bzero (used, nargs * sizeof *used);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5281
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5282 /* See if there's a `:test TEST' among the arguments. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5283 i = get_key_arg (QCtest, nargs, args, used);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5284 test = i < 0 ? Qeql : args[i];
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5285 if (!EQ (test, Qeq) && !EQ (test, Qeql) && !EQ (test, Qequal))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5286 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5287 /* See if it is a user-defined test. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5288 Lisp_Object prop;
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5289
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5290 prop = Fget (test, Qhash_table_test);
40734
95dd892ad5e3 (Fmake_hash_table): Use XCAR and XCDR, not Fnth and Flength.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
5291 if (!CONSP (prop) || !CONSP (XCDR (prop)))
30602
4f195cb24338 Replace `illegal' with `invalid'.
Gerd Moellmann <gerd@gnu.org>
parents: 30597
diff changeset
5292 Fsignal (Qerror, list2 (build_string ("Invalid hash table test"),
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5293 test));
40734
95dd892ad5e3 (Fmake_hash_table): Use XCAR and XCDR, not Fnth and Flength.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
5294 user_test = XCAR (prop);
95dd892ad5e3 (Fmake_hash_table): Use XCAR and XCDR, not Fnth and Flength.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
5295 user_hash = XCAR (XCDR (prop));
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5296 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5297 else
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5298 user_test = user_hash = Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5299
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5300 /* See if there's a `:size SIZE' argument. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5301 i = get_key_arg (QCsize, nargs, args, used);
46221
2f81e2382d8d (Fnconc): Use XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45650
diff changeset
5302 size = i < 0 ? Qnil : args[i];
2f81e2382d8d (Fnconc): Use XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45650
diff changeset
5303 if (NILP (size))
2f81e2382d8d (Fnconc): Use XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45650
diff changeset
5304 size = make_number (DEFAULT_HASH_SIZE);
2f81e2382d8d (Fnconc): Use XCDR.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45650
diff changeset
5305 else if (!INTEGERP (size) || XINT (size) < 0)
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5306 Fsignal (Qerror,
30602
4f195cb24338 Replace `illegal' with `invalid'.
Gerd Moellmann <gerd@gnu.org>
parents: 30597
diff changeset
5307 list2 (build_string ("Invalid hash table size"),
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5308 size));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5309
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5310 /* Look for `:rehash-size SIZE'. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5311 i = get_key_arg (QCrehash_size, nargs, args, used);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5312 rehash_size = i < 0 ? make_float (DEFAULT_REHASH_SIZE) : args[i];
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5313 if (!NUMBERP (rehash_size)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5314 || (INTEGERP (rehash_size) && XINT (rehash_size) <= 0)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5315 || XFLOATINT (rehash_size) <= 1.0)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5316 Fsignal (Qerror,
30602
4f195cb24338 Replace `illegal' with `invalid'.
Gerd Moellmann <gerd@gnu.org>
parents: 30597
diff changeset
5317 list2 (build_string ("Invalid hash table rehash size"),
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5318 rehash_size));
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5319
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5320 /* Look for `:rehash-threshold THRESHOLD'. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5321 i = get_key_arg (QCrehash_threshold, nargs, args, used);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5322 rehash_threshold = i < 0 ? make_float (DEFAULT_REHASH_THRESHOLD) : args[i];
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5323 if (!FLOATP (rehash_threshold)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5324 || XFLOATINT (rehash_threshold) <= 0.0
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5325 || XFLOATINT (rehash_threshold) > 1.0)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5326 Fsignal (Qerror,
30602
4f195cb24338 Replace `illegal' with `invalid'.
Gerd Moellmann <gerd@gnu.org>
parents: 30597
diff changeset
5327 list2 (build_string ("Invalid hash table rehash threshold"),
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5328 rehash_threshold));
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5329
25455
8c2f3438bb2c (QCweakness): Replaces QCweak.
Gerd Moellmann <gerd@gnu.org>
parents: 25365
diff changeset
5330 /* Look for `:weakness WEAK'. */
8c2f3438bb2c (QCweakness): Replaces QCweak.
Gerd Moellmann <gerd@gnu.org>
parents: 25365
diff changeset
5331 i = get_key_arg (QCweakness, nargs, args, used);
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5332 weak = i < 0 ? Qnil : args[i];
30496
25d798a40775 (Qkey_or_value, Qkey_and_value): New variables.
Gerd Moellmann <gerd@gnu.org>
parents: 30488
diff changeset
5333 if (EQ (weak, Qt))
25d798a40775 (Qkey_or_value, Qkey_and_value): New variables.
Gerd Moellmann <gerd@gnu.org>
parents: 30488
diff changeset
5334 weak = Qkey_and_value;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5335 if (!NILP (weak)
25365
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
5336 && !EQ (weak, Qkey)
30496
25d798a40775 (Qkey_or_value, Qkey_and_value): New variables.
Gerd Moellmann <gerd@gnu.org>
parents: 30488
diff changeset
5337 && !EQ (weak, Qvalue)
25d798a40775 (Qkey_or_value, Qkey_and_value): New variables.
Gerd Moellmann <gerd@gnu.org>
parents: 30488
diff changeset
5338 && !EQ (weak, Qkey_or_value)
25d798a40775 (Qkey_or_value, Qkey_and_value): New variables.
Gerd Moellmann <gerd@gnu.org>
parents: 30488
diff changeset
5339 && !EQ (weak, Qkey_and_value))
30602
4f195cb24338 Replace `illegal' with `invalid'.
Gerd Moellmann <gerd@gnu.org>
parents: 30597
diff changeset
5340 Fsignal (Qerror, list2 (build_string ("Invalid hash table weakness"),
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5341 weak));
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5342
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5343 /* Now, all args should have been used up, or there's a problem. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5344 for (i = 0; i < nargs; ++i)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5345 if (!used[i])
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5346 Fsignal (Qerror,
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5347 list2 (build_string ("Invalid argument list"), args[i]));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5348
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5349 return make_hash_table (test, size, rehash_size, rehash_threshold, weak,
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5350 user_test, user_hash);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5351 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5352
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5353
25365
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
5354 DEFUN ("copy-hash-table", Fcopy_hash_table, Scopy_hash_table, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5355 doc: /* Return a copy of hash table TABLE. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5356 (table)
25365
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
5357 Lisp_Object table;
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
5358 {
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
5359 return copy_hash_table (check_hash_table (table));
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
5360 }
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
5361
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
5362
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5363 DEFUN ("hash-table-count", Fhash_table_count, Shash_table_count, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5364 doc: /* Return the number of elements in TABLE. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5365 (table)
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5366 Lisp_Object table;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5367 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5368 return check_hash_table (table)->count;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5369 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5370
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5371
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5372 DEFUN ("hash-table-rehash-size", Fhash_table_rehash_size,
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5373 Shash_table_rehash_size, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5374 doc: /* Return the current rehash size of TABLE. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5375 (table)
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5376 Lisp_Object table;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5377 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5378 return check_hash_table (table)->rehash_size;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5379 }
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5380
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5381
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5382 DEFUN ("hash-table-rehash-threshold", Fhash_table_rehash_threshold,
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5383 Shash_table_rehash_threshold, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5384 doc: /* Return the current rehash threshold of TABLE. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5385 (table)
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5386 Lisp_Object table;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5387 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5388 return check_hash_table (table)->rehash_threshold;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5389 }
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5390
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5391
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5392 DEFUN ("hash-table-size", Fhash_table_size, Shash_table_size, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5393 doc: /* Return the size of TABLE.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5394 The size can be used as an argument to `make-hash-table' to create
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5395 a hash table than can hold as many elements of TABLE holds
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5396 without need for resizing. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5397 (table)
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5398 Lisp_Object table;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5399 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5400 struct Lisp_Hash_Table *h = check_hash_table (table);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5401 return make_number (HASH_TABLE_SIZE (h));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5402 }
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5403
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5404
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5405 DEFUN ("hash-table-test", Fhash_table_test, Shash_table_test, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5406 doc: /* Return the test TABLE uses. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5407 (table)
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5408 Lisp_Object table;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5409 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5410 return check_hash_table (table)->test;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5411 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5412
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5413
25495
5051c1d824fa (Fhash_table_weakness): Replaces F_hash_table_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25455
diff changeset
5414 DEFUN ("hash-table-weakness", Fhash_table_weakness, Shash_table_weakness,
5051c1d824fa (Fhash_table_weakness): Replaces F_hash_table_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25455
diff changeset
5415 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5416 doc: /* Return the weakness of TABLE. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5417 (table)
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5418 Lisp_Object table;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5419 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5420 return check_hash_table (table)->weak;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5421 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5422
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5423
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5424 DEFUN ("hash-table-p", Fhash_table_p, Shash_table_p, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5425 doc: /* Return t if OBJ is a Lisp hash table object. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5426 (obj)
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5427 Lisp_Object obj;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5428 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5429 return HASH_TABLE_P (obj) ? Qt : Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5430 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5431
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5432
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5433 DEFUN ("clrhash", Fclrhash, Sclrhash, 1, 1, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5434 doc: /* Clear hash table TABLE. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5435 (table)
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5436 Lisp_Object table;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5437 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5438 hash_clear (check_hash_table (table));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5439 return Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5440 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5441
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5442
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5443 DEFUN ("gethash", Fgethash, Sgethash, 2, 3, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5444 doc: /* Look up KEY in TABLE and return its associated value.
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5445 If KEY is not found, return DFLT which defaults to nil. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5446 (key, table, dflt)
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25709
diff changeset
5447 Lisp_Object key, table, dflt;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5448 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5449 struct Lisp_Hash_Table *h = check_hash_table (table);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5450 int i = hash_lookup (h, key, NULL);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5451 return i >= 0 ? HASH_VALUE (h, i) : dflt;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5452 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5453
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5454
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5455 DEFUN ("puthash", Fputhash, Sputhash, 3, 3, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5456 doc: /* Associate KEY with VALUE in hash table TABLE.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5457 If KEY is already present in table, replace its current value with
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5458 VALUE. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5459 (key, value, table)
25080
46c21258f1ff (Fgethash): Fix order of variables (patch by gerd).
Markus Rost <rost@math.uni-bielefeld.de>
parents: 25071
diff changeset
5460 Lisp_Object key, value, table;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5461 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5462 struct Lisp_Hash_Table *h = check_hash_table (table);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5463 int i;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5464 unsigned hash;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5465
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5466 i = hash_lookup (h, key, &hash);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5467 if (i >= 0)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5468 HASH_VALUE (h, i) = value;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5469 else
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5470 hash_put (h, key, value, hash);
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5471
29991
fff5fd809d11 (Fputhash): Return `value' rather than nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29979
diff changeset
5472 return value;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5473 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5474
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5475
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5476 DEFUN ("remhash", Fremhash, Sremhash, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5477 doc: /* Remove KEY from TABLE. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5478 (key, table)
25080
46c21258f1ff (Fgethash): Fix order of variables (patch by gerd).
Markus Rost <rost@math.uni-bielefeld.de>
parents: 25071
diff changeset
5479 Lisp_Object key, table;
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5480 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5481 struct Lisp_Hash_Table *h = check_hash_table (table);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5482 hash_remove (h, key);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5483 return Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5484 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5485
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5486
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5487 DEFUN ("maphash", Fmaphash, Smaphash, 2, 2, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5488 doc: /* Call FUNCTION for all entries in hash table TABLE.
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5489 FUNCTION is called with 2 arguments KEY and VALUE. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5490 (function, table)
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5491 Lisp_Object function, table;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5492 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5493 struct Lisp_Hash_Table *h = check_hash_table (table);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5494 Lisp_Object args[3];
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5495 int i;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5496
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5497 for (i = 0; i < HASH_TABLE_SIZE (h); ++i)
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5498 if (!NILP (HASH_HASH (h, i)))
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5499 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5500 args[0] = function;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5501 args[1] = HASH_KEY (h, i);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5502 args[2] = HASH_VALUE (h, i);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5503 Ffuncall (3, args);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5504 }
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5505
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5506 return Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5507 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5508
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5509
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5510 DEFUN ("define-hash-table-test", Fdefine_hash_table_test,
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5511 Sdefine_hash_table_test, 3, 3, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5512 doc: /* Define a new hash table test with name NAME, a symbol.
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5513
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5514 In hash tables created with NAME specified as test, use TEST to
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5515 compare keys, and HASH for computing hash codes of keys.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5516
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5517 TEST must be a function taking two arguments and returning non-nil if
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5518 both arguments are the same. HASH must be a function taking one
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5519 argument and return an integer that is the hash code of the argument.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5520 Hash code computation should use the whole value range of integers,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5521 including negative integers. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5522 (name, test, hash)
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5523 Lisp_Object name, test, hash;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5524 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5525 return Fput (name, Qhash_table_test, list2 (test, hash));
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5526 }
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5527
28965
dead0196fbc8 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 28962
diff changeset
5528
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5529
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5530 /************************************************************************
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5531 MD5
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5532 ************************************************************************/
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5533
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5534 #include "md5.h"
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5535 #include "coding.h"
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5536
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5537 DEFUN ("md5", Fmd5, Smd5, 1, 5, 0,
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5538 doc: /* Return MD5 message digest of OBJECT, a buffer or string.
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5539
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5540 A message digest is a cryptographic checksum of a document, and the
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5541 algorithm to calculate it is defined in RFC 1321.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5542
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5543 The two optional arguments START and END are character positions
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5544 specifying for which part of OBJECT the message digest should be
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5545 computed. If nil or omitted, the digest is computed for the whole
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5546 OBJECT.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5547
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5548 The MD5 message digest is computed from the result of encoding the
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5549 text in a coding system, not directly from the internal Emacs form of
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5550 the text. The optional fourth argument CODING-SYSTEM specifies which
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5551 coding system to encode the text with. It should be the same coding
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5552 system that you used or will use when actually writing the text into a
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5553 file.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5554
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5555 If CODING-SYSTEM is nil or omitted, the default depends on OBJECT. If
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5556 OBJECT is a buffer, the default for CODING-SYSTEM is whatever coding
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5557 system would be chosen by default for writing this text into a file.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5558
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5559 If OBJECT is a string, the most preferred coding system (see the
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5560 command `prefer-coding-system') is used.
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5561
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5562 If NOERROR is non-nil, silently assume the `raw-text' coding if the
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5563 guesswork fails. Normally, an error is signaled in such case. */)
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5564 (object, start, end, coding_system, noerror)
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5565 Lisp_Object object, start, end, coding_system, noerror;
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5566 {
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5567 unsigned char digest[16];
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5568 unsigned char value[33];
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5569 int i;
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5570 int size;
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5571 int size_byte = 0;
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5572 int start_char = 0, end_char = 0;
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5573 int start_byte = 0, end_byte = 0;
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5574 register int b, e;
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5575 register struct buffer *bp;
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5576 int temp;
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5577
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5578 if (STRINGP (object))
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5579 {
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5580 if (NILP (coding_system))
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5581 {
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5582 /* Decide the coding-system to encode the data with. */
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5583
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5584 if (STRING_MULTIBYTE (object))
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5585 /* use default, we can't guess correct value */
39581
6d9fa06012a6 Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents: 39072
diff changeset
5586 coding_system = SYMBOL_VALUE (XCAR (Vcoding_category_list));
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5587 else
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5588 coding_system = Qraw_text;
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5589 }
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5590
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5591 if (NILP (Fcoding_system_p (coding_system)))
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5592 {
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5593 /* Invalid coding system. */
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5594
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5595 if (!NILP (noerror))
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5596 coding_system = Qraw_text;
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5597 else
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5598 while (1)
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5599 Fsignal (Qcoding_system_error, Fcons (coding_system, Qnil));
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5600 }
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5601
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5602 if (STRING_MULTIBYTE (object))
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5603 object = code_convert_string1 (object, coding_system, Qnil, 1);
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5604
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
5605 size = SCHARS (object);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
5606 size_byte = SBYTES (object);
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5607
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5608 if (!NILP (start))
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5609 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
5610 CHECK_NUMBER (start);
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5611
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5612 start_char = XINT (start);
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5613
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5614 if (start_char < 0)
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5615 start_char += size;
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5616
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5617 start_byte = string_char_to_byte (object, start_char);
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5618 }
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5619
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5620 if (NILP (end))
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5621 {
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5622 end_char = size;
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5623 end_byte = size_byte;
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5624 }
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5625 else
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5626 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
5627 CHECK_NUMBER (end);
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5628
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5629 end_char = XINT (end);
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5630
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5631 if (end_char < 0)
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5632 end_char += size;
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5633
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5634 end_byte = string_char_to_byte (object, end_char);
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5635 }
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5636
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5637 if (!(0 <= start_char && start_char <= end_char && end_char <= size))
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5638 args_out_of_range_3 (object, make_number (start_char),
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5639 make_number (end_char));
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5640 }
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5641 else
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5642 {
53681
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5643 struct buffer *prev = current_buffer;
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5644
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5645 record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5646
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
5647 CHECK_BUFFER (object);
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5648
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5649 bp = XBUFFER (object);
53681
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5650 if (bp != current_buffer)
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5651 set_buffer_internal (bp);
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5652
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5653 if (NILP (start))
53681
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5654 b = BEGV;
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5655 else
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5656 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
5657 CHECK_NUMBER_COERCE_MARKER (start);
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5658 b = XINT (start);
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5659 }
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5660
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5661 if (NILP (end))
53681
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5662 e = ZV;
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5663 else
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5664 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40550
diff changeset
5665 CHECK_NUMBER_COERCE_MARKER (end);
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5666 e = XINT (end);
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5667 }
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5668
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5669 if (b > e)
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5670 temp = b, b = e, e = temp;
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5671
53681
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5672 if (!(BEGV <= b && e <= ZV))
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5673 args_out_of_range (start, end);
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5674
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5675 if (NILP (coding_system))
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5676 {
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5677 /* Decide the coding-system to encode the data with.
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5678 See fileio.c:Fwrite-region */
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5679
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5680 if (!NILP (Vcoding_system_for_write))
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5681 coding_system = Vcoding_system_for_write;
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5682 else
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5683 {
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5684 int force_raw_text = 0;
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5685
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5686 coding_system = XBUFFER (object)->buffer_file_coding_system;
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5687 if (NILP (coding_system)
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5688 || NILP (Flocal_variable_p (Qbuffer_file_coding_system, Qnil)))
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5689 {
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5690 coding_system = Qnil;
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5691 if (NILP (current_buffer->enable_multibyte_characters))
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5692 force_raw_text = 1;
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5693 }
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5694
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5695 if (NILP (coding_system) && !NILP (Fbuffer_file_name(object)))
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5696 {
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5697 /* Check file-coding-system-alist. */
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5698 Lisp_Object args[4], val;
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5699
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5700 args[0] = Qwrite_region; args[1] = start; args[2] = end;
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5701 args[3] = Fbuffer_file_name(object);
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5702 val = Ffind_operation_coding_system (4, args);
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5703 if (CONSP (val) && !NILP (XCDR (val)))
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5704 coding_system = XCDR (val);
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5705 }
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5706
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5707 if (NILP (coding_system)
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5708 && !NILP (XBUFFER (object)->buffer_file_coding_system))
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5709 {
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5710 /* If we still have not decided a coding system, use the
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5711 default value of buffer-file-coding-system. */
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5712 coding_system = XBUFFER (object)->buffer_file_coding_system;
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5713 }
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5714
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5715 if (!force_raw_text
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5716 && !NILP (Ffboundp (Vselect_safe_coding_system_function)))
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5717 /* Confirm that VAL can surely encode the current region. */
45629
6adda7388fcc (md5): Pass FILE arg to Vselect_safe_coding_system_function.
Richard M. Stallman <rms@gnu.org>
parents: 45401
diff changeset
5718 coding_system = call4 (Vselect_safe_coding_system_function,
34153
f493b32a1a91 (Fmd5): Pass lisp objects, not integers, to call3.
Ken Raeburn <raeburn@raeburn.org>
parents: 34106
diff changeset
5719 make_number (b), make_number (e),
45629
6adda7388fcc (md5): Pass FILE arg to Vselect_safe_coding_system_function.
Richard M. Stallman <rms@gnu.org>
parents: 45401
diff changeset
5720 coding_system, Qnil);
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5721
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5722 if (force_raw_text)
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5723 coding_system = Qraw_text;
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5724 }
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5725
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5726 if (NILP (Fcoding_system_p (coding_system)))
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5727 {
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5728 /* Invalid coding system. */
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5729
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5730 if (!NILP (noerror))
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5731 coding_system = Qraw_text;
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5732 else
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5733 while (1)
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5734 Fsignal (Qcoding_system_error, Fcons (coding_system, Qnil));
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5735 }
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5736 }
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5737
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5738 object = make_buffer_string (b, e, 0);
53681
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5739 if (prev != current_buffer)
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5740 set_buffer_internal (prev);
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5741 /* Discard the unwind protect for recovering the current
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5742 buffer. */
206ba2723812 (Fmd5): If OBJECT is a buffer different from the current
Kenichi Handa <handa@m17n.org>
parents: 53393
diff changeset
5743 specpdl_ptr--;
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5744
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5745 if (STRING_MULTIBYTE (object))
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5746 object = code_convert_string1 (object, coding_system, Qnil, 1);
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5747 }
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5748
49246
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5749 md5_buffer (SDATA (object) + start_byte,
c1dbdec496c3 (Fsubstring): Clarify doc string.
Francesco Potortì <pot@gnu.org>
parents: 49204
diff changeset
5750 SBYTES (object) - (size_byte - end_byte),
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5751 digest);
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5752
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5753 for (i = 0; i < 16; i++)
34106
89fd59727c6c (Fmd5): Use a different logic to decide the coding system
Gerd Moellmann <gerd@gnu.org>
parents: 34053
diff changeset
5754 sprintf (&value[2 * i], "%02x", digest[i]);
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5755 value[32] = '\0';
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5756
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5757 return make_string (value, 32);
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5758 }
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5759
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
5760
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21383
diff changeset
5761 void
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5762 syms_of_fns ()
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5763 {
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5764 /* Hash table stuff. */
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5765 Qhash_table_p = intern ("hash-table-p");
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5766 staticpro (&Qhash_table_p);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5767 Qeq = intern ("eq");
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5768 staticpro (&Qeq);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5769 Qeql = intern ("eql");
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5770 staticpro (&Qeql);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5771 Qequal = intern ("equal");
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5772 staticpro (&Qequal);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5773 QCtest = intern (":test");
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5774 staticpro (&QCtest);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5775 QCsize = intern (":size");
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5776 staticpro (&QCsize);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5777 QCrehash_size = intern (":rehash-size");
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5778 staticpro (&QCrehash_size);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5779 QCrehash_threshold = intern (":rehash-threshold");
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5780 staticpro (&QCrehash_threshold);
25455
8c2f3438bb2c (QCweakness): Replaces QCweak.
Gerd Moellmann <gerd@gnu.org>
parents: 25365
diff changeset
5781 QCweakness = intern (":weakness");
8c2f3438bb2c (QCweakness): Replaces QCweak.
Gerd Moellmann <gerd@gnu.org>
parents: 25365
diff changeset
5782 staticpro (&QCweakness);
25365
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
5783 Qkey = intern ("key");
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
5784 staticpro (&Qkey);
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
5785 Qvalue = intern ("value");
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
5786 staticpro (&Qvalue);
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5787 Qhash_table_test = intern ("hash-table-test");
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5788 staticpro (&Qhash_table_test);
30496
25d798a40775 (Qkey_or_value, Qkey_and_value): New variables.
Gerd Moellmann <gerd@gnu.org>
parents: 30488
diff changeset
5789 Qkey_or_value = intern ("key-or-value");
25d798a40775 (Qkey_or_value, Qkey_and_value): New variables.
Gerd Moellmann <gerd@gnu.org>
parents: 30488
diff changeset
5790 staticpro (&Qkey_or_value);
25d798a40775 (Qkey_or_value, Qkey_and_value): New variables.
Gerd Moellmann <gerd@gnu.org>
parents: 30488
diff changeset
5791 Qkey_and_value = intern ("key-and-value");
25d798a40775 (Qkey_or_value, Qkey_and_value): New variables.
Gerd Moellmann <gerd@gnu.org>
parents: 30488
diff changeset
5792 staticpro (&Qkey_and_value);
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5793
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5794 defsubr (&Ssxhash);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5795 defsubr (&Smake_hash_table);
25365
f32071216123 (Qkey, Qvalue): Renamed from Qkey_weak, and Qvalue_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25349
diff changeset
5796 defsubr (&Scopy_hash_table);
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5797 defsubr (&Shash_table_count);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5798 defsubr (&Shash_table_rehash_size);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5799 defsubr (&Shash_table_rehash_threshold);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5800 defsubr (&Shash_table_size);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5801 defsubr (&Shash_table_test);
25495
5051c1d824fa (Fhash_table_weakness): Replaces F_hash_table_weak.
Gerd Moellmann <gerd@gnu.org>
parents: 25455
diff changeset
5802 defsubr (&Shash_table_weakness);
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5803 defsubr (&Shash_table_p);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5804 defsubr (&Sclrhash);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5805 defsubr (&Sgethash);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5806 defsubr (&Sputhash);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5807 defsubr (&Sremhash);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5808 defsubr (&Smaphash);
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5809 defsubr (&Sdefine_hash_table_test);
30597
2cb00e0bf8d5 (Fmake_hash_table): Add missing `\n\' to end of line in docstring.
Noah Friedman <friedman@splode.com>
parents: 30510
diff changeset
5810
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5811 Qstring_lessp = intern ("string-lessp");
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5812 staticpro (&Qstring_lessp);
2546
c8cd694d70eb (provide, require): Put appropriately-marked
Richard M. Stallman <rms@gnu.org>
parents: 2525
diff changeset
5813 Qprovide = intern ("provide");
c8cd694d70eb (provide, require): Put appropriately-marked
Richard M. Stallman <rms@gnu.org>
parents: 2525
diff changeset
5814 staticpro (&Qprovide);
c8cd694d70eb (provide, require): Put appropriately-marked
Richard M. Stallman <rms@gnu.org>
parents: 2525
diff changeset
5815 Qrequire = intern ("require");
c8cd694d70eb (provide, require): Put appropriately-marked
Richard M. Stallman <rms@gnu.org>
parents: 2525
diff changeset
5816 staticpro (&Qrequire);
4456
cbfcf187b5da (Fyes_or_no_p): Use Qyes_or_no_p_history.
Richard M. Stallman <rms@gnu.org>
parents: 4004
diff changeset
5817 Qyes_or_no_p_history = intern ("yes-or-no-p-history");
cbfcf187b5da (Fyes_or_no_p): Use Qyes_or_no_p_history.
Richard M. Stallman <rms@gnu.org>
parents: 4004
diff changeset
5818 staticpro (&Qyes_or_no_p_history);
14456
fb11ccbe5c7c (Qcursor_in_echo_area): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14392
diff changeset
5819 Qcursor_in_echo_area = intern ("cursor-in-echo-area");
fb11ccbe5c7c (Qcursor_in_echo_area): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14392
diff changeset
5820 staticpro (&Qcursor_in_echo_area);
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
5821 Qwidget_type = intern ("widget-type");
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
5822 staticpro (&Qwidget_type);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5823
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
5824 staticpro (&string_char_byte_cache_string);
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
5825 string_char_byte_cache_string = Qnil;
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
5826
40474
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
5827 require_nesting_list = Qnil;
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
5828 staticpro (&require_nesting_list);
e8c25a61215d (Frequire): Detect recursive try to require the same
Richard M. Stallman <rms@gnu.org>
parents: 40132
diff changeset
5829
14486
3c4ba112108e (syms_of_fns): Set yes-or-no-p-history to nil.
Richard M. Stallman <rms@gnu.org>
parents: 14456
diff changeset
5830 Fset (Qyes_or_no_p_history, Qnil);
3c4ba112108e (syms_of_fns): Set yes-or-no-p-history to nil.
Richard M. Stallman <rms@gnu.org>
parents: 14456
diff changeset
5831
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5832 DEFVAR_LISP ("features", &Vfeatures,
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5833 doc: /* A list of symbols which are the features of the executing emacs.
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5834 Used by `featurep' and `require', and altered by `provide'. */);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5835 Vfeatures = Qnil;
39850
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
5836 Qsubfeatures = intern ("subfeatures");
80b844540f64 (Ffeaturep): Add new `subfeature' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39697
diff changeset
5837 staticpro (&Qsubfeatures);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5838
49081
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
5839 #ifdef HAVE_LANGINFO_CODESET
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
5840 Qcodeset = intern ("codeset");
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
5841 staticpro (&Qcodeset);
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
5842 Qdays = intern ("days");
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
5843 staticpro (&Qdays);
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
5844 Qmonths = intern ("months");
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
5845 staticpro (&Qmonths);
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
5846 Qpaper = intern ("paper");
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
5847 staticpro (&Qpaper);
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
5848 #endif /* HAVE_LANGINFO_CODESET */
bd4e0fb1fe78 Include coding.h. Use POINTER_TYPE*, not void*.
Dave Love <fx@gnu.org>
parents: 48596
diff changeset
5849
39977
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5850 DEFVAR_BOOL ("use-dialog-box", &use_dialog_box,
51c2b8f7aa5a Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39973
diff changeset
5851 doc: /* *Non-nil means mouse commands use dialog boxes to ask questions.
44712
093bf061ef1d (use-dialog-box): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 44524
diff changeset
5852 This applies to `y-or-n-p' and `yes-or-no-p' questions asked by commands
39899
34ec3a68775d Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39850
diff changeset
5853 invoked by mouse clicks and mouse menu items. */);
18531
35a263e545b3 (Fy_or_n_p, Fyes_or_no_p): Obey use_dialog_box.
Richard M. Stallman <rms@gnu.org>
parents: 18421
diff changeset
5854 use_dialog_box = 1;
35a263e545b3 (Fy_or_n_p, Fyes_or_no_p): Obey use_dialog_box.
Richard M. Stallman <rms@gnu.org>
parents: 18421
diff changeset
5855
53189
2c1d6f1a791e Add variable use-file-dialog to control use of file dialogs.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53159
diff changeset
5856 DEFVAR_BOOL ("use-file-dialog", &use_file_dialog,
2c1d6f1a791e Add variable use-file-dialog to control use of file dialogs.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53159
diff changeset
5857 doc: /* *Non-nil means mouse commands use a file dialog to ask for files.
2c1d6f1a791e Add variable use-file-dialog to control use of file dialogs.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53159
diff changeset
5858 This applies to commands from menus and tool bar buttons. The value of
2c1d6f1a791e Add variable use-file-dialog to control use of file dialogs.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53159
diff changeset
5859 `use-dialog-box' takes precedence over this variable, so a file dialog is only
2c1d6f1a791e Add variable use-file-dialog to control use of file dialogs.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53159
diff changeset
5860 used if both `use-dialog-box' and this variable are non-nil. */);
2c1d6f1a791e Add variable use-file-dialog to control use of file dialogs.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53159
diff changeset
5861 use_file_dialog = 1;
53255
3b437add35b6 (Frandom, Fstring_make_multibyte): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53189
diff changeset
5862
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5863 defsubr (&Sidentity);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5864 defsubr (&Srandom);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5865 defsubr (&Slength);
12466
b22565172b9b (Fsafe_length): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12062
diff changeset
5866 defsubr (&Ssafe_length);
20864
ad9e06c97d95 (Fstring_bytes): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20814
diff changeset
5867 defsubr (&Sstring_bytes);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5868 defsubr (&Sstring_equal);
21671
c359a549f2d2 (Fcompare_strings): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21580
diff changeset
5869 defsubr (&Scompare_strings);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5870 defsubr (&Sstring_lessp);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5871 defsubr (&Sappend);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5872 defsubr (&Sconcat);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5873 defsubr (&Svconcat);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5874 defsubr (&Scopy_sequence);
20667
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
5875 defsubr (&Sstring_make_multibyte);
64af046211eb (concat): Move the test for all nil in `append'
Karl Heuer <kwzh@gnu.org>
parents: 20639
diff changeset
5876 defsubr (&Sstring_make_unibyte);
20813
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
5877 defsubr (&Sstring_as_multibyte);
b040da7cfab8 (concat): If making a string, a nonempty bool-vector is error.
Richard M. Stallman <rms@gnu.org>
parents: 20776
diff changeset
5878 defsubr (&Sstring_as_unibyte);
49656
46090ea2c5c3 (string_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 49246
diff changeset
5879 defsubr (&Sstring_to_multibyte);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5880 defsubr (&Scopy_alist);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5881 defsubr (&Ssubstring);
44159
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
5882 defsubr (&Ssubstring_no_properties);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5883 defsubr (&Snthcdr);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5884 defsubr (&Snth);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5885 defsubr (&Selt);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5886 defsubr (&Smember);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5887 defsubr (&Smemq);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5888 defsubr (&Sassq);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5889 defsubr (&Sassoc);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5890 defsubr (&Srassq);
10588
2a8f29cd9e9f (Frassoc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10485
diff changeset
5891 defsubr (&Srassoc);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5892 defsubr (&Sdelq);
414
4c9349866dac *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 401
diff changeset
5893 defsubr (&Sdelete);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5894 defsubr (&Snreverse);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5895 defsubr (&Sreverse);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5896 defsubr (&Ssort);
11130
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
5897 defsubr (&Splist_get);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5898 defsubr (&Sget);
11130
052869c2f609 (Fplist_put, Fplist_get): New fns.
Boris Goldowsky <boris@gnu.org>
parents: 11094
diff changeset
5899 defsubr (&Splist_put);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5900 defsubr (&Sput);
44159
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
5901 defsubr (&Slax_plist_get);
61c15819e528 (Fsubstring_no_properties): New function.
Richard M. Stallman <rms@gnu.org>
parents: 44066
diff changeset
5902 defsubr (&Slax_plist_put);
54987
1b818fd4a373 (Feql): New function.
John Paul Wallington <jpw@pobox.com>
parents: 54373
diff changeset
5903 defsubr (&Seql);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5904 defsubr (&Sequal);
54373
9685a42b7c56 (internal_equal): New arg PROPS controls comparing
Richard M. Stallman <rms@gnu.org>
parents: 53821
diff changeset
5905 defsubr (&Sequal_including_properties);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5906 defsubr (&Sfillarray);
52075
cda0be6a7138 (Fclear_string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 51976
diff changeset
5907 defsubr (&Sclear_string);
13236
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
5908 defsubr (&Schar_table_subtype);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
5909 defsubr (&Schar_table_parent);
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
5910 defsubr (&Sset_char_table_parent);
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
5911 defsubr (&Schar_table_extra_slot);
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
5912 defsubr (&Sset_char_table_extra_slot);
13236
c9af99bb26d4 (Fchar_table_subtype): New function.
Richard M. Stallman <rms@gnu.org>
parents: 13184
diff changeset
5913 defsubr (&Schar_table_range);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
5914 defsubr (&Sset_char_table_range);
17826
961399e23170 (copy_sub_char_table): Declare the argument ARG as
Kenichi Handa <handa@m17n.org>
parents: 17819
diff changeset
5915 defsubr (&Sset_char_table_default);
28222
33f6a8ee4733 (optimize_sub_char_table): New function.
Kenichi Handa <handa@m17n.org>
parents: 28072
diff changeset
5916 defsubr (&Soptimize_char_table);
13140
99c5d39b9531 (Fset_char_table_range): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12618
diff changeset
5917 defsubr (&Smap_char_table);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5918 defsubr (&Snconc);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5919 defsubr (&Smapcar);
28666
3408e0502727 (syms_of_fns): Defsubr mapc.
Dave Love <fx@gnu.org>
parents: 28555
diff changeset
5920 defsubr (&Smapc);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5921 defsubr (&Smapconcat);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5922 defsubr (&Sy_or_n_p);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5923 defsubr (&Syes_or_no_p);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5924 defsubr (&Sload_average);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5925 defsubr (&Sfeaturep);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5926 defsubr (&Srequire);
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5927 defsubr (&Sprovide);
29953
dad7b11391a3 (Fplist_member): Renamed from Fwidget_plist_member.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29809
diff changeset
5928 defsubr (&Splist_member);
20004
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
5929 defsubr (&Swidget_put);
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
5930 defsubr (&Swidget_get);
de15e679191e (Qwidget_type): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 19573
diff changeset
5931 defsubr (&Swidget_apply);
23208
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
5932 defsubr (&Sbase64_encode_region);
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
5933 defsubr (&Sbase64_decode_region);
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
5934 defsubr (&Sbase64_encode_string);
1abc842b1ca7 (base64_decode_1, base64_encode_1): New functions.
Karl Heuer <kwzh@gnu.org>
parents: 23207
diff changeset
5935 defsubr (&Sbase64_decode_string);
34050
cc03857ce950 (Fmd5): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33041
diff changeset
5936 defsubr (&Smd5);
51976
26f7a240c793 (Flocale_info): Renamed from Flanginfo. Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 51768
diff changeset
5937 defsubr (&Slocale_info);
211
d7da9e79438f Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5938 }
25005
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5939
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5940
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5941 void
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5942 init_fns ()
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5943 {
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5944 Vweak_hash_tables = Qnil;
95eace73d3ef (toplevel): Add hash tables.
Gerd Moellmann <gerd@gnu.org>
parents: 24582
diff changeset
5945 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52075
diff changeset
5946
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52075
diff changeset
5947 /* arch-tag: 787f8219-5b74-46bd-8469-7e1cc475fa31
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52075
diff changeset
5948 (do not change this comment) */