annotate src/lread.c @ 88226:8a1f15a85efb

(rmail-set-attribute): Call rmail-summary-update.
author Alex Schroeder <alex@gnu.org>
date Thu, 19 Jan 2006 23:52:59 +0000
parents d7ddb3e565de
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Lisp parsing and input streams.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
4 2005 Free Software Foundation, Inc.
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6 This file is part of GNU Emacs.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 GNU Emacs is free software; you can redistribute it and/or modify
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9 it under the terms of the GNU General Public License as published by
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
10 the Free Software Foundation; either version 2, or (at your option)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11 any later version.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 GNU Emacs is distributed in the hope that it will be useful,
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 GNU General Public License for more details.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19 along with GNU Emacs; see the file COPYING. If not, write to
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
21 Boston, MA 02110-1301, USA. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23
7898
1d65b2152c4e Put config.h first.
Richard M. Stallman <rms@gnu.org>
parents: 7823
diff changeset
24 #include <config.h>
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
25 #include <stdio.h>
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26 #include <sys/types.h>
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
27 #include <sys/stat.h>
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
28 #include <sys/file.h>
8083
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
29 #include <errno.h>
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
30 #include "lisp.h"
25787
3d1138357287 (readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
31 #include "intervals.h"
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32 #include "buffer.h"
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
33 #include "charset.h"
24412
d11ac02f9d6a Use epaths.h istead of paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 23933
diff changeset
34 #include <epaths.h>
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
35 #include "commands.h"
1591
765cb54fa9af * lread.c: #include "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents: 1519
diff changeset
36 #include "keyboard.h"
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
37 #include "termhooks.h"
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
38 #include "coding.h"
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
39
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
40 #ifdef lint
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
41 #include <sys/inode.h>
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
42 #endif /* lint */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43
14972
a6889b33d21c [MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 14950
diff changeset
44 #ifdef MSDOS
a6889b33d21c [MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 14950
diff changeset
45 #if __DJGPP__ < 2
a6889b33d21c [MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 14950
diff changeset
46 #include <unistd.h> /* to get X_OK */
a6889b33d21c [MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 14950
diff changeset
47 #endif
a6889b33d21c [MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 14950
diff changeset
48 #include "msdos.h"
a6889b33d21c [MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 14950
diff changeset
49 #endif
a6889b33d21c [MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 14950
diff changeset
50
21799
7a44b61e263b Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21797
diff changeset
51 #ifdef HAVE_UNISTD_H
7a44b61e263b Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21797
diff changeset
52 #include <unistd.h>
7a44b61e263b Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21797
diff changeset
53 #endif
7a44b61e263b Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21797
diff changeset
54
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
55 #ifndef X_OK
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
56 #define X_OK 01
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
57 #endif
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
58
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
59 #include <math.h>
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
60
14950
f5abde0d2904 Include locale.h.
Richard M. Stallman <rms@gnu.org>
parents: 14945
diff changeset
61 #ifdef HAVE_SETLOCALE
f5abde0d2904 Include locale.h.
Richard M. Stallman <rms@gnu.org>
parents: 14945
diff changeset
62 #include <locale.h>
f5abde0d2904 Include locale.h.
Richard M. Stallman <rms@gnu.org>
parents: 14945
diff changeset
63 #endif /* HAVE_SETLOCALE */
f5abde0d2904 Include locale.h.
Richard M. Stallman <rms@gnu.org>
parents: 14945
diff changeset
64
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
65 #ifdef HAVE_FCNTL_H
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
66 #include <fcntl.h>
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
67 #endif
8596
ccd3c3ca2aef (O_RDONLY): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 8182
diff changeset
68 #ifndef O_RDONLY
ccd3c3ca2aef (O_RDONLY): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 8182
diff changeset
69 #define O_RDONLY 0
ccd3c3ca2aef (O_RDONLY): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 8182
diff changeset
70 #endif
ccd3c3ca2aef (O_RDONLY): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 8182
diff changeset
71
34428
b2ec0cbfd60a (file_offset, file_tell): Depend on HAVE_FSEEKO, not
Gerd Moellmann <gerd@gnu.org>
parents: 34362
diff changeset
72 #ifdef HAVE_FSEEKO
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
73 #define file_offset off_t
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
74 #define file_tell ftello
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
75 #else
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
76 #define file_offset long
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
77 #define file_tell ftell
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
78 #endif
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
79
31100
92f108b8b281 [USE_CRT_DLL]: Remove unnecessary extern, which
Andrew Innes <andrewi@gnu.org>
parents: 30985
diff changeset
80 #ifndef USE_CRT_DLL
8083
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
81 extern int errno;
31100
92f108b8b281 [USE_CRT_DLL]: Remove unnecessary extern, which
Andrew Innes <andrewi@gnu.org>
parents: 30985
diff changeset
82 #endif
8083
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
83
2901
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
84 Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
85 Lisp_Object Qvariable_documentation, Vvalues, Vstandard_input, Vafter_load_alist;
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
86 Lisp_Object Qascii_character, Qload, Qload_file_name;
13235
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
87 Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction;
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
88 Lisp_Object Qinhibit_file_name_operation;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
89 Lisp_Object Qeval_buffer_list, Veval_buffer_list;
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
90
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
91 extern Lisp_Object Qevent_symbol_element_mask;
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
92 extern Lisp_Object Qfile_exists_p;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
93
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
94 /* non-zero iff inside `load' */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
95 int load_in_progress;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
96
13601
0a091134e047 (Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13455
diff changeset
97 /* Directory in which the sources were found. */
0a091134e047 (Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13455
diff changeset
98 Lisp_Object Vsource_directory;
0a091134e047 (Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13455
diff changeset
99
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
100 /* Search path and suffixes for files to be loaded. */
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
101 Lisp_Object Vload_path, Vload_suffixes, default_suffixes;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
102
24817
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
103 /* File name of user's init file. */
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
104 Lisp_Object Vuser_init_file;
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
105
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
106 /* This is the user-visible association list that maps features to
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
107 lists of defs in their load files. */
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
108 Lisp_Object Vload_history;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
109
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
110 /* This is used to build the load history. */
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
111 Lisp_Object Vcurrent_load_list;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
112
18665
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
113 /* List of files that were preloaded. */
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
114 Lisp_Object Vpreloaded_file_list;
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
115
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
116 /* Name of file actually being read by `load'. */
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
117 Lisp_Object Vload_file_name;
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
118
11079
aeaaa579d967 (Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 11020
diff changeset
119 /* Function to use for reading, in `load' and friends. */
aeaaa579d967 (Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 11020
diff changeset
120 Lisp_Object Vload_read_function;
aeaaa579d967 (Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 11020
diff changeset
121
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
122 /* The association list of objects read with the #n=object form.
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
123 Each member of the list has the form (n . object), and is used to
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
124 look up the object for the corresponding #n# construct.
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
125 It must be set to nil before all top-level calls to read0. */
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
126 Lisp_Object read_objects;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
127
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
128 /* Nonzero means load should forcibly load all dynamic doc strings. */
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
129 static int load_force_doc_strings;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
130
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
131 /* Nonzero means read should convert strings to unibyte. */
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
132 static int load_convert_to_unibyte;
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
133
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
134 /* Function to use for loading an Emacs lisp source file (not
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
135 compiled) instead of readevalloop. */
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
136 Lisp_Object Vload_source_file_function;
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
137
25555
301ce7f0b398 (Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents: 25251
diff changeset
138 /* List of all DEFVAR_BOOL variables. Used by the byte optimizer. */
301ce7f0b398 (Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents: 25251
diff changeset
139 Lisp_Object Vbyte_boolean_vars;
301ce7f0b398 (Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents: 25251
diff changeset
140
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
141 /* Whether or not to add a `read-positions' property to symbols
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
142 read. */
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
143 Lisp_Object Vread_with_symbol_positions;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
144
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
145 /* List of (SYMBOL . POSITION) accumulated so far. */
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
146 Lisp_Object Vread_symbol_positions_list;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
147
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
148 /* List of descriptors now open for Fload. */
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
149 static Lisp_Object load_descriptor_list;
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
150
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
151 /* File for get_file_char to read from. Use by load. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
152 static FILE *instream;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
154 /* When nonzero, read conses in pure space */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
155 static int read_pure;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
156
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
157 /* For use within read-from-string (this reader is non-reentrant!!) */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
158 static int read_from_string_index;
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
159 static int read_from_string_index_byte;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
160 static int read_from_string_limit;
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
161
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
162 /* Number of bytes left to read in the buffer character
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
163 that `readchar' has already advanced over. */
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
164 static int readchar_backlog;
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
165 /* Number of characters read in the current call to Fread or
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
166 Fread_from_string. */
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
167 static int readchar_count;
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
168
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
169 /* This contains the last string skipped with #@. */
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
170 static char *saved_doc_string;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
171 /* Length of buffer allocated in saved_doc_string. */
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
172 static int saved_doc_string_size;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
173 /* Length of actual data in saved_doc_string. */
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
174 static int saved_doc_string_length;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
175 /* This is the file position that string came from. */
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
176 static file_offset saved_doc_string_position;
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
177
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
178 /* This contains the previous string skipped with #@.
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
179 We copy it from saved_doc_string when a new string
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
180 is put in saved_doc_string. */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
181 static char *prev_saved_doc_string;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
182 /* Length of buffer allocated in prev_saved_doc_string. */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
183 static int prev_saved_doc_string_size;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
184 /* Length of actual data in prev_saved_doc_string. */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
185 static int prev_saved_doc_string_length;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
186 /* This is the file position that string came from. */
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
187 static file_offset prev_saved_doc_string_position;
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
188
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
189 /* Nonzero means inside a new-style backquote
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
190 with no surrounding parentheses.
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
191 Fread initializes this to zero, so we need not specbind it
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
192 or worry about what happens to it when there is an error. */
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
193 static int new_backquote_flag;
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
194
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
195 /* A list of file names for files being loaded in Fload. Used to
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
196 check for recursive loads. */
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
197
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
198 static Lisp_Object Vloads_in_progress;
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
199
31804
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
200 /* Non-zero means load dangerous compiled Lisp files. */
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
201
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
202 int load_dangerous_libraries;
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
203
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
204 /* A regular expression used to detect files compiled with Emacs. */
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
205
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
206 static Lisp_Object Vbytecomp_version_regexp;
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
207
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
208 static void to_multibyte P_ ((char **, char **, int *));
47847
dd601595b35d Minor white space fix, just supplement the log for previous change:
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47839
diff changeset
209 static void readevalloop P_ ((Lisp_Object, FILE*, Lisp_Object,
31804
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
210 Lisp_Object (*) (), int,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
211 Lisp_Object, Lisp_Object,
31804
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
212 Lisp_Object, Lisp_Object));
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
213 static Lisp_Object load_unwind P_ ((Lisp_Object));
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
214 static Lisp_Object load_descriptor_unwind P_ ((Lisp_Object));
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
215
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
216
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
217 /* Handle unreading and rereading of characters.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
218 Write READCHAR to read a character,
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
219 UNREAD(c) to unread c to be read again.
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
220
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
221 The READCHAR and UNREAD macros are meant for reading/unreading a
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
222 byte code; they do not handle multibyte characters. The caller
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
223 should manage them if necessary.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
224
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
225 [ Actually that seems to be a lie; READCHAR will definitely read
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
226 multibyte characters from buffer sources, at least. Is the
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
227 comment just out of date?
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
228 -- Colin Walters <walters@gnu.org>, 22 May 2002 16:36:50 -0400 ]
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
229 */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
231 #define READCHAR readchar (readcharfun)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
232 #define UNREAD(c) unreadchar (readcharfun, c)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234 static int
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235 readchar (readcharfun)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 Lisp_Object readcharfun;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238 Lisp_Object tem;
25787
3d1138357287 (readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
239 register int c;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
240
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
241 readchar_count++;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
242
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
243 if (BUFFERP (readcharfun))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
244 {
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
245 register struct buffer *inbuffer = XBUFFER (readcharfun);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
246
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
247 int pt_byte = BUF_PT_BYTE (inbuffer);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
248 int orig_pt_byte = pt_byte;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
249
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
250 if (readchar_backlog > 0)
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
251 /* We get the address of the byte just passed,
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
252 which is the last byte of the character.
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
253 The other bytes in this character are consecutive with it,
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
254 because the gap can't be in the middle of a character. */
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
255 return *(BUF_BYTE_ADDRESS (inbuffer, BUF_PT_BYTE (inbuffer) - 1)
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
256 - --readchar_backlog);
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
257
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
258 if (pt_byte >= BUF_ZV_BYTE (inbuffer))
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
259 return -1;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
260
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
261 readchar_backlog = -1;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
262
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
263 if (! NILP (inbuffer->enable_multibyte_characters))
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
264 {
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
265 /* Fetch the character code from the buffer. */
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
266 unsigned char *p = BUF_BYTE_ADDRESS (inbuffer, pt_byte);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
267 BUF_INC_POS (inbuffer, pt_byte);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
268 c = STRING_CHAR (p, pt_byte - orig_pt_byte);
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
269 }
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
270 else
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
271 {
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
272 c = BUF_FETCH_BYTE (inbuffer, pt_byte);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
273 pt_byte++;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
274 }
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
275 SET_BUF_PT_BOTH (inbuffer, BUF_PT (inbuffer) + 1, pt_byte);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
276
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
277 return c;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
278 }
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
279 if (MARKERP (readcharfun))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
280 {
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
281 register struct buffer *inbuffer = XMARKER (readcharfun)->buffer;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
282
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
283 int bytepos = marker_byte_position (readcharfun);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
284 int orig_bytepos = bytepos;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
285
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
286 if (readchar_backlog > 0)
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
287 /* We get the address of the byte just passed,
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
288 which is the last byte of the character.
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
289 The other bytes in this character are consecutive with it,
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
290 because the gap can't be in the middle of a character. */
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
291 return *(BUF_BYTE_ADDRESS (inbuffer, XMARKER (readcharfun)->bytepos - 1)
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
292 - --readchar_backlog);
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
293
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
294 if (bytepos >= BUF_ZV_BYTE (inbuffer))
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
295 return -1;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
296
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
297 readchar_backlog = -1;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
298
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
299 if (! NILP (inbuffer->enable_multibyte_characters))
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
300 {
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
301 /* Fetch the character code from the buffer. */
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
302 unsigned char *p = BUF_BYTE_ADDRESS (inbuffer, bytepos);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
303 BUF_INC_POS (inbuffer, bytepos);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
304 c = STRING_CHAR (p, bytepos - orig_bytepos);
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
305 }
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
306 else
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
307 {
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
308 c = BUF_FETCH_BYTE (inbuffer, bytepos);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
309 bytepos++;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
310 }
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
311
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
312 XMARKER (readcharfun)->bytepos = bytepos;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
313 XMARKER (readcharfun)->charpos++;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
314
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
315 return c;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
316 }
22691
ff0ed53342b3 (read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents: 22603
diff changeset
317
ff0ed53342b3 (read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents: 22603
diff changeset
318 if (EQ (readcharfun, Qlambda))
ff0ed53342b3 (read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents: 22603
diff changeset
319 return read_bytecode_char (0);
ff0ed53342b3 (read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents: 22603
diff changeset
320
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
321 if (EQ (readcharfun, Qget_file_char))
8083
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
322 {
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
323 c = getc (instream);
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
324 #ifdef EINTR
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
325 /* Interrupted reads have been observed while reading over the network */
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
326 while (c == EOF && ferror (instream) && errno == EINTR)
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
327 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
328 QUIT;
8083
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
329 clearerr (instream);
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
330 c = getc (instream);
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
331 }
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
332 #endif
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
333 return c;
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
334 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
335
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
336 if (STRINGP (readcharfun))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
337 {
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
338 if (read_from_string_index >= read_from_string_limit)
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
339 c = -1;
29014
4c02859dda27 (read1): On reading multibyte string, be sure to make
Kenichi Handa <handa@m17n.org>
parents: 28746
diff changeset
340 else
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
341 FETCH_STRING_CHAR_ADVANCE (c, readcharfun,
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
342 read_from_string_index,
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
343 read_from_string_index_byte);
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
344
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
345 return c;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
346 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
347
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
348 tem = call0 (readcharfun);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
349
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
350 if (NILP (tem))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
351 return -1;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
352 return XINT (tem);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
353 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
354
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
355 /* Unread the character C in the way appropriate for the stream READCHARFUN.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
356 If the stream is a user function, call it with the char as argument. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
357
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
358 static void
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
359 unreadchar (readcharfun, c)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
360 Lisp_Object readcharfun;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
361 int c;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
362 {
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
363 readchar_count--;
6471
4e6b54b64d94 (unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents: 6470
diff changeset
364 if (c == -1)
4e6b54b64d94 (unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents: 6470
diff changeset
365 /* Don't back up the pointer if we're unreading the end-of-input mark,
4e6b54b64d94 (unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents: 6470
diff changeset
366 since readchar didn't advance it when we read it. */
4e6b54b64d94 (unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents: 6470
diff changeset
367 ;
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
368 else if (BUFFERP (readcharfun))
20691
cf1919e207ef (unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents: 20669
diff changeset
369 {
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
370 struct buffer *b = XBUFFER (readcharfun);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
371 int bytepos = BUF_PT_BYTE (b);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
372
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
373 if (readchar_backlog >= 0)
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
374 readchar_backlog++;
20691
cf1919e207ef (unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents: 20669
diff changeset
375 else
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
376 {
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
377 BUF_PT (b)--;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
378 if (! NILP (b->enable_multibyte_characters))
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
379 BUF_DEC_POS (b, bytepos);
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
380 else
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
381 bytepos--;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
382
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
383 BUF_PT_BYTE (b) = bytepos;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
384 }
20691
cf1919e207ef (unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents: 20669
diff changeset
385 }
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
386 else if (MARKERP (readcharfun))
20691
cf1919e207ef (unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents: 20669
diff changeset
387 {
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
388 struct buffer *b = XMARKER (readcharfun)->buffer;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
389 int bytepos = XMARKER (readcharfun)->bytepos;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
390
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
391 if (readchar_backlog >= 0)
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
392 readchar_backlog++;
20691
cf1919e207ef (unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents: 20669
diff changeset
393 else
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
394 {
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
395 XMARKER (readcharfun)->charpos--;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
396 if (! NILP (b->enable_multibyte_characters))
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
397 BUF_DEC_POS (b, bytepos);
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
398 else
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
399 bytepos--;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
400
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
401 XMARKER (readcharfun)->bytepos = bytepos;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
402 }
20691
cf1919e207ef (unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents: 20669
diff changeset
403 }
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
404 else if (STRINGP (readcharfun))
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
405 {
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
406 read_from_string_index--;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
407 read_from_string_index_byte
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
408 = string_char_to_byte (readcharfun, read_from_string_index);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
409 }
22691
ff0ed53342b3 (read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents: 22603
diff changeset
410 else if (EQ (readcharfun, Qlambda))
ff0ed53342b3 (read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents: 22603
diff changeset
411 read_bytecode_char (1);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
412 else if (EQ (readcharfun, Qget_file_char))
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
413 ungetc (c, instream);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
414 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
415 call1 (readcharfun, make_number (c));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
416 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
417
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
418 static Lisp_Object read_internal_start P_ ((Lisp_Object, Lisp_Object,
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
419 Lisp_Object));
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
420 static Lisp_Object read0 P_ ((Lisp_Object));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
421 static Lisp_Object read1 P_ ((Lisp_Object, int *, int));
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
422
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
423 static Lisp_Object read_list P_ ((int, Lisp_Object));
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
424 static Lisp_Object read_vector P_ ((Lisp_Object, int));
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
425 static int read_multibyte P_ ((int, Lisp_Object));
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
426
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
427 static Lisp_Object substitute_object_recurse P_ ((Lisp_Object, Lisp_Object,
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
428 Lisp_Object));
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
429 static void substitute_object_in_subtree P_ ((Lisp_Object,
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
430 Lisp_Object));
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
431 static void substitute_in_interval P_ ((INTERVAL, Lisp_Object));
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
432
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
433
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
434 /* Get a character from the tty. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
435
1519
5d0837ebee9c * lread.c (read_char): Add an extern declaration for this,
Jim Blandy <jimb@redhat.com>
parents: 1092
diff changeset
436 extern Lisp_Object read_char ();
5d0837ebee9c * lread.c (read_char): Add an extern declaration for this,
Jim Blandy <jimb@redhat.com>
parents: 1092
diff changeset
437
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
438 /* Read input events until we get one that's acceptable for our purposes.
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
439
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
440 If NO_SWITCH_FRAME is non-zero, switch-frame events are stashed
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
441 until we get a character we like, and then stuffed into
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
442 unread_switch_frame.
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
443
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
444 If ASCII_REQUIRED is non-zero, we check function key events to see
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
445 if the unmodified version of the symbol has a Qascii_character
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
446 property, and use that character, if present.
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
447
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
448 If ERROR_NONASCII is non-zero, we signal an error if the input we
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
449 get isn't an ASCII character with modifiers. If it's zero but
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
450 ASCII_REQUIRED is non-zero, we just re-read until we get an ASCII
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
451 character.
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
452
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
453 If INPUT_METHOD is nonzero, we invoke the current input method
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
454 if the character warrants that. */
14483
7f49c41db1e8 (Fread_char_exclusive): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 14300
diff changeset
455
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
456 Lisp_Object
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
457 read_filtered_event (no_switch_frame, ascii_required, error_nonascii,
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
458 input_method)
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
459 int no_switch_frame, ascii_required, error_nonascii, input_method;
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
460 {
6503
7c566d0e4b3d (read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6471
diff changeset
461 register Lisp_Object val, delayed_switch_frame;
7c566d0e4b3d (read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6471
diff changeset
462
28633
83d4e44ed68e (read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
463 #ifdef HAVE_WINDOW_SYSTEM
36256
e033d60bd048 Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents: 35543
diff changeset
464 if (display_hourglass_p)
e033d60bd048 Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents: 35543
diff changeset
465 cancel_hourglass ();
28633
83d4e44ed68e (read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
466 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
467
6503
7c566d0e4b3d (read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6471
diff changeset
468 delayed_switch_frame = Qnil;
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
469
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
470 /* Read until we get an acceptable event. */
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
471 retry:
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
472 val = read_char (0, 0, 0,
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
473 (input_method ? Qnil : Qt),
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
474 0);
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
475
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
476 if (BUFFERP (val))
5888
0d02ee7ee659 (read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents: 5687
diff changeset
477 goto retry;
0d02ee7ee659 (read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents: 5687
diff changeset
478
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
479 /* switch-frame events are put off until after the next ASCII
14036
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13772
diff changeset
480 character. This is better than signaling an error just because
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
481 the last characters were typed to a separate minibuffer frame,
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
482 for example. Eventually, some code which can deal with
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
483 switch-frame events will read it and process it. */
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
484 if (no_switch_frame
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
485 && EVENT_HAS_PARAMETERS (val)
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
486 && EQ (EVENT_HEAD (val), Qswitch_frame))
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
487 {
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
488 delayed_switch_frame = val;
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
489 goto retry;
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
490 }
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
491
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
492 if (ascii_required)
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
493 {
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
494 /* Convert certain symbols to their ASCII equivalents. */
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
495 if (SYMBOLP (val))
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
496 {
25787
3d1138357287 (readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
497 Lisp_Object tem, tem1;
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
498 tem = Fget (val, Qevent_symbol_element_mask);
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
499 if (!NILP (tem))
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
500 {
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
501 tem1 = Fget (Fcar (tem), Qascii_character);
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
502 /* Merge this symbol's modifier bits
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
503 with the ASCII equivalent of its basic code. */
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
504 if (!NILP (tem1))
9313
ed68c3822e4b (read_filtered_event, init_obarray): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9274
diff changeset
505 XSETFASTINT (val, XINT (tem1) | XINT (Fcar (Fcdr (tem))));
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
506 }
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
507 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
508
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
509 /* If we don't have a character now, deal with it appropriately. */
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
510 if (!INTEGERP (val))
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
511 {
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
512 if (error_nonascii)
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
513 {
7106
06542cc6ddcd (read_filtered_event): Use Vunread_command_events.
Richard M. Stallman <rms@gnu.org>
parents: 7028
diff changeset
514 Vunread_command_events = Fcons (val, Qnil);
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
515 error ("Non-character input-event");
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
516 }
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
517 else
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
518 goto retry;
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
519 }
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
520 }
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
521
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
522 if (! NILP (delayed_switch_frame))
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
523 unread_switch_frame = delayed_switch_frame;
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
524
43700
2388863b284b (read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents: 43669
diff changeset
525 #if 0
2388863b284b (read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents: 43669
diff changeset
526
28633
83d4e44ed68e (read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
527 #ifdef HAVE_WINDOW_SYSTEM
36256
e033d60bd048 Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents: 35543
diff changeset
528 if (display_hourglass_p)
e033d60bd048 Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents: 35543
diff changeset
529 start_hourglass ();
28633
83d4e44ed68e (read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
530 #endif
43700
2388863b284b (read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents: 43669
diff changeset
531
2388863b284b (read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents: 43669
diff changeset
532 #endif
2388863b284b (read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents: 43669
diff changeset
533
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
534 return val;
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
535 }
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
536
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
537 DEFUN ("read-char", Fread_char, Sread_char, 0, 2, 0,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
538 doc: /* Read a character from the command input (keyboard or macro).
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
539 It is returned as a number.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
540 If the user generates an event which is not a character (i.e. a mouse
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
541 click or function key event), `read-char' signals an error. As an
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
542 exception, switch-frame events are put off until non-ASCII events can
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
543 be read.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
544 If you want to read non-character events, or ignore them, call
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
545 `read-event' or `read-char-exclusive' instead.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
546
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
547 If the optional argument PROMPT is non-nil, display that as a prompt.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
548 If the optional argument INHERIT-INPUT-METHOD is non-nil and some
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
549 input method is turned on in the current buffer, that input method
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
550 is used for reading a character. */)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
551 (prompt, inherit_input_method)
23933
d993b7332153 (Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents: 23284
diff changeset
552 Lisp_Object prompt, inherit_input_method;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
553 {
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
554 if (! NILP (prompt))
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
555 message_with_string ("%s", prompt, 0);
23933
d993b7332153 (Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents: 23284
diff changeset
556 return read_filtered_event (1, 1, 1, ! NILP (inherit_input_method));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
557 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
558
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
559 DEFUN ("read-event", Fread_event, Sread_event, 0, 2, 0,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
560 doc: /* Read an event object from the input stream.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
561 If the optional argument PROMPT is non-nil, display that as a prompt.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
562 If the optional argument INHERIT-INPUT-METHOD is non-nil and some
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
563 input method is turned on in the current buffer, that input method
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
564 is used for reading a character. */)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
565 (prompt, inherit_input_method)
23933
d993b7332153 (Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents: 23284
diff changeset
566 Lisp_Object prompt, inherit_input_method;
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
567 {
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
568 if (! NILP (prompt))
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
569 message_with_string ("%s", prompt, 0);
23933
d993b7332153 (Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents: 23284
diff changeset
570 return read_filtered_event (0, 0, 0, ! NILP (inherit_input_method));
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
571 }
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
572
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
573 DEFUN ("read-char-exclusive", Fread_char_exclusive, Sread_char_exclusive, 0, 2, 0,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
574 doc: /* Read a character from the command input (keyboard or macro).
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
575 It is returned as a number. Non-character events are ignored.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
576
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
577 If the optional argument PROMPT is non-nil, display that as a prompt.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
578 If the optional argument INHERIT-INPUT-METHOD is non-nil and some
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
579 input method is turned on in the current buffer, that input method
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
580 is used for reading a character. */)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
581 (prompt, inherit_input_method)
23933
d993b7332153 (Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents: 23284
diff changeset
582 Lisp_Object prompt, inherit_input_method;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
583 {
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
584 if (! NILP (prompt))
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
585 message_with_string ("%s", prompt, 0);
23933
d993b7332153 (Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents: 23284
diff changeset
586 return read_filtered_event (1, 1, 0, ! NILP (inherit_input_method));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
587 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
588
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
589 DEFUN ("get-file-char", Fget_file_char, Sget_file_char, 0, 0, 0,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
590 doc: /* Don't use this yourself. */)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
591 ()
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
592 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
593 register Lisp_Object val;
9274
5c66d8b65a7c (Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents: 9149
diff changeset
594 XSETINT (val, getc (instream));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
595 return val;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
596 }
31804
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
597
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
598
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
599
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
600 /* Value is non-zero if the file asswociated with file descriptor FD
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
601 is a compiled Lisp file that's safe to load. Only files compiled
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
602 with Emacs are safe to load. Files compiled with XEmacs can lead
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
603 to a crash in Fbyte_code because of an incompatible change in the
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
604 byte compiler. */
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
605
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
606 static int
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
607 safe_to_load_p (fd)
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
608 int fd;
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
609 {
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
610 char buf[512];
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
611 int nbytes, i;
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
612 int safe_p = 1;
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
613
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
614 /* Read the first few bytes from the file, and look for a line
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
615 specifying the byte compiler version used. */
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
616 nbytes = emacs_read (fd, buf, sizeof buf - 1);
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
617 if (nbytes > 0)
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
618 {
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
619 buf[nbytes] = '\0';
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
620
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
621 /* Skip to the next newline, skipping over the initial `ELC'
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
622 with NUL bytes following it. */
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
623 for (i = 0; i < nbytes && buf[i] != '\n'; ++i)
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
624 ;
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
625
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
626 if (i < nbytes
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
627 && fast_c_string_match_ignore_case (Vbytecomp_version_regexp,
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
628 buf + i) < 0)
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
629 safe_p = 0;
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
630 }
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
631
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
632 lseek (fd, 0, SEEK_SET);
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
633 return safe_p;
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
634 }
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
635
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
636
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
637 /* Callback for record_unwind_protect. Restore the old load list OLD,
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
638 after loading a file successfully. */
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
639
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
640 static Lisp_Object
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
641 record_load_unwind (old)
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
642 Lisp_Object old;
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
643 {
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
644 return Vloads_in_progress = old;
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
645 }
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
646
48910
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
647 /* This handler function is used via internal_condition_case_1. */
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
648
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
649 static Lisp_Object
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
650 load_error_handler (data)
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
651 Lisp_Object data;
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
652 {
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
653 return Qnil;
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
654 }
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
655
19115
266915689f9e (Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents: 19020
diff changeset
656 DEFUN ("load", Fload, Sload, 1, 5, 0,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
657 doc: /* Execute a file of Lisp code named FILE.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
658 First try FILE with `.elc' appended, then try with `.el',
47839
8d4ba9addc8e *** empty log message ***
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47184
diff changeset
659 then try FILE unmodified (the exact suffixes are determined by
8d4ba9addc8e *** empty log message ***
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47184
diff changeset
660 `load-suffixes'). Environment variable references in FILE
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
661 are replaced with their values by calling `substitute-in-file-name'.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
662 This function searches the directories in `load-path'.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
663 If optional second arg NOERROR is non-nil,
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
664 report no error if FILE doesn't exist.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
665 Print messages at start and end of loading unless
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
666 optional third arg NOMESSAGE is non-nil.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
667 If optional fourth arg NOSUFFIX is non-nil, don't try adding
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
668 suffixes `.elc' or `.el' to the specified name FILE.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
669 If optional fifth arg MUST-SUFFIX is non-nil, insist on
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
670 the suffix `.elc' or `.el'; don't accept just FILE unless
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
671 it ends in one of those suffixes or includes a directory name.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
672
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
673 Loading a file records its definitions, and its `provide' and
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
674 `require' calls, in an element of `load-history' whose
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
675 car is the file name loaded. See `load-history'.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
676
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
677 Return t if file exists. */)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
678 (file, noerror, nomessage, nosuffix, must_suffix)
19115
266915689f9e (Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents: 19020
diff changeset
679 Lisp_Object file, noerror, nomessage, nosuffix, must_suffix;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
680 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
681 register FILE *stream;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
682 register int fd = -1;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45970
diff changeset
683 int count = SPECPDL_INDEX ();
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
684 Lisp_Object temp;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
685 struct gcpro gcpro1, gcpro2;
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
686 Lisp_Object found, efound;
16012
3b5ffd35defe (Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents: 15283
diff changeset
687 /* 1 means we printed the ".el is newer" message. */
3b5ffd35defe (Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents: 15283
diff changeset
688 int newer = 0;
3b5ffd35defe (Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents: 15283
diff changeset
689 /* 1 means we are loading a compiled file. */
3b5ffd35defe (Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents: 15283
diff changeset
690 int compiled = 0;
3625
57174f9b1870 (Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents: 3041
diff changeset
691 Lisp_Object handler;
28370
b445e32d5a7a (Fload): Move safe_p definition to above #ifdef DOS_NT block.
Jason Rumney <jasonr@gnu.org>
parents: 28367
diff changeset
692 int safe_p = 1;
21936
6635a9f225a9 (Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents: 21935
diff changeset
693 char *fmode = "r";
9790
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
694 #ifdef DOS_NT
21936
6635a9f225a9 (Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents: 21935
diff changeset
695 fmode = "rt";
9790
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
696 #endif /* DOS_NT */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
697
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40558
diff changeset
698 CHECK_STRING (file);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
699
3625
57174f9b1870 (Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents: 3041
diff changeset
700 /* If file name is magic, call the handler. */
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
701 /* This shouldn't be necessary any more now that `openp' handles it right.
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
702 handler = Ffind_file_name_handler (file, Qload);
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
703 if (!NILP (handler))
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
704 return call5 (handler, Qload, file, noerror, nomessage, nosuffix); */
3625
57174f9b1870 (Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents: 3041
diff changeset
705
10014
d149c4dc84f3 (Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents: 9938
diff changeset
706 /* Do this after the handler to avoid
d149c4dc84f3 (Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents: 9938
diff changeset
707 the need to gcpro noerror, nomessage and nosuffix.
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
708 (Below here, we care only whether they are nil or not.)
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
709 The presence of this call is the result of a historical accident:
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
710 it used to be in every file-operations and when it got removed
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
711 everywhere, it accidentally stayed here. Since then, enough people
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
712 supposedly have things like (load "$PROJECT/foo.el") in their .emacs
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
713 that it seemed risky to remove. */
48910
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
714 if (! NILP (noerror))
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
715 {
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
716 file = internal_condition_case_1 (Fsubstitute_in_file_name, file,
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
717 Qt, load_error_handler);
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
718 if (NILP (file))
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
719 return Qnil;
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
720 }
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
721 else
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
722 file = Fsubstitute_in_file_name (file);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
723
10014
d149c4dc84f3 (Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents: 9938
diff changeset
724
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
725 /* Avoid weird lossage with null string as arg,
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
726 since it would try to load a directory as a Lisp file */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
727 if (SCHARS (file) > 0)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
728 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
729 int size = SBYTES (file);
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
730 Lisp_Object tmp[2];
19622
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
731
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
732 found = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
733 GCPRO2 (file, found);
19622
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
734
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
735 if (! NILP (must_suffix))
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
736 {
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
737 /* Don't insist on adding a suffix if FILE already ends with one. */
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
738 if (size > 3
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
739 && !strcmp (SDATA (file) + size - 3, ".el"))
19622
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
740 must_suffix = Qnil;
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
741 else if (size > 4
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
742 && !strcmp (SDATA (file) + size - 4, ".elc"))
19622
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
743 must_suffix = Qnil;
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
744 /* Don't insist on adding a suffix
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
745 if the argument includes a directory name. */
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
746 else if (! NILP (Ffile_name_directory (file)))
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
747 must_suffix = Qnil;
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
748 }
be0876941b71 (Fload): If FILE arg ends in .el or .elc, don't insist on adding a suffix.
Richard M. Stallman <rms@gnu.org>
parents: 19240
diff changeset
749
19115
266915689f9e (Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents: 19020
diff changeset
750 fd = openp (Vload_path, file,
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
751 (!NILP (nosuffix) ? Qnil
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
752 : !NILP (must_suffix) ? Vload_suffixes
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
753 : Fappend (2, (tmp[0] = Vload_suffixes,
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
754 tmp[1] = default_suffixes,
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
755 tmp))),
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
756 &found, Qnil);
6392
58e075552627 (openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents: 6072
diff changeset
757 UNGCPRO;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
758 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
759
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
760 if (fd == -1)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
761 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
762 if (NILP (noerror))
48910
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
763 Fsignal (Qfile_error, Fcons (build_string ("Cannot open load file"),
f1010d7b4fd9 (load_error_handler): New function.
Richard M. Stallman <rms@gnu.org>
parents: 48726
diff changeset
764 Fcons (file, Qnil)));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
765 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
766 return Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
767 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
768
29122
47f68a566622 (Fload): Add a comment about the meaning of
Gerd Moellmann <gerd@gnu.org>
parents: 29014
diff changeset
769 /* Tell startup.el whether or not we found the user's init file. */
24817
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
770 if (EQ (Qt, Vuser_init_file))
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
771 Vuser_init_file = found;
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
772
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
773 /* If FD is -2, that means openp found a magic file. */
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
774 if (fd == -2)
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
775 {
23193
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
776 if (NILP (Fequal (found, file)))
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
777 /* If FOUND is a different file name from FILE,
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
778 find its handler even if we have already inhibited
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
779 the `load' operation on FILE. */
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
780 handler = Ffind_file_name_handler (found, Qt);
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
781 else
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
782 handler = Ffind_file_name_handler (found, Qload);
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
783 if (! NILP (handler))
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
784 return call5 (handler, Qload, found, noerror, nomessage, Qt);
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
785 }
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
786
31804
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
787 /* Check if we're stuck in a recursive load cycle.
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
788
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
789 2000-09-21: It's not possible to just check for the file loaded
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
790 being a member of Vloads_in_progress. This fails because of the
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
791 way the byte compiler currently works; `provide's are not
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
792 evaluted, see font-lock.el/jit-lock.el as an example. This
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
793 leads to a certain amount of ``normal'' recursion.
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
794
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
795 Also, just loading a file recursively is not always an error in
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
796 the general case; the second load may do something different. */
41463
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
797 {
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
798 int count = 0;
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
799 Lisp_Object tem;
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
800 for (tem = Vloads_in_progress; CONSP (tem); tem = XCDR (tem))
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
801 if (!NILP (Fequal (found, XCAR (tem))))
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
802 count++;
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
803 if (count > 3)
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
804 Fsignal (Qerror, Fcons (build_string ("Recursive load"),
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
805 Fcons (found, Vloads_in_progress)));
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
806 record_unwind_protect (record_load_unwind, Vloads_in_progress);
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
807 Vloads_in_progress = Fcons (found, Vloads_in_progress);
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
808 }
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
809
46429
eb5964b8cc24 * lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents: 46375
diff changeset
810 if (!bcmp (SDATA (found) + SBYTES (found) - 4,
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
811 ".elc", 4))
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
812 /* Load .elc files directly, but not when they are
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
813 remote and have no handler! */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
814 {
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
815 if (fd != -2)
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
816 {
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
817 struct stat s1, s2;
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
818 int result;
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
819
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
820 GCPRO2 (file, found);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
821
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
822 if (!safe_to_load_p (fd))
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
823 {
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
824 safe_p = 0;
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
825 if (!load_dangerous_libraries)
48087
cae822515e00 (Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents: 47919
diff changeset
826 {
cae822515e00 (Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents: 47919
diff changeset
827 if (fd >= 0)
cae822515e00 (Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents: 47919
diff changeset
828 emacs_close (fd);
cae822515e00 (Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents: 47919
diff changeset
829 error ("File `%s' was not compiled in Emacs",
cae822515e00 (Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents: 47919
diff changeset
830 SDATA (found));
cae822515e00 (Fload) <!load_dangerous_libraries>: Close fd.
Dave Love <fx@gnu.org>
parents: 47919
diff changeset
831 }
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
832 else if (!NILP (nomessage))
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
833 message_with_string ("File `%s' not compiled in Emacs", found, 1);
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
834 }
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
835
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
836 compiled = 1;
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
837
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
838 efound = ENCODE_FILE (found);
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
839
33570
32e84d2e9891 (Fload): Fix #ifdef for pcc.
Dave Love <fx@gnu.org>
parents: 33442
diff changeset
840 #ifdef DOS_NT
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
841 fmode = "rb";
33570
32e84d2e9891 (Fload): Fix #ifdef for pcc.
Dave Love <fx@gnu.org>
parents: 33442
diff changeset
842 #endif /* DOS_NT */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
843 stat ((char *)SDATA (efound), &s1);
46429
eb5964b8cc24 * lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents: 46375
diff changeset
844 SSET (efound, SBYTES (efound) - 1, 0);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
845 result = stat ((char *)SDATA (efound), &s2);
46429
eb5964b8cc24 * lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents: 46375
diff changeset
846 SSET (efound, SBYTES (efound) - 1, 'c');
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
847
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
848 if (result >= 0 && (unsigned) s1.st_mtime < (unsigned) s2.st_mtime)
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
849 {
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
850 /* Make the progress messages mention that source is newer. */
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
851 newer = 1;
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
852
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
853 /* If we won't print another message, mention this anyway. */
43837
ae392efb1660 (Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents: 43713
diff changeset
854 if (!NILP (nomessage))
ae392efb1660 (Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents: 43713
diff changeset
855 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
856 Lisp_Object msg_file;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
857 msg_file = Fsubstring (found, make_number (0), make_number (-1));
43837
ae392efb1660 (Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents: 43713
diff changeset
858 message_with_string ("Source file `%s' newer than byte-compiled file",
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
859 msg_file, 1);
43837
ae392efb1660 (Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents: 43713
diff changeset
860 }
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
861 }
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
862 UNGCPRO;
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
863 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
864 }
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
865 else
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
866 {
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
867 /* We are loading a source file (*.el). */
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
868 if (!NILP (Vload_source_file_function))
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
869 {
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
870 Lisp_Object val;
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
871
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
872 if (fd >= 0)
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
873 emacs_close (fd);
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
874 val = call4 (Vload_source_file_function, found, file,
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
875 NILP (noerror) ? Qnil : Qt,
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
876 NILP (nomessage) ? Qnil : Qt);
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
877 return unbind_to (count, val);
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
878 }
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
879 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
880
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
881 GCPRO2 (file, found);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
882
21936
6635a9f225a9 (Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents: 21935
diff changeset
883 #ifdef WINDOWSNT
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
884 emacs_close (fd);
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
885 efound = ENCODE_FILE (found);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
886 stream = fopen ((char *) SDATA (efound), fmode);
21936
6635a9f225a9 (Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents: 21935
diff changeset
887 #else /* not WINDOWSNT */
6635a9f225a9 (Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents: 21935
diff changeset
888 stream = fdopen (fd, fmode);
6635a9f225a9 (Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents: 21935
diff changeset
889 #endif /* not WINDOWSNT */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
890 if (stream == 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
891 {
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
892 emacs_close (fd);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
893 error ("Failure to create stdio stream for %s", SDATA (file));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
894 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
895
18665
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
896 if (! NILP (Vpurify_flag))
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
897 Vpreloaded_file_list = Fcons (file, Vpreloaded_file_list);
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
898
16012
3b5ffd35defe (Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents: 15283
diff changeset
899 if (NILP (nomessage))
3b5ffd35defe (Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents: 15283
diff changeset
900 {
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
901 if (!safe_p)
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
902 message_with_string ("Loading %s (compiled; note unsafe, not compiled in Emacs)...",
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
903 file, 1);
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
904 else if (!compiled)
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
905 message_with_string ("Loading %s (source)...", file, 1);
20168
13074c25ab06 Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents: 20048
diff changeset
906 else if (newer)
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
907 message_with_string ("Loading %s (compiled; note, source file is newer)...",
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
908 file, 1);
20168
13074c25ab06 Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents: 20048
diff changeset
909 else /* The typical case; compiled file newer than source file. */
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
910 message_with_string ("Loading %s...", file, 1);
16012
3b5ffd35defe (Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents: 15283
diff changeset
911 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
912
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
913 record_unwind_protect (load_unwind, make_save_value (stream, 0));
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
914 record_unwind_protect (load_descriptor_unwind, load_descriptor_list);
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
915 specbind (Qload_file_name, found);
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
916 specbind (Qinhibit_file_name_operation, Qnil);
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
917 load_descriptor_list
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
918 = Fcons (make_number (fileno (stream)), load_descriptor_list);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
919 load_in_progress++;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
920 readevalloop (Qget_file_char, stream, (! NILP (Vpurify_flag) ? file : found),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
921 Feval, 0, Qnil, Qnil, Qnil, Qnil);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
922 unbind_to (count, Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
923
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
924 /* Run any load-hooks for this file. */
13036
cd0e7903d0a9 (Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents: 12780
diff changeset
925 temp = Fassoc (file, Vafter_load_alist);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
926 if (!NILP (temp))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
927 Fprogn (Fcdr (temp));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
928 UNGCPRO;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
929
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
930 if (saved_doc_string)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
931 free (saved_doc_string);
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
932 saved_doc_string = 0;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
933 saved_doc_string_size = 0;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
934
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
935 if (prev_saved_doc_string)
27852
98f55bbdbbad (Fload): Use `xfree' instead of `free'.
Gerd Moellmann <gerd@gnu.org>
parents: 27763
diff changeset
936 xfree (prev_saved_doc_string);
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
937 prev_saved_doc_string = 0;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
938 prev_saved_doc_string_size = 0;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
939
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
940 if (!noninteractive && NILP (nomessage))
16012
3b5ffd35defe (Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents: 15283
diff changeset
941 {
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
942 if (!safe_p)
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
943 message_with_string ("Loading %s (compiled; note unsafe, not compiled in Emacs)...done",
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
944 file, 1);
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
945 else if (!compiled)
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
946 message_with_string ("Loading %s (source)...done", file, 1);
20168
13074c25ab06 Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents: 20048
diff changeset
947 else if (newer)
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
948 message_with_string ("Loading %s (compiled; note, source file is newer)...done",
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
949 file, 1);
20168
13074c25ab06 Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents: 20048
diff changeset
950 else /* The typical case; compiled file newer than source file. */
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
951 message_with_string ("Loading %s...done", file, 1);
16012
3b5ffd35defe (Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents: 15283
diff changeset
952 }
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
953
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
954 if (!NILP (Fequal (build_string ("obsolete"),
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
955 Ffile_name_nondirectory
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
956 (Fdirectory_file_name (Ffile_name_directory (found))))))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
957 message_with_string ("Package %s is obsolete", file, 1);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
958
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
959 return Qt;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
960 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
961
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
962 static Lisp_Object
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
963 load_unwind (arg) /* used as unwind-protect function in load */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
964 Lisp_Object arg;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
965 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
966 FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
967 if (stream != NULL)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
968 fclose (stream);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
969 if (--load_in_progress < 0) load_in_progress = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
970 return Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
971 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
972
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
973 static Lisp_Object
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
974 load_descriptor_unwind (oldlist)
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
975 Lisp_Object oldlist;
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
976 {
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
977 load_descriptor_list = oldlist;
9361
c11cc966dc6a (Fload, load_unwind): Store stream pointer as a cons of two integers,
Karl Heuer <kwzh@gnu.org>
parents: 9358
diff changeset
978 return Qnil;
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
979 }
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
980
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
981 /* Close all descriptors in use for Floads.
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
982 This is used when starting a subprocess. */
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
983
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
984 void
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
985 close_load_descs ()
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
986 {
15091
e05dd165b889 (close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents: 14972
diff changeset
987 #ifndef WINDOWSNT
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
988 Lisp_Object tail;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25555
diff changeset
989 for (tail = load_descriptor_list; !NILP (tail); tail = XCDR (tail))
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
990 emacs_close (XFASTINT (XCAR (tail)));
15091
e05dd165b889 (close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents: 14972
diff changeset
991 #endif
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
992 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
993
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
994 static int
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
995 complete_filename_p (pathname)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
996 Lisp_Object pathname;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
997 {
46472
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
998 register const unsigned char *s = SDATA (pathname);
9790
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
999 return (IS_DIRECTORY_SEP (s[0])
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1000 || (SCHARS (pathname) > 2
9790
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
1001 && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2]))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1002 #ifdef ALTOS
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1003 || *s == '@'
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1004 #endif
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1005 #ifdef VMS
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1006 || index (s, ':')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1007 #endif /* VMS */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1008 );
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1009 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1010
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1011 DEFUN ("locate-file-internal", Flocate_file_internal, Slocate_file_internal, 2, 4, 0,
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1012 doc: /* Search for FILENAME through PATH.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1013 Returns the file's name in absolute form, or nil if not found.
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1014 If SUFFIXES is non-nil, it should be a list of suffixes to append to
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1015 file name when searching.
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1016 If non-nil, PREDICATE is used instead of `file-readable-p'.
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1017 PREDICATE can also be an integer to pass to the access(2) function,
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1018 in which case file-name-handlers are ignored. */)
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1019 (filename, path, suffixes, predicate)
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1020 Lisp_Object filename, path, suffixes, predicate;
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1021 {
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1022 Lisp_Object file;
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1023 int fd = openp (path, filename, suffixes, &file, predicate);
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1024 if (NILP (predicate) && fd > 0)
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1025 close (fd);
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1026 return file;
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1027 }
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1028
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1029
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1030 /* Search for a file whose name is STR, looking in directories
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1031 in the Lisp list PATH, and trying suffixes from SUFFIX.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1032 On success, returns a file descriptor. On failure, returns -1.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1033
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1034 SUFFIXES is a list of strings containing possible suffixes.
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1035 The empty suffix is automatically added iff the list is empty.
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1036
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1037 PREDICATE non-nil means don't open the files,
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1038 just look for one that satisfies the predicate. In this case,
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1039 returns 1 on success. The predicate can be a lisp function or
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1040 an integer to pass to `access' (in which case file-name-handlers
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1041 are ignored).
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1042
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1043 If STOREPTR is nonzero, it points to a slot where the name of
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1044 the file actually found should be stored as a Lisp string.
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1045 nil is stored there on failure.
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1046
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
1047 If the file we find is remote, return -2
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1048 but store the found remote file name in *STOREPTR. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1049
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1050 int
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1051 openp (path, str, suffixes, storeptr, predicate)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1052 Lisp_Object path, str;
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1053 Lisp_Object suffixes;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1054 Lisp_Object *storeptr;
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1055 Lisp_Object predicate;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1056 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1057 register int fd;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1058 int fn_size = 100;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1059 char buf[100];
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1060 register char *fn = buf;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1061 int absolute = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1062 int want_size;
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1063 Lisp_Object filename;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1064 struct stat st;
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1065 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1066 Lisp_Object string, tail, encoded_fn;
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1067 int max_suffix_len = 0;
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1068
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1069 CHECK_STRING (str);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1070
40211
19a89ce104dd (syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1071 for (tail = suffixes; CONSP (tail); tail = XCDR (tail))
19a89ce104dd (syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1072 {
40690
ba7239b8872e (Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents: 40656
diff changeset
1073 CHECK_STRING_CAR (tail);
40211
19a89ce104dd (syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1074 max_suffix_len = max (max_suffix_len,
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1075 SBYTES (XCAR (tail)));
40211
19a89ce104dd (syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1076 }
19a89ce104dd (syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1077
31307
dd074ffca70f (openp): GCPRO local variable `filename'.
Gerd Moellmann <gerd@gnu.org>
parents: 31250
diff changeset
1078 string = filename = Qnil;
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1079 GCPRO6 (str, string, filename, path, suffixes, encoded_fn);
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1080
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1081 if (storeptr)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1082 *storeptr = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1083
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1084 if (complete_filename_p (str))
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1085 absolute = 1;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1086
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1087 for (; CONSP (path); path = XCDR (path))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1088 {
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1089 filename = Fexpand_file_name (str, XCAR (path));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1090 if (!complete_filename_p (filename))
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1091 /* If there are non-absolute elts in PATH (eg ".") */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1092 /* Of course, this could conceivably lose if luser sets
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1093 default-directory to be something non-absolute... */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1094 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1095 filename = Fexpand_file_name (filename, current_buffer->directory);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1096 if (!complete_filename_p (filename))
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1097 /* Give up on this path element! */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1098 continue;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1099 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1100
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1101 /* Calculate maximum size of any filename made from
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1102 this path element/specified file name and any possible suffix. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1103 want_size = max_suffix_len + SBYTES (filename) + 1;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1104 if (fn_size < want_size)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1105 fn = (char *) alloca (fn_size = 100 + want_size);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1106
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1107 /* Loop over suffixes. */
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1108 for (tail = NILP (suffixes) ? default_suffixes : suffixes;
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1109 CONSP (tail); tail = XCDR (tail))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1110 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1111 int lsuffix = SBYTES (XCAR (tail));
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1112 Lisp_Object handler;
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1113 int exists;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1114
16383
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1115 /* Concatenate path element/specified name with the suffix.
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1116 If the directory starts with /:, remove that. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1117 if (SCHARS (filename) > 2
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1118 && SREF (filename, 0) == '/'
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1119 && SREF (filename, 1) == ':')
16383
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1120 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1121 strncpy (fn, SDATA (filename) + 2,
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1122 SBYTES (filename) - 2);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1123 fn[SBYTES (filename) - 2] = 0;
16383
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1124 }
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1125 else
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1126 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1127 strncpy (fn, SDATA (filename),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1128 SBYTES (filename));
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1129 fn[SBYTES (filename)] = 0;
16383
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1130 }
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1131
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1132 if (lsuffix != 0) /* Bug happens on CCI if lsuffix is 0. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1133 strncat (fn, SDATA (XCAR (tail)), lsuffix);
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1134
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1135 /* Check that the file exists and is not a directory. */
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1136 /* We used to only check for handlers on non-absolute file names:
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1137 if (absolute)
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1138 handler = Qnil;
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1139 else
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1140 handler = Ffind_file_name_handler (filename, Qfile_exists_p);
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1141 It's not clear why that was the case and it breaks things like
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1142 (load "/bar.el") where the file is actually "/bar.el.gz". */
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1143 string = build_string (fn);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1144 handler = Ffind_file_name_handler (string, Qfile_exists_p);
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1145 if ((!NILP (handler) || !NILP (predicate)) && !NATNUMP (predicate))
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1146 {
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1147 if (NILP (predicate))
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1148 exists = !NILP (Ffile_readable_p (string));
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1149 else
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1150 exists = !NILP (call1 (predicate, string));
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1151 if (exists && !NILP (Ffile_directory_p (string)))
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1152 exists = 0;
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1153
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1154 if (exists)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1155 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1156 /* We succeeded; return this descriptor and filename. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1157 if (storeptr)
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1158 *storeptr = string;
8906
93f3d6f5753c (openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8828
diff changeset
1159 UNGCPRO;
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
1160 return -2;
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1161 }
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1162 }
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1163 else
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1164 {
46472
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
1165 const char *pfn;
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1166
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1167 encoded_fn = ENCODE_FILE (string);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1168 pfn = SDATA (encoded_fn);
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1169 exists = (stat (pfn, &st) >= 0
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1170 && (st.st_mode & S_IFMT) != S_IFDIR);
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1171 if (exists)
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1172 {
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1173 /* Check that we can access or open it. */
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1174 if (NATNUMP (predicate))
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1175 fd = (access (pfn, XFASTINT (predicate)) == 0) ? 1 : -1;
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1176 else
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1177 fd = emacs_open (pfn, O_RDONLY, 0);
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1178
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1179 if (fd >= 0)
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1180 {
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1181 /* We succeeded; return this descriptor and filename. */
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1182 if (storeptr)
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1183 *storeptr = string;
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1184 UNGCPRO;
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1185 return fd;
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1186 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1187 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1188 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1189 }
6392
58e075552627 (openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents: 6072
diff changeset
1190 if (absolute)
8906
93f3d6f5753c (openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8828
diff changeset
1191 break;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1192 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1193
8906
93f3d6f5753c (openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8828
diff changeset
1194 UNGCPRO;
93f3d6f5753c (openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8828
diff changeset
1195 return -1;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1196 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1197
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1198
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1199 /* Merge the list we've accumulated of globals from the current input source
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1200 into the load_history variable. The details depend on whether
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1201 the source has an associated file name or not.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1202
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1203 FILENAME is the file name that we are loading from.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1204 ENTIRE is 1 if loading that entire file, 0 if evaluating part of it. */
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1205
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1206 static void
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1207 build_load_history (filename, entire)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1208 Lisp_Object filename;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1209 int entire;
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1210 {
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1211 register Lisp_Object tail, prev, newelt;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1212 register Lisp_Object tem, tem2;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1213 register int foundit = 0;
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1214
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1215 tail = Vload_history;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1216 prev = Qnil;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1217
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1218 while (CONSP (tail))
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1219 {
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1220 tem = XCAR (tail);
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1221
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1222 /* Find the feature's previous assoc list... */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1223 if (!NILP (Fequal (filename, Fcar (tem))))
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1224 {
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1225 foundit = 1;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1226
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1227 /* If we're loading the entire file, remove old data. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1228 if (entire)
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1229 {
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1230 if (NILP (prev))
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1231 Vload_history = XCDR (tail);
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1232 else
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1233 Fsetcdr (prev, XCDR (tail));
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1234 }
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1235
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1236 /* Otherwise, cons on new symbols that are not already members. */
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1237 else
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1238 {
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1239 tem2 = Vcurrent_load_list;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1240
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1241 while (CONSP (tem2))
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1242 {
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1243 newelt = XCAR (tem2);
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1244
47021
3bd4234e0844 (build_load_history): Use Fmember to see if a definition
Richard M. Stallman <rms@gnu.org>
parents: 46472
diff changeset
1245 if (NILP (Fmember (newelt, tem)))
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1246 Fsetcar (tail, Fcons (XCAR (tem),
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1247 Fcons (newelt, XCDR (tem))));
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1248
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1249 tem2 = XCDR (tem2);
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1250 QUIT;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1251 }
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1252 }
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1253 }
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1254 else
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1255 prev = tail;
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1256 tail = XCDR (tail);
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1257 QUIT;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1258 }
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1259
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1260 /* If we're loading an entire file, cons the new assoc onto the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1261 front of load-history, the most-recently-loaded position. Also
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1262 do this if we didn't find an existing member for the file. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1263 if (entire || !foundit)
2901
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
1264 Vload_history = Fcons (Fnreverse (Vcurrent_load_list),
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
1265 Vload_history);
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1266 }
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1267
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1268 Lisp_Object
30917
469d242e5f72 Prototype readevalloop, load_unwind,
Dave Love <fx@gnu.org>
parents: 29486
diff changeset
1269 unreadpure (junk) /* Used as unwind-protect function in readevalloop */
469d242e5f72 Prototype readevalloop, load_unwind,
Dave Love <fx@gnu.org>
parents: 29486
diff changeset
1270 Lisp_Object junk;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1271 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1272 read_pure = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1273 return Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1274 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1275
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1276 static Lisp_Object
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1277 readevalloop_1 (old)
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1278 Lisp_Object old;
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1279 {
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1280 load_convert_to_unibyte = ! NILP (old);
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1281 return Qnil;
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1282 }
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1283
28733
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1284 /* Signal an `end-of-file' error, if possible with file name
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1285 information. */
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1286
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1287 static void
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1288 end_of_file_error ()
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1289 {
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1290 Lisp_Object data;
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1291
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1292 if (STRINGP (Vload_file_name))
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1293 data = Fcons (Vload_file_name, Qnil);
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1294 else
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1295 data = Qnil;
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1296
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1297 Fsignal (Qend_of_file, data);
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1298 }
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1299
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1300 /* UNIBYTE specifies how to set load_convert_to_unibyte
22420
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1301 for this invocation.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1302 READFUN, if non-nil, is used instead of `read'.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1303 START, END is region in current buffer (from eval-region). */
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1304
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1305 static void
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1306 readevalloop (readcharfun, stream, sourcename, evalfun,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1307 printflag, unibyte, readfun, start, end)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1308 Lisp_Object readcharfun;
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1309 FILE *stream;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1310 Lisp_Object sourcename;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1311 Lisp_Object (*evalfun) ();
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1312 int printflag;
22420
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1313 Lisp_Object unibyte, readfun;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1314 Lisp_Object start, end;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1315 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1316 register int c;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1317 register Lisp_Object val;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45970
diff changeset
1318 int count = SPECPDL_INDEX ();
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1319 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
5185
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1320 struct buffer *b = 0;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1321 int bpos;
29486
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1322 int continue_reading_p;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1323 /* Nonzero if reading an entire buffer. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1324 int whole_buffer = 0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1325 /* 1 on the first time around. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1326 int first_sexp = 1;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1327
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1328 if (MARKERP (readcharfun))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1329 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1330 if (NILP (start))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1331 start = readcharfun;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1332 }
5185
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1333
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1334 if (BUFFERP (readcharfun))
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1335 b = XBUFFER (readcharfun);
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1336 else if (MARKERP (readcharfun))
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1337 b = XMARKER (readcharfun)->buffer;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1338
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1339 specbind (Qstandard_input, readcharfun); /* GCPROs readcharfun. */
2901
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
1340 specbind (Qcurrent_load_list, Qnil);
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1341 record_unwind_protect (readevalloop_1, load_convert_to_unibyte ? Qt : Qnil);
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1342 load_convert_to_unibyte = !NILP (unibyte);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1343
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
1344 readchar_backlog = -1;
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
1345
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1346 GCPRO4 (sourcename, readfun, start, end);
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1347
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1348 LOADHIST_ATTACH (sourcename);
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1349
29486
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1350 continue_reading_p = 1;
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1351 while (continue_reading_p)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1352 {
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1353 int count1 = SPECPDL_INDEX ();
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1354
5185
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1355 if (b != 0 && NILP (b->name))
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1356 error ("Reading from killed buffer");
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1357
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1358 if (!NILP (start))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1359 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1360 /* Switch to the buffer we are reading from. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1361 record_unwind_protect (save_excursion_restore, save_excursion_save ());
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1362 set_buffer_internal (b);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1363
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1364 /* Save point in it. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1365 record_unwind_protect (save_excursion_restore, save_excursion_save ());
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1366 /* Save ZV in it. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1367 record_unwind_protect (save_restriction_restore, save_restriction_save ());
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1368 /* Those get unbound after we read one expression. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1369
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1370 /* Set point and ZV around stuff to be read. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1371 Fgoto_char (start);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1372 if (!NILP (end))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1373 Fnarrow_to_region (make_number (BEGV), end);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1374
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1375 /* Just for cleanliness, convert END to a marker
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1376 if it is an integer. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1377 if (INTEGERP (end))
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1378 end = Fpoint_max_marker ();
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1379 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1380
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1381 /* On the first cycle, we can easily test here
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1382 whether we are reading the whole buffer. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1383 if (b && first_sexp)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1384 whole_buffer = (PT == BEG && ZV == Z);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1385
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1386 instream = stream;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1387 read_next:
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1388 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1389 if (c == ';')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1390 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1391 while ((c = READCHAR) != '\n' && c != -1);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1392 goto read_next;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1393 }
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1394 if (c < 0)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1395 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1396 unbind_to (count1, Qnil);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1397 break;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1398 }
10163
70b04b218216 (readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents: 10014
diff changeset
1399
70b04b218216 (readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents: 10014
diff changeset
1400 /* Ignore whitespace here, so we can detect eof. */
70b04b218216 (readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents: 10014
diff changeset
1401 if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r')
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1402 goto read_next;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1403
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
1404 if (!NILP (Vpurify_flag) && c == '(')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1405 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1406 record_unwind_protect (unreadpure, Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1407 val = read_list (-1, readcharfun);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1408 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1409 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1410 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1411 UNREAD (c);
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
1412 read_objects = Qnil;
29486
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1413 if (!NILP (readfun))
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1414 {
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1415 val = call1 (readfun, readcharfun);
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1416
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1417 /* If READCHARFUN has set point to ZV, we should
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1418 stop reading, even if the form read sets point
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1419 to a different value when evaluated. */
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1420 if (BUFFERP (readcharfun))
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1421 {
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1422 struct buffer *b = XBUFFER (readcharfun);
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1423 if (BUF_PT (b) == BUF_ZV (b))
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1424 continue_reading_p = 0;
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1425 }
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1426 }
22420
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1427 else if (! NILP (Vload_read_function))
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1428 val = call1 (Vload_read_function, readcharfun);
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1429 else
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1430 val = read_internal_start (readcharfun, Qnil, Qnil);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1431 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1432
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1433 if (!NILP (start) && continue_reading_p)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1434 start = Fpoint_marker ();
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1435
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1436 /* Restore saved point and BEGV. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1437 unbind_to (count1, Qnil);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1438
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1439 /* Now eval what we just read. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1440 val = (*evalfun) (val);
29486
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1441
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1442 if (printflag)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1443 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1444 Vvalues = Fcons (val, Vvalues);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1445 if (EQ (Vstandard_output, Qt))
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1446 Fprin1 (val, Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1447 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1448 Fprint (val, Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1449 }
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1450
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1451 first_sexp = 0;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1452 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1453
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1454 build_load_history (sourcename,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1455 stream || whole_buffer);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1456
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1457 UNGCPRO;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1458
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1459 unbind_to (count, Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1460 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1461
25206
f2c7d7fb6198 (Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents: 25165
diff changeset
1462 DEFUN ("eval-buffer", Feval_buffer, Seval_buffer, 0, 5, "",
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1463 doc: /* Execute the current buffer as Lisp code.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1464 Programs can pass two arguments, BUFFER and PRINTFLAG.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1465 BUFFER is the buffer to evaluate (nil means use current buffer).
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1466 PRINTFLAG controls printing of output:
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1467 nil means discard it; anything else is stream for print.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1468
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1469 If the optional third argument FILENAME is non-nil,
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1470 it specifies the file name to use for `load-history'.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1471 The optional fourth argument UNIBYTE specifies `load-convert-to-unibyte'
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1472 for this invocation.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1473
48149
8f11dde95c66 (Feval_buffer): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents: 48087
diff changeset
1474 The optional fifth argument DO-ALLOW-PRINT, if non-nil, specifies that
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1475 `print' and related functions should work normally even if PRINTFLAG is nil.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1476
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1477 This function preserves the position of point. */)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1478 (buffer, printflag, filename, unibyte, do_allow_print)
25206
f2c7d7fb6198 (Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents: 25165
diff changeset
1479 Lisp_Object buffer, printflag, filename, unibyte, do_allow_print;
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1480 {
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45970
diff changeset
1481 int count = SPECPDL_INDEX ();
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1482 Lisp_Object tem, buf;
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1483
14092
279f5f3528a8 (Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 14036
diff changeset
1484 if (NILP (buffer))
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1485 buf = Fcurrent_buffer ();
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1486 else
14092
279f5f3528a8 (Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 14036
diff changeset
1487 buf = Fget_buffer (buffer);
673
6217fa6e2cab *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 672
diff changeset
1488 if (NILP (buf))
19803
7573e51f9c41 (Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents: 19626
diff changeset
1489 error ("No such buffer");
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1490
25206
f2c7d7fb6198 (Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents: 25165
diff changeset
1491 if (NILP (printflag) && NILP (do_allow_print))
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1492 tem = Qsymbolp;
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1493 else
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1494 tem = printflag;
19803
7573e51f9c41 (Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents: 19626
diff changeset
1495
7573e51f9c41 (Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents: 19626
diff changeset
1496 if (NILP (filename))
7573e51f9c41 (Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents: 19626
diff changeset
1497 filename = XBUFFER (buf)->filename;
7573e51f9c41 (Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents: 19626
diff changeset
1498
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1499 specbind (Qeval_buffer_list, Fcons (buf, Veval_buffer_list));
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1500 specbind (Qstandard_output, tem);
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1501 record_unwind_protect (save_excursion_restore, save_excursion_save ());
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1502 BUF_SET_PT (XBUFFER (buf), BUF_BEGV (XBUFFER (buf)));
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1503 readevalloop (buf, 0, filename, Feval,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1504 !NILP (printflag), unibyte, Qnil, Qnil, Qnil);
1924
21bd3a2189d3 * keyboard.c (recursive_edit_1, command_loop_1): Pass the proper
Jim Blandy <jimb@redhat.com>
parents: 1887
diff changeset
1505 unbind_to (count, Qnil);
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1506
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1507 return Qnil;
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1508 }
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1509
22420
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1510 DEFUN ("eval-region", Feval_region, Seval_region, 2, 4, "r",
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1511 doc: /* Execute the region as Lisp code.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1512 When called from programs, expects two arguments,
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1513 giving starting and ending indices in the current buffer
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1514 of the text to be executed.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1515 Programs can pass third argument PRINTFLAG which controls output:
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1516 nil means discard it; anything else is stream for printing it.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1517 Also the fourth argument READ-FUNCTION, if non-nil, is used
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1518 instead of `read' to read each expression. It gets one argument
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1519 which is the input stream for reading characters.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1520
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1521 This function does not move point. */)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1522 (start, end, printflag, read_function)
22420
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1523 Lisp_Object start, end, printflag, read_function;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1524 {
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45970
diff changeset
1525 int count = SPECPDL_INDEX ();
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1526 Lisp_Object tem, cbuf;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1527
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1528 cbuf = Fcurrent_buffer ();
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1529
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
1530 if (NILP (printflag))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1531 tem = Qsymbolp;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1532 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1533 tem = printflag;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1534 specbind (Qstandard_output, tem);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1535 specbind (Qeval_buffer_list, Fcons (cbuf, Veval_buffer_list));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1536
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1537 /* readevalloop calls functions which check the type of start and end. */
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1538 readevalloop (cbuf, 0, XBUFFER (cbuf)->filename, Feval,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1539 !NILP (printflag), Qnil, read_function,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1540 start, end);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1541
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1542 return unbind_to (count, Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1543 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1544
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1545
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1546 DEFUN ("read", Fread, Sread, 0, 1, 0,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1547 doc: /* Read one Lisp expression as text from STREAM, return as Lisp object.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1548 If STREAM is nil, use the value of `standard-input' (which see).
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1549 STREAM or the value of `standard-input' may be:
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1550 a buffer (read from point and advance it)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1551 a marker (read from where it points and advance it)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1552 a function (call it with no arguments for each character,
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1553 call it with a char as argument to push a char back)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1554 a string (takes text from string, starting at the beginning)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1555 t (read text line using minibuffer and use it, or read from
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1556 standard input in batch mode). */)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1557 (stream)
12545
ccc20d466150 (Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents: 11955
diff changeset
1558 Lisp_Object stream;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1559 {
12545
ccc20d466150 (Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents: 11955
diff changeset
1560 if (NILP (stream))
ccc20d466150 (Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents: 11955
diff changeset
1561 stream = Vstandard_input;
ccc20d466150 (Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents: 11955
diff changeset
1562 if (EQ (stream, Qt))
ccc20d466150 (Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents: 11955
diff changeset
1563 stream = Qread_char;
ccc20d466150 (Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents: 11955
diff changeset
1564 if (EQ (stream, Qread_char))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1565 return Fread_minibuffer (build_string ("Lisp expression: "), Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1566
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1567 return read_internal_start (stream, Qnil, Qnil);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1568 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1569
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1570 DEFUN ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1571 doc: /* Read one Lisp expression which is represented as text by STRING.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1572 Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX).
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1573 START and END optionally delimit a substring of STRING from which to read;
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1574 they default to 0 and (length STRING) respectively. */)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1575 (string, start, end)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1576 Lisp_Object string, start, end;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1577 {
45577
30f1ddc50732 Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents: 45576
diff changeset
1578 Lisp_Object ret;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40558
diff changeset
1579 CHECK_STRING (string);
45577
30f1ddc50732 Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents: 45576
diff changeset
1580 /* read_internal_start sets read_from_string_index. */
30f1ddc50732 Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents: 45576
diff changeset
1581 ret = read_internal_start (string, start, end);
45576
0a94e1efe9fc (Fread_from_string): Don't depend on order of evaluation for C
Colin Walters <walters@gnu.org>
parents: 45554
diff changeset
1582 return Fcons (ret, make_number (read_from_string_index));
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1583 }
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1584
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1585 /* Function to set up the global context we need in toplevel read
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1586 calls. */
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1587 static Lisp_Object
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1588 read_internal_start (stream, start, end)
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1589 Lisp_Object stream;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1590 Lisp_Object start; /* Only used when stream is a string. */
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1591 Lisp_Object end; /* Only used when stream is a string. */
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1592 {
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1593 Lisp_Object retval;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1594
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1595 readchar_backlog = -1;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1596 readchar_count = 0;
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
1597 new_backquote_flag = 0;
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
1598 read_objects = Qnil;
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1599 if (EQ (Vread_with_symbol_positions, Qt)
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1600 || EQ (Vread_with_symbol_positions, stream))
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1601 Vread_symbol_positions_list = Qnil;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1602
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1603 if (STRINGP (stream))
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1604 {
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1605 int startval, endval;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1606 if (NILP (end))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1607 endval = SCHARS (stream);
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1608 else
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1609 {
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1610 CHECK_NUMBER (end);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1611 endval = XINT (end);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1612 if (endval < 0 || endval > SCHARS (stream))
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1613 args_out_of_range (stream, end);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1614 }
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1615
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1616 if (NILP (start))
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1617 startval = 0;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1618 else
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1619 {
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1620 CHECK_NUMBER (start);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1621 startval = XINT (start);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1622 if (startval < 0 || startval > endval)
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1623 args_out_of_range (stream, start);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1624 }
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1625 read_from_string_index = startval;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1626 read_from_string_index_byte = string_char_to_byte (stream, startval);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1627 read_from_string_limit = endval;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1628 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
1629
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1630 retval = read0 (stream);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1631 if (EQ (Vread_with_symbol_positions, Qt)
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1632 || EQ (Vread_with_symbol_positions, stream))
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1633 Vread_symbol_positions_list = Fnreverse (Vread_symbol_positions_list);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1634 return retval;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1635 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1636
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
1637 /* Use this for recursive reads, in contexts where internal tokens
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
1638 are not allowed. */
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
1639
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1640 static Lisp_Object
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1641 read0 (readcharfun)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1642 Lisp_Object readcharfun;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1643 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1644 register Lisp_Object val;
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
1645 int c;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1646
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
1647 val = read1 (readcharfun, &c, 0);
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
1648 if (c)
21211
293254dae80a (read0): Swap args to Fmake_string.
Richard M. Stallman <rms@gnu.org>
parents: 20815
diff changeset
1649 Fsignal (Qinvalid_read_syntax, Fcons (Fmake_string (make_number (1),
293254dae80a (read0): Swap args to Fmake_string.
Richard M. Stallman <rms@gnu.org>
parents: 20815
diff changeset
1650 make_number (c)),
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
1651 Qnil));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1652
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1653 return val;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1654 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1655
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1656 static int read_buffer_size;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1657 static char *read_buffer;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1658
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1659 /* Read multibyte form and return it as a character. C is a first
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1660 byte of multibyte form, and rest of them are read from
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1661 READCHARFUN. */
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
1662
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1663 static int
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1664 read_multibyte (c, readcharfun)
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1665 register int c;
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1666 Lisp_Object readcharfun;
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1667 {
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1668 /* We need the actual character code of this multibyte
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1669 characters. */
26866
305531847450 (readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26755
diff changeset
1670 unsigned char str[MAX_MULTIBYTE_LENGTH];
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1671 int len = 0;
36757
23382dbfb9d0 (read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents: 36256
diff changeset
1672 int bytes;
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1673
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1674 if (c < 0)
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1675 return c;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1676
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1677 str[len++] = c;
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1678 while ((c = READCHAR) >= 0xA0
26866
305531847450 (readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26755
diff changeset
1679 && len < MAX_MULTIBYTE_LENGTH)
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1680 {
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1681 str[len++] = c;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1682 readchar_count--;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1683 }
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1684 UNREAD (c);
36757
23382dbfb9d0 (read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents: 36256
diff changeset
1685 if (UNIBYTE_STR_AS_MULTIBYTE_P (str, len, bytes))
23382dbfb9d0 (read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents: 36256
diff changeset
1686 return STRING_CHAR (str, len);
23382dbfb9d0 (read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents: 36256
diff changeset
1687 /* The byte sequence is not valid as multibyte. Unread all bytes
23382dbfb9d0 (read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents: 36256
diff changeset
1688 but the first one, and return the first byte. */
23382dbfb9d0 (read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents: 36256
diff changeset
1689 while (--len > 0)
23382dbfb9d0 (read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents: 36256
diff changeset
1690 UNREAD (str[len]);
23382dbfb9d0 (read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents: 36256
diff changeset
1691 return str[0];
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1692 }
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1693
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1694 /* Read a \-escape sequence, assuming we already read the `\'.
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1695 If the escape sequence forces unibyte, store 1 into *BYTEREP.
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1696 If the escape sequence forces multibyte, store 2 into *BYTEREP.
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1697 Otherwise store 0 into *BYTEREP. */
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
1698
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1699 static int
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1700 read_escape (readcharfun, stringp, byterep)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1701 Lisp_Object readcharfun;
20669
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
1702 int stringp;
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1703 int *byterep;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1704 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1705 register int c = READCHAR;
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1706
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1707 *byterep = 0;
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1708
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1709 switch (c)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1710 {
15091
e05dd165b889 (close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents: 14972
diff changeset
1711 case -1:
40931
50b111aed6d5 (read_escape): Use end_of_file_error for reporting eof.
Richard M. Stallman <rms@gnu.org>
parents: 40796
diff changeset
1712 end_of_file_error ();
15091
e05dd165b889 (close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents: 14972
diff changeset
1713
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1714 case 'a':
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
1715 return '\007';
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1716 case 'b':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1717 return '\b';
2018
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1718 case 'd':
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1719 return 0177;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1720 case 'e':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1721 return 033;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1722 case 'f':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1723 return '\f';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1724 case 'n':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1725 return '\n';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1726 case 'r':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1727 return '\r';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1728 case 't':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1729 return '\t';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1730 case 'v':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1731 return '\v';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1732 case '\n':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1733 return -1;
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
1734 case ' ':
20669
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
1735 if (stringp)
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
1736 return -1;
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
1737 return ' ';
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1738
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1739 case 'M':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1740 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1741 if (c != '-')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1742 error ("Invalid escape character syntax");
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1743 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1744 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1745 c = read_escape (readcharfun, 0, byterep);
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1746 return c | meta_modifier;
2018
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1747
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1748 case 'S':
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1749 c = READCHAR;
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1750 if (c != '-')
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1751 error ("Invalid escape character syntax");
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1752 c = READCHAR;
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1753 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1754 c = read_escape (readcharfun, 0, byterep);
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1755 return c | shift_modifier;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1756
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1757 case 'H':
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1758 c = READCHAR;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1759 if (c != '-')
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1760 error ("Invalid escape character syntax");
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1761 c = READCHAR;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1762 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1763 c = read_escape (readcharfun, 0, byterep);
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1764 return c | hyper_modifier;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1765
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1766 case 'A':
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1767 c = READCHAR;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1768 if (c != '-')
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1769 error ("Invalid escape character syntax");
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1770 c = READCHAR;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1771 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1772 c = read_escape (readcharfun, 0, byterep);
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1773 return c | alt_modifier;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1774
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1775 case 's':
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1776 c = READCHAR;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1777 if (c != '-')
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1778 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1779 UNREAD (c);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1780 return ' ';
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
1781 }
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1782 c = READCHAR;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1783 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1784 c = read_escape (readcharfun, 0, byterep);
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1785 return c | super_modifier;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1786
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1787 case 'C':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1788 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1789 if (c != '-')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1790 error ("Invalid escape character syntax");
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1791 case '^':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1792 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1793 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1794 c = read_escape (readcharfun, 0, byterep);
25251
1fb18e7e3f35 (read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents: 25206
diff changeset
1795 if ((c & ~CHAR_MODIFIER_MASK) == '?')
1fb18e7e3f35 (read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents: 25206
diff changeset
1796 return 0177 | (c & CHAR_MODIFIER_MASK);
1fb18e7e3f35 (read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents: 25206
diff changeset
1797 else if (! SINGLE_BYTE_CHAR_P ((c & ~CHAR_MODIFIER_MASK)))
1fb18e7e3f35 (read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents: 25206
diff changeset
1798 return c | ctrl_modifier;
2018
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1799 /* ASCII control chars are made from letters (both cases),
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1800 as well as the non-letters within 0100...0137. */
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1801 else if ((c & 0137) >= 0101 && (c & 0137) <= 0132)
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1802 return (c & (037 | ~0177));
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1803 else if ((c & 0177) >= 0100 && (c & 0177) <= 0137)
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1804 return (c & (037 | ~0177));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1805 else
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1806 return c | ctrl_modifier;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1807
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1808 case '0':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1809 case '1':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1810 case '2':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1811 case '3':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1812 case '4':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1813 case '5':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1814 case '6':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1815 case '7':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1816 /* An octal escape, as in ANSI C. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1817 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1818 register int i = c - '0';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1819 register int count = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1820 while (++count < 3)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1821 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1822 if ((c = READCHAR) >= '0' && c <= '7')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1823 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1824 i *= 8;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1825 i += c - '0';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1826 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1827 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1828 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1829 UNREAD (c);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1830 break;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1831 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1832 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
1833
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1834 *byterep = 1;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1835 return i;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1836 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1837
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1838 case 'x':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1839 /* A hex escape, as in ANSI C. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1840 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1841 int i = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1842 while (1)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1843 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1844 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1845 if (c >= '0' && c <= '9')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1846 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1847 i *= 16;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1848 i += c - '0';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1849 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1850 else if ((c >= 'a' && c <= 'f')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1851 || (c >= 'A' && c <= 'F'))
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1852 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1853 i *= 16;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1854 if (c >= 'a' && c <= 'f')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1855 i += c - 'a' + 10;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1856 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1857 i += c - 'A' + 10;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1858 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1859 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1860 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1861 UNREAD (c);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1862 break;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1863 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1864 }
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1865
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1866 *byterep = 2;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1867 return i;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1868 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1869
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1870 default:
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1871 if (BASE_LEADING_CODE_P (c))
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1872 c = read_multibyte (c, readcharfun);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1873 return c;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1874 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1875 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1876
28165
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1877
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1878 /* Read an integer in radix RADIX using READCHARFUN to read
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1879 characters. RADIX must be in the interval [2..36]; if it isn't, a
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1880 read error is signaled . Value is the integer read. Signals an
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1881 error if encountering invalid read syntax or if RADIX is out of
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1882 range. */
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1883
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1884 static Lisp_Object
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1885 read_integer (readcharfun, radix)
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1886 Lisp_Object readcharfun;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1887 int radix;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1888 {
35543
c809110e1433 (read_integer): Use type EMACS_INT instead of int.
Gerd Moellmann <gerd@gnu.org>
parents: 34604
diff changeset
1889 int ndigits = 0, invalid_p, c, sign = 0;
c809110e1433 (read_integer): Use type EMACS_INT instead of int.
Gerd Moellmann <gerd@gnu.org>
parents: 34604
diff changeset
1890 EMACS_INT number = 0;
28165
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1891
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1892 if (radix < 2 || radix > 36)
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1893 invalid_p = 1;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1894 else
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1895 {
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1896 number = ndigits = invalid_p = 0;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1897 sign = 1;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1898
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1899 c = READCHAR;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1900 if (c == '-')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1901 {
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1902 c = READCHAR;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1903 sign = -1;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1904 }
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1905 else if (c == '+')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1906 c = READCHAR;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
1907
28165
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1908 while (c >= 0)
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1909 {
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1910 int digit;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
1911
28165
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1912 if (c >= '0' && c <= '9')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1913 digit = c - '0';
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1914 else if (c >= 'a' && c <= 'z')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1915 digit = c - 'a' + 10;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1916 else if (c >= 'A' && c <= 'Z')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1917 digit = c - 'A' + 10;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1918 else
28190
aa79cfcecd73 (read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents: 28165
diff changeset
1919 {
aa79cfcecd73 (read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents: 28165
diff changeset
1920 UNREAD (c);
aa79cfcecd73 (read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents: 28165
diff changeset
1921 break;
aa79cfcecd73 (read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents: 28165
diff changeset
1922 }
28165
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1923
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1924 if (digit < 0 || digit >= radix)
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1925 invalid_p = 1;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1926
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1927 number = radix * number + digit;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1928 ++ndigits;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1929 c = READCHAR;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1930 }
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1931 }
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1932
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1933 if (ndigits == 0 || invalid_p)
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1934 {
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1935 char buf[50];
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1936 sprintf (buf, "integer, radix %d", radix);
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1937 Fsignal (Qinvalid_read_syntax, Fcons (build_string (buf), Qnil));
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1938 }
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1939
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1940 return make_number (sign * number);
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1941 }
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1942
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1943
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1944 /* Convert unibyte text in read_buffer to multibyte.
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1945
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1946 Initially, *P is a pointer after the end of the unibyte text, and
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1947 the pointer *END points after the end of read_buffer.
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1948
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1949 If read_buffer doesn't have enough room to hold the result
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1950 of the conversion, reallocate it and adjust *P and *END.
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1951
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1952 At the end, make *P point after the result of the conversion, and
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1953 return in *NCHARS the number of characters in the converted
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1954 text. */
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1955
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1956 static void
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1957 to_multibyte (p, end, nchars)
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1958 char **p, **end;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1959 int *nchars;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1960 {
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1961 int nbytes;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1962
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1963 parse_str_as_multibyte (read_buffer, *p - read_buffer, &nbytes, nchars);
40506
81ab7b9aefcc (to_multibyte): Ensure read_buffer is at least twice
Gerd Moellmann <gerd@gnu.org>
parents: 40503
diff changeset
1964 if (read_buffer_size < 2 * nbytes)
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1965 {
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1966 int offset = *p - read_buffer;
40558
0f4185c9842a (to_multibyte): Fix computation of new read_buffer_size.
Gerd Moellmann <gerd@gnu.org>
parents: 40508
diff changeset
1967 read_buffer_size = 2 * max (read_buffer_size, nbytes);
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1968 read_buffer = (char *) xrealloc (read_buffer, read_buffer_size);
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1969 *p = read_buffer + offset;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1970 *end = read_buffer + read_buffer_size;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1971 }
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1972
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1973 if (nbytes != *nchars)
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1974 nbytes = str_as_multibyte (read_buffer, read_buffer_size,
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1975 *p - read_buffer, nchars);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
1976
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1977 *p = read_buffer + nbytes;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1978 }
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1979
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1980
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
1981 /* If the next token is ')' or ']' or '.', we store that character
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
1982 in *PCH and the return value is not interesting. Else, we store
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
1983 zero in *PCH and we read and return one lisp object.
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
1984
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
1985 FIRST_IN_LIST is nonzero if this is the first element of a list. */
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
1986
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1987 static Lisp_Object
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
1988 read1 (readcharfun, pch, first_in_list)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1989 register Lisp_Object readcharfun;
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
1990 int *pch;
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
1991 int first_in_list;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1992 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1993 register int c;
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
1994 int uninterned_symbol = 0;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
1995
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
1996 *pch = 0;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1997
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1998 retry:
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1999
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2000 c = READCHAR;
28733
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
2001 if (c < 0)
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
2002 end_of_file_error ();
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2003
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2004 switch (c)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2005 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2006 case '(':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2007 return read_list (0, readcharfun);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2008
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2009 case '[':
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2010 return read_vector (readcharfun, 0);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2011
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2012 case ')':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2013 case ']':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2014 {
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2015 *pch = c;
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2016 return Qnil;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2017 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2018
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2019 case '#':
373
7c6f74ef31a3 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 364
diff changeset
2020 c = READCHAR;
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2021 if (c == '^')
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2022 {
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2023 c = READCHAR;
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2024 if (c == '[')
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2025 {
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2026 Lisp_Object tmp;
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2027 tmp = read_vector (readcharfun, 0);
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2028 if (XVECTOR (tmp)->size < CHAR_TABLE_STANDARD_SLOTS
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2029 || XVECTOR (tmp)->size > CHAR_TABLE_STANDARD_SLOTS + 10)
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2030 error ("Invalid size char-table");
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2031 XSETCHAR_TABLE (tmp, XCHAR_TABLE (tmp));
17325
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2032 XCHAR_TABLE (tmp)->top = Qt;
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2033 return tmp;
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2034 }
17325
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2035 else if (c == '^')
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2036 {
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2037 c = READCHAR;
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2038 if (c == '[')
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2039 {
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2040 Lisp_Object tmp;
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2041 tmp = read_vector (readcharfun, 0);
17325
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2042 if (XVECTOR (tmp)->size != SUB_CHAR_TABLE_STANDARD_SLOTS)
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2043 error ("Invalid size char-table");
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2044 XSETCHAR_TABLE (tmp, XCHAR_TABLE (tmp));
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2045 XCHAR_TABLE (tmp)->top = Qnil;
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2046 return tmp;
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2047 }
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2048 Fsignal (Qinvalid_read_syntax,
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2049 Fcons (make_string ("#^^", 3), Qnil));
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
2050 }
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2051 Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#^", 2), Qnil));
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2052 }
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2053 if (c == '&')
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2054 {
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2055 Lisp_Object length;
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2056 length = read1 (readcharfun, pch, first_in_list);
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2057 c = READCHAR;
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2058 if (c == '"')
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2059 {
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2060 Lisp_Object tmp, val;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2061 int size_in_chars
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2062 = ((XFASTINT (length) + BOOL_VECTOR_BITS_PER_CHAR - 1)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2063 / BOOL_VECTOR_BITS_PER_CHAR);
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2064
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2065 UNREAD (c);
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2066 tmp = read1 (readcharfun, pch, first_in_list);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2067 if (size_in_chars != SCHARS (tmp)
16925
2b35e4ccbb32 (read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents: 16856
diff changeset
2068 /* We used to print 1 char too many
2b35e4ccbb32 (read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents: 16856
diff changeset
2069 when the number of bits was a multiple of 8.
2b35e4ccbb32 (read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents: 16856
diff changeset
2070 Accept such input in case it came from an old version. */
2b35e4ccbb32 (read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents: 16856
diff changeset
2071 && ! (XFASTINT (length)
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2072 == (SCHARS (tmp) - 1) * BOOL_VECTOR_BITS_PER_CHAR))
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2073 Fsignal (Qinvalid_read_syntax,
16856
f838ff9a4d39 Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 16855
diff changeset
2074 Fcons (make_string ("#&...", 5), Qnil));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2075
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2076 val = Fmake_bool_vector (length, Qnil);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2077 bcopy (SDATA (tmp), XBOOL_VECTOR (val)->data,
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2078 size_in_chars);
21935
8dad06385435 (read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents: 21911
diff changeset
2079 /* Clear the extraneous bits in the last byte. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2080 if (XINT (length) != size_in_chars * BOOL_VECTOR_BITS_PER_CHAR)
21935
8dad06385435 (read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents: 21911
diff changeset
2081 XBOOL_VECTOR (val)->data[size_in_chars - 1]
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2082 &= (1 << (XINT (length) % BOOL_VECTOR_BITS_PER_CHAR)) - 1;
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2083 return val;
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2084 }
16856
f838ff9a4d39 Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 16855
diff changeset
2085 Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#&...", 5),
16855
d10bb3a79eff (read1): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 16487
diff changeset
2086 Qnil));
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
2087 }
373
7c6f74ef31a3 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 364
diff changeset
2088 if (c == '[')
7c6f74ef31a3 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 364
diff changeset
2089 {
7c6f74ef31a3 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 364
diff changeset
2090 /* Accept compiled functions at read-time so that we don't have to
7c6f74ef31a3 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 364
diff changeset
2091 build them using function calls. */
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2092 Lisp_Object tmp;
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2093 tmp = read_vector (readcharfun, 1);
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2094 return Fmake_byte_code (XVECTOR (tmp)->size,
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2095 XVECTOR (tmp)->contents);
373
7c6f74ef31a3 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 364
diff changeset
2096 }
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2097 if (c == '(')
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2098 {
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2099 Lisp_Object tmp;
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2100 struct gcpro gcpro1;
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
2101 int ch;
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2102
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2103 /* Read the string itself. */
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2104 tmp = read1 (readcharfun, &ch, 0);
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2105 if (ch != 0 || !STRINGP (tmp))
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2106 Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#", 1), Qnil));
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2107 GCPRO1 (tmp);
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2108 /* Read the intervals and their properties. */
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2109 while (1)
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2110 {
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2111 Lisp_Object beg, end, plist;
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2112
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2113 beg = read1 (readcharfun, &ch, 0);
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
2114 end = plist = Qnil;
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2115 if (ch == ')')
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2116 break;
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2117 if (ch == 0)
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2118 end = read1 (readcharfun, &ch, 0);
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2119 if (ch == 0)
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2120 plist = read1 (readcharfun, &ch, 0);
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2121 if (ch)
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2122 Fsignal (Qinvalid_read_syntax,
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2123 Fcons (build_string ("invalid string property list"),
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2124 Qnil));
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2125 Fset_text_properties (beg, end, plist, tmp);
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2126 }
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2127 UNGCPRO;
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2128 return tmp;
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2129 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2130
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2131 /* #@NUMBER is used to skip NUMBER following characters.
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2132 That's used in .elc files to skip over doc strings
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2133 and function definitions. */
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2134 if (c == '@')
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2135 {
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2136 int i, nskip = 0;
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2137
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2138 /* Read a decimal integer. */
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2139 while ((c = READCHAR) >= 0
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2140 && c >= '0' && c <= '9')
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2141 {
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2142 nskip *= 10;
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2143 nskip += c - '0';
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2144 }
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2145 if (c >= 0)
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2146 UNREAD (c);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2147
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2148 if (load_force_doc_strings && EQ (readcharfun, Qget_file_char))
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2149 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2150 /* If we are supposed to force doc strings into core right now,
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2151 record the last string that we skipped,
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2152 and record where in the file it comes from. */
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2153
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2154 /* But first exchange saved_doc_string
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2155 with prev_saved_doc_string, so we save two strings. */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2156 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2157 char *temp = saved_doc_string;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2158 int temp_size = saved_doc_string_size;
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
2159 file_offset temp_pos = saved_doc_string_position;
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2160 int temp_len = saved_doc_string_length;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2161
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2162 saved_doc_string = prev_saved_doc_string;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2163 saved_doc_string_size = prev_saved_doc_string_size;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2164 saved_doc_string_position = prev_saved_doc_string_position;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2165 saved_doc_string_length = prev_saved_doc_string_length;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2166
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2167 prev_saved_doc_string = temp;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2168 prev_saved_doc_string_size = temp_size;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2169 prev_saved_doc_string_position = temp_pos;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2170 prev_saved_doc_string_length = temp_len;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2171 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2172
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2173 if (saved_doc_string_size == 0)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2174 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2175 saved_doc_string_size = nskip + 100;
14130
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
2176 saved_doc_string = (char *) xmalloc (saved_doc_string_size);
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2177 }
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2178 if (nskip > saved_doc_string_size)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2179 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2180 saved_doc_string_size = nskip + 100;
14130
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
2181 saved_doc_string = (char *) xrealloc (saved_doc_string,
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
2182 saved_doc_string_size);
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2183 }
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2184
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
2185 saved_doc_string_position = file_tell (instream);
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2186
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2187 /* Copy that many characters into saved_doc_string. */
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2188 for (i = 0; i < nskip && c >= 0; i++)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2189 saved_doc_string[i] = c = READCHAR;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2190
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2191 saved_doc_string_length = i;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2192 }
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2193 else
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2194 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2195 /* Skip that many characters. */
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2196 for (i = 0; i < nskip && c >= 0; i++)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2197 c = READCHAR;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2198 }
20048
5324d8b2322b (read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents: 20024
diff changeset
2199
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2200 goto retry;
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2201 }
47184
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2202 if (c == '!')
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2203 {
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2204 /* #! appears at the beginning of an executable file.
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2205 Skip the first line. */
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2206 while (c != '\n' && c >= 0)
47184
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2207 c = READCHAR;
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2208 goto retry;
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2209 }
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2210 if (c == '$')
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2211 return Vload_file_name;
13235
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
2212 if (c == '\'')
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
2213 return Fcons (Qfunction, Fcons (read0 (readcharfun), Qnil));
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2214 /* #:foo is the uninterned symbol named foo. */
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2215 if (c == ':')
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2216 {
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2217 uninterned_symbol = 1;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2218 c = READCHAR;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2219 goto default_label;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2220 }
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2221 /* Reader forms that can reuse previously read objects. */
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2222 if (c >= '0' && c <= '9')
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2223 {
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2224 int n = 0;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2225 Lisp_Object tem;
13235
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
2226
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2227 /* Read a non-negative integer. */
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2228 while (c >= '0' && c <= '9')
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2229 {
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2230 n *= 10;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2231 n += c - '0';
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2232 c = READCHAR;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2233 }
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2234 /* #n=object returns object, but associates it with n for #n#. */
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2235 if (c == '=')
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2236 {
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2237 /* Make a placeholder for #n# to use temporarily */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2238 Lisp_Object placeholder;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2239 Lisp_Object cell;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2240
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2241 placeholder = Fcons(Qnil, Qnil);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2242 cell = Fcons (make_number (n), placeholder);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2243 read_objects = Fcons (cell, read_objects);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2244
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2245 /* Read the object itself. */
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2246 tem = read0 (readcharfun);
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2247
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2248 /* Now put it everywhere the placeholder was... */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2249 substitute_object_in_subtree (tem, placeholder);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2250
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2251 /* ...and #n# will use the real value from now on. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2252 Fsetcdr (cell, tem);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2253
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2254 return tem;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2255 }
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2256 /* #n# returns a previously read object. */
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2257 if (c == '#')
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2258 {
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2259 tem = Fassq (make_number (n), read_objects);
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2260 if (CONSP (tem))
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2261 return XCDR (tem);
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2262 /* Fall through to error message. */
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2263 }
28165
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2264 else if (c == 'r' || c == 'R')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2265 return read_integer (readcharfun, n);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2266
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2267 /* Fall through to error message. */
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2268 }
28165
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2269 else if (c == 'x' || c == 'X')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2270 return read_integer (readcharfun, 16);
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2271 else if (c == 'o' || c == 'O')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2272 return read_integer (readcharfun, 8);
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2273 else if (c == 'b' || c == 'B')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2274 return read_integer (readcharfun, 2);
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2275
373
7c6f74ef31a3 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 364
diff changeset
2276 UNREAD (c);
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2277 Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#", 1), Qnil));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2278
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2279 case ';':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2280 while ((c = READCHAR) >= 0 && c != '\n');
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2281 goto retry;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2282
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2283 case '\'':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2284 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2285 return Fcons (Qquote, Fcons (read0 (readcharfun), Qnil));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2286 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2287
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2288 case '`':
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2289 if (first_in_list)
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2290 goto default_label;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2291 else
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2292 {
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2293 Lisp_Object value;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2294
40784
d57f74c55909 (read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40690
diff changeset
2295 new_backquote_flag++;
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2296 value = read0 (readcharfun);
40784
d57f74c55909 (read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40690
diff changeset
2297 new_backquote_flag--;
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2298
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2299 return Fcons (Qbackquote, Fcons (value, Qnil));
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2300 }
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2301
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2302 case ',':
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2303 if (new_backquote_flag)
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2304 {
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2305 Lisp_Object comma_type = Qnil;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2306 Lisp_Object value;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2307 int ch = READCHAR;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2308
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2309 if (ch == '@')
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2310 comma_type = Qcomma_at;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2311 else if (ch == '.')
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2312 comma_type = Qcomma_dot;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2313 else
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2314 {
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2315 if (ch >= 0) UNREAD (ch);
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2316 comma_type = Qcomma;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2317 }
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2318
40784
d57f74c55909 (read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40690
diff changeset
2319 new_backquote_flag--;
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2320 value = read0 (readcharfun);
40784
d57f74c55909 (read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40690
diff changeset
2321 new_backquote_flag++;
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2322 return Fcons (comma_type, Fcons (value, Qnil));
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2323 }
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2324 else
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2325 goto default_label;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2326
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2327 case '?':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2328 {
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2329 int discard;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2330 int next_char;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2331 int ok;
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2332
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2333 c = READCHAR;
28733
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
2334 if (c < 0)
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
2335 end_of_file_error ();
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2336
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2337 /* Accept `single space' syntax like (list ? x) where the
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2338 whitespace character is SPC or TAB.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2339 Other literal whitespace like NL, CR, and FF are not accepted,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2340 as there are well-established escape sequences for these. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2341 if (c == ' ' || c == '\t')
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2342 return make_number (c);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2343
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2344 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2345 c = read_escape (readcharfun, 0, &discard);
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
2346 else if (BASE_LEADING_CODE_P (c))
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
2347 c = read_multibyte (c, readcharfun);
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2348
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2349 next_char = READCHAR;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2350 if (next_char == '.')
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2351 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2352 /* Only a dotted-pair dot is valid after a char constant. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2353 int next_next_char = READCHAR;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2354 UNREAD (next_next_char);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2355
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2356 ok = (next_next_char <= 040
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2357 || (next_next_char < 0200
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2358 && (index ("\"';([#?", next_next_char)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2359 || (!first_in_list && next_next_char == '`')
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2360 || (new_backquote_flag && next_next_char == ','))));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2361 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2362 else
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2363 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2364 ok = (next_char <= 040
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2365 || (next_char < 0200
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2366 && (index ("\"';()[]#?", next_char)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2367 || (!first_in_list && next_char == '`')
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2368 || (new_backquote_flag && next_char == ','))));
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2369 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2370 UNREAD (next_char);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2371 if (!ok)
49765
ef3e82270e93 (read_escape): Interpret \s as a SPACE character, except
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
2372 Fsignal (Qinvalid_read_syntax, Fcons (make_string ("?", 1), Qnil));
ef3e82270e93 (read_escape): Interpret \s as a SPACE character, except
Kim F. Storm <storm@cua.dk>
parents: 49600
diff changeset
2373
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2374 return make_number (c);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2375 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2376
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
2377 case '"':
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2378 {
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2379 char *p = read_buffer;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2380 char *end = read_buffer + read_buffer_size;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2381 register int c;
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2382 /* 1 if we saw an escape sequence specifying
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2383 a multibyte character, or a multibyte character. */
20669
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
2384 int force_multibyte = 0;
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2385 /* 1 if we saw an escape sequence specifying
20669
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
2386 a single-byte character. */
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
2387 int force_singlebyte = 0;
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2388 /* 1 if read_buffer contains multibyte text now. */
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2389 int is_multibyte = 0;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2390 int cancel = 0;
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2391 int nchars = 0;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2392
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2393 while ((c = READCHAR) >= 0
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2394 && c != '\"')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2395 {
26866
305531847450 (readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26755
diff changeset
2396 if (end - p < MAX_MULTIBYTE_LENGTH)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2397 {
34362
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2398 int offset = p - read_buffer;
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2399 read_buffer = (char *) xrealloc (read_buffer,
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2400 read_buffer_size *= 2);
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2401 p = read_buffer + offset;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2402 end = read_buffer + read_buffer_size;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2403 }
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2404
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2405 if (c == '\\')
19240
c962562027d4 (read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents: 19115
diff changeset
2406 {
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2407 int byterep;
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2408
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2409 c = read_escape (readcharfun, 1, &byterep);
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2410
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2411 /* C is -1 if \ newline has just been seen */
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2412 if (c == -1)
19240
c962562027d4 (read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents: 19115
diff changeset
2413 {
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2414 if (p == read_buffer)
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2415 cancel = 1;
19240
c962562027d4 (read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents: 19115
diff changeset
2416 continue;
c962562027d4 (read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents: 19115
diff changeset
2417 }
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2418
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2419 if (byterep == 1)
20669
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
2420 force_singlebyte = 1;
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2421 else if (byterep == 2)
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2422 force_multibyte = 1;
19240
c962562027d4 (read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents: 19115
diff changeset
2423 }
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2424
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2425 /* A character that must be multibyte forces multibyte. */
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2426 if (! SINGLE_BYTE_CHAR_P (c & ~CHAR_MODIFIER_MASK))
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2427 force_multibyte = 1;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2428
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2429 /* If we just discovered the need to be multibyte,
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2430 convert the text accumulated thus far. */
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2431 if (force_multibyte && ! is_multibyte)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2432 {
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2433 is_multibyte = 1;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2434 to_multibyte (&p, &end, &nchars);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2435 }
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2436
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2437 /* Allow `\C- ' and `\C-?'. */
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2438 if (c == (CHAR_CTL | ' '))
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2439 c = 0;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2440 else if (c == (CHAR_CTL | '?'))
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2441 c = 127;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2442
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2443 if (c & CHAR_SHIFT)
6470
651b49e52c9e (read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents: 6392
diff changeset
2444 {
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2445 /* Shift modifier is valid only with [A-Za-z]. */
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2446 if ((c & 0377) >= 'A' && (c & 0377) <= 'Z')
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2447 c &= ~CHAR_SHIFT;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2448 else if ((c & 0377) >= 'a' && (c & 0377) <= 'z')
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2449 c = (c & ~CHAR_SHIFT) - ('a' - 'A');
6470
651b49e52c9e (read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents: 6392
diff changeset
2450 }
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2451
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2452 if (c & CHAR_META)
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2453 /* Move the meta bit to the right place for a string. */
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2454 c = (c & ~CHAR_META) | 0x80;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2455 if (c & CHAR_MODIFIER_MASK)
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2456 error ("Invalid modifier in string");
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2457
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2458 if (is_multibyte)
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2459 p += CHAR_STRING (c, p);
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2460 else
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2461 *p++ = c;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2462
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2463 nchars++;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2464 }
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2465
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2466 if (c < 0)
28733
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
2467 end_of_file_error ();
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2468
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2469 /* If purifying, and string starts with \ newline,
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2470 return zero instead. This is for doc strings
604
63a8e7b3c547 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
2471 that we are really going to find in etc/DOC.nn.nn */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
2472 if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2473 return make_number (0);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2474
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2475 if (is_multibyte || force_singlebyte)
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2476 ;
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2477 else if (load_convert_to_unibyte)
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2478 {
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2479 Lisp_Object string;
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2480 to_multibyte (&p, &end, &nchars);
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2481 if (p - read_buffer != nchars)
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2482 {
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2483 string = make_multibyte_string (read_buffer, nchars,
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2484 p - read_buffer);
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2485 return Fstring_make_unibyte (string);
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2486 }
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2487 /* We can make a unibyte string directly. */
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2488 is_multibyte = 0;
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2489 }
22889
beddbcd21407 (read1): In reading a string, treat Qlambda like Qget_file_char.
Richard M. Stallman <rms@gnu.org>
parents: 22691
diff changeset
2490 else if (EQ (readcharfun, Qget_file_char)
beddbcd21407 (read1): In reading a string, treat Qlambda like Qget_file_char.
Richard M. Stallman <rms@gnu.org>
parents: 22691
diff changeset
2491 || EQ (readcharfun, Qlambda))
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2492 {
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2493 /* Nowadays, reading directly from a file is used only for
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2494 compiled Emacs Lisp files, and those always use the
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2495 Emacs internal encoding. Meanwhile, Qlambda is used
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2496 for reading dynamic byte code (compiled with
43669
4bd6b6b21deb (read1): When reading from a file, default string to
Richard M. Stallman <rms@gnu.org>
parents: 43080
diff changeset
2497 byte-compile-dynamic = t). So make the string multibyte
4bd6b6b21deb (read1): When reading from a file, default string to
Richard M. Stallman <rms@gnu.org>
parents: 43080
diff changeset
2498 if the string contains any multibyte sequences.
4bd6b6b21deb (read1): When reading from a file, default string to
Richard M. Stallman <rms@gnu.org>
parents: 43080
diff changeset
2499 (to_multibyte is a no-op if not.) */
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2500 to_multibyte (&p, &end, &nchars);
43669
4bd6b6b21deb (read1): When reading from a file, default string to
Richard M. Stallman <rms@gnu.org>
parents: 43080
diff changeset
2501 is_multibyte = (p - read_buffer) != nchars;
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2502 }
20669
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
2503 else
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2504 /* In all other cases, if we read these bytes as
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2505 separate characters, treat them as separate characters now. */
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2506 ;
20669
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
2507
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2508 /* We want readchar_count to be the number of characters, not
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2509 bytes. Hence we adjust for multibyte characters in the
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2510 string. ... But it doesn't seem to be necessary, because
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2511 READCHAR *does* read multibyte characters from buffers. */
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2512 /* readchar_count -= (p - read_buffer) - nchars; */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2513 if (read_pure)
21251
05fbf4f5b14f (read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
2514 return make_pure_string (read_buffer, nchars, p - read_buffer,
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2515 is_multibyte);
21251
05fbf4f5b14f (read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
2516 return make_specified_string (read_buffer, nchars, p - read_buffer,
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2517 is_multibyte);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2518 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2519
762
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2520 case '.':
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2521 {
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2522 int next_char = READCHAR;
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2523 UNREAD (next_char);
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2524
28746
42f2ded9d9db (read1): Don't treat period followed by certain
Gerd Moellmann <gerd@gnu.org>
parents: 28733
diff changeset
2525 if (next_char <= 040
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2526 || (next_char < 0200
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2527 && (index ("\"';([#?", next_char)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2528 || (!first_in_list && next_char == '`')
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2529 || (new_backquote_flag && next_char == ','))))
762
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2530 {
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2531 *pch = c;
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2532 return Qnil;
762
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2533 }
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2534
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2535 /* Otherwise, we fall through! Note that the atom-reading loop
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2536 below will now loop at least once, assuring that we will not
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2537 try to UNREAD two characters in a row. */
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2538 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2539 default:
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2540 default_label:
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2541 if (c <= 040) goto retry;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2542 {
31315
08bb5394dee1 (read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents: 31307
diff changeset
2543 char *p = read_buffer;
5017
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2544 int quoted = 0;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2545
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2546 {
31315
08bb5394dee1 (read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents: 31307
diff changeset
2547 char *end = read_buffer + read_buffer_size;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2548
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2549 while (c > 040
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2550 && (c >= 0200
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2551 || (!index ("\"';()[]#", c)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2552 && !(!first_in_list && c == '`')
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2553 && !(new_backquote_flag && c == ','))))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2554 {
26866
305531847450 (readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26755
diff changeset
2555 if (end - p < MAX_MULTIBYTE_LENGTH)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2556 {
34362
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2557 int offset = p - read_buffer;
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2558 read_buffer = (char *) xrealloc (read_buffer,
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2559 read_buffer_size *= 2);
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2560 p = read_buffer + offset;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2561 end = read_buffer + read_buffer_size;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2562 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2563
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2564 if (c == '\\')
5017
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2565 {
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2566 c = READCHAR;
34604
e2ad3c71947b (read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents: 34428
diff changeset
2567 if (c == -1)
e2ad3c71947b (read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents: 34428
diff changeset
2568 end_of_file_error ();
5017
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2569 quoted = 1;
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2570 }
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2571
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2572 if (! SINGLE_BYTE_CHAR_P (c))
26866
305531847450 (readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26755
diff changeset
2573 p += CHAR_STRING (c, p);
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2574 else
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2575 *p++ = c;
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2576
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2577 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2578 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2579
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2580 if (p == end)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2581 {
34362
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2582 int offset = p - read_buffer;
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2583 read_buffer = (char *) xrealloc (read_buffer,
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2584 read_buffer_size *= 2);
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2585 p = read_buffer + offset;
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2586 end = read_buffer + read_buffer_size;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2587 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2588 *p = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2589 if (c >= 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2590 UNREAD (c);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2591 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2592
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2593 if (!quoted && !uninterned_symbol)
5017
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2594 {
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2595 register char *p1;
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2596 register Lisp_Object val;
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2597 p1 = read_buffer;
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2598 if (*p1 == '+' || *p1 == '-') p1++;
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2599 /* Is it an integer? */
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2600 if (p1 != p)
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2601 {
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2602 while (p1 != p && (c = *p1) >= '0' && c <= '9') p1++;
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2603 /* Integers can have trailing decimal points. */
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2604 if (p1 > read_buffer && p1 < p && *p1 == '.') p1++;
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2605 if (p1 == p)
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2606 /* It is an integer. */
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2607 {
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2608 if (p1[-1] == '.')
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2609 p1[-1] = '\0';
11699
eb4b842ee557 (read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents: 11683
diff changeset
2610 if (sizeof (int) == sizeof (EMACS_INT))
eb4b842ee557 (read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents: 11683
diff changeset
2611 XSETINT (val, atoi (read_buffer));
eb4b842ee557 (read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents: 11683
diff changeset
2612 else if (sizeof (long) == sizeof (EMACS_INT))
eb4b842ee557 (read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents: 11683
diff changeset
2613 XSETINT (val, atol (read_buffer));
eb4b842ee557 (read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents: 11683
diff changeset
2614 else
eb4b842ee557 (read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents: 11683
diff changeset
2615 abort ();
5017
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2616 return val;
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2617 }
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2618 }
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2619 if (isfloat_string (read_buffer))
20815
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2620 {
23159
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2621 /* Compute NaN and infinities using 0.0 in a variable,
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2622 to cope with compilers that think they are smarter
23193
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
2623 than we are. */
21636
10d8ced94467 (read1): Compute NaN and infinities using 0.0 in a
Richard M. Stallman <rms@gnu.org>
parents: 21635
diff changeset
2624 double zero = 0.0;
23159
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2625
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2626 double value;
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2627
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2628 /* Negate the value ourselves. This treats 0, NaNs,
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2629 and infinity properly on IEEE floating point hosts,
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2630 and works around a common bug where atof ("-0.0")
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2631 drops the sign. */
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2632 int negative = read_buffer[0] == '-';
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2633
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2634 /* The only way p[-1] can be 'F' or 'N', after isfloat_string
20815
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2635 returns 1, is if the input ends in e+INF or e+NaN. */
23159
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2636 switch (p[-1])
20815
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2637 {
23159
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2638 case 'F':
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2639 value = 1.0 / zero;
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2640 break;
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2641 case 'N':
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2642 value = zero / zero;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2643
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2644 /* If that made a "negative" NaN, negate it. */
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2645
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2646 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2647 int i;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2648 union { double d; char c[sizeof (double)]; } u_data, u_minus_zero;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2649
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2650 u_data.d = value;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2651 u_minus_zero.d = - 0.0;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2652 for (i = 0; i < sizeof (double); i++)
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2653 if (u_data.c[i] & u_minus_zero.c[i])
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2654 {
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2655 value = - value;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2656 break;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2657 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2658 }
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2659 /* Now VALUE is a positive NaN. */
23159
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2660 break;
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2661 default:
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2662 value = atof (read_buffer + negative);
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2663 break;
20815
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2664 }
23159
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2665
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2666 return make_float (negative ? - value : value);
20815
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2667 }
5017
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2668 }
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2669 {
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2670 Lisp_Object result = uninterned_symbol ? make_symbol (read_buffer)
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2671 : intern (read_buffer);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2672 if (EQ (Vread_with_symbol_positions, Qt)
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2673 || EQ (Vread_with_symbol_positions, readcharfun))
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2674 Vread_symbol_positions_list =
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2675 /* Kind of a hack; this will probably fail if characters
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2676 in the symbol name were escaped. Not really a big
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2677 deal, though. */
45747
2049fa380cb1 (read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45577
diff changeset
2678 Fcons (Fcons (result,
2049fa380cb1 (read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45577
diff changeset
2679 make_number (readchar_count
2049fa380cb1 (read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45577
diff changeset
2680 - XFASTINT (Flength (Fsymbol_name (result))))),
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2681 Vread_symbol_positions_list);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2682 return result;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2683 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2684 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2685 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2686 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2687
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2688
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2689 /* List of nodes we've seen during substitute_object_in_subtree. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2690 static Lisp_Object seen_list;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2691
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2692 static void
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2693 substitute_object_in_subtree (object, placeholder)
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2694 Lisp_Object object;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2695 Lisp_Object placeholder;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2696 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2697 Lisp_Object check_object;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2698
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2699 /* We haven't seen any objects when we start. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2700 seen_list = Qnil;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2701
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2702 /* Make all the substitutions. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2703 check_object
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2704 = substitute_object_recurse (object, placeholder, object);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2705
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2706 /* Clear seen_list because we're done with it. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2707 seen_list = Qnil;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2708
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2709 /* The returned object here is expected to always eq the
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2710 original. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2711 if (!EQ (check_object, object))
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2712 error ("Unexpected mutation error in reader");
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2713 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2714
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2715 /* Feval doesn't get called from here, so no gc protection is needed. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2716 #define SUBSTITUTE(get_val, set_val) \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2717 { \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2718 Lisp_Object old_value = get_val; \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2719 Lisp_Object true_value \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2720 = substitute_object_recurse (object, placeholder,\
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2721 old_value); \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2722 \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2723 if (!EQ (old_value, true_value)) \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2724 { \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2725 set_val; \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2726 } \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2727 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2728
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2729 static Lisp_Object
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2730 substitute_object_recurse (object, placeholder, subtree)
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2731 Lisp_Object object;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2732 Lisp_Object placeholder;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2733 Lisp_Object subtree;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2734 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2735 /* If we find the placeholder, return the target object. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2736 if (EQ (placeholder, subtree))
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2737 return object;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2738
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2739 /* If we've been to this node before, don't explore it again. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2740 if (!EQ (Qnil, Fmemq (subtree, seen_list)))
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2741 return subtree;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2742
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2743 /* If this node can be the entry point to a cycle, remember that
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2744 we've seen it. It can only be such an entry point if it was made
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2745 by #n=, which means that we can find it as a value in
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2746 read_objects. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2747 if (!EQ (Qnil, Frassq (subtree, read_objects)))
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2748 seen_list = Fcons (subtree, seen_list);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2749
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2750 /* Recurse according to subtree's type.
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2751 Every branch must return a Lisp_Object. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2752 switch (XTYPE (subtree))
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2753 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2754 case Lisp_Vectorlike:
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2755 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2756 int i;
28507
b6f06a755c7d make_number/XINT/XUINT conversions; EQ/== fixes; ==Qnil -> NILP
Ken Raeburn <raeburn@raeburn.org>
parents: 28388
diff changeset
2757 int length = XINT (Flength(subtree));
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2758 for (i = 0; i < length; i++)
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2759 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2760 Lisp_Object idx = make_number (i);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2761 SUBSTITUTE (Faref (subtree, idx),
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2762 Faset (subtree, idx, true_value));
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2763 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2764 return subtree;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2765 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2766
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2767 case Lisp_Cons:
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2768 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2769 SUBSTITUTE (Fcar_safe (subtree),
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
2770 Fsetcar (subtree, true_value));
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2771 SUBSTITUTE (Fcdr_safe (subtree),
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
2772 Fsetcdr (subtree, true_value));
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2773 return subtree;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2774 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2775
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2776 case Lisp_String:
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2777 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2778 /* Check for text properties in each interval.
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
2779 substitute_in_interval contains part of the logic. */
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2780
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2781 INTERVAL root_interval = STRING_INTERVALS (subtree);
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2782 Lisp_Object arg = Fcons (object, placeholder);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2783
39857
6235c0f8e52c (substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39816
diff changeset
2784 traverse_intervals_noorder (root_interval,
6235c0f8e52c (substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39816
diff changeset
2785 &substitute_in_interval, arg);
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2786
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2787 return subtree;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2788 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2789
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2790 /* Other types don't recurse any further. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2791 default:
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2792 return subtree;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2793 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2794 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2795
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2796 /* Helper function for substitute_object_recurse. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2797 static void
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2798 substitute_in_interval (interval, arg)
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2799 INTERVAL interval;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2800 Lisp_Object arg;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2801 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2802 Lisp_Object object = Fcar (arg);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2803 Lisp_Object placeholder = Fcdr (arg);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2804
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2805 SUBSTITUTE(interval->plist, interval->plist = true_value);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2806 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2807
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2808
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2809 #define LEAD_INT 1
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2810 #define DOT_CHAR 2
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2811 #define TRAIL_INT 4
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2812 #define E_CHAR 8
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2813 #define EXP_INT 16
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2814
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2815 int
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2816 isfloat_string (cp)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2817 register char *cp;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2818 {
21799
7a44b61e263b Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21797
diff changeset
2819 register int state;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2820
21911
8087931b409e (isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents: 21799
diff changeset
2821 char *start = cp;
8087931b409e (isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents: 21799
diff changeset
2822
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2823 state = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2824 if (*cp == '+' || *cp == '-')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2825 cp++;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2826
9871
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2827 if (*cp >= '0' && *cp <= '9')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2828 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2829 state |= LEAD_INT;
9871
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2830 while (*cp >= '0' && *cp <= '9')
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2831 cp++;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2832 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2833 if (*cp == '.')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2834 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2835 state |= DOT_CHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2836 cp++;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2837 }
9871
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2838 if (*cp >= '0' && *cp <= '9')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2839 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2840 state |= TRAIL_INT;
9871
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2841 while (*cp >= '0' && *cp <= '9')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2842 cp++;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2843 }
16342
b91af71f45f1 (isfloat_string): Accept E like e.
Richard M. Stallman <rms@gnu.org>
parents: 16228
diff changeset
2844 if (*cp == 'e' || *cp == 'E')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2845 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2846 state |= E_CHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2847 cp++;
11735
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
2848 if (*cp == '+' || *cp == '-')
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
2849 cp++;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2850 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2851
9871
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2852 if (*cp >= '0' && *cp <= '9')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2853 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2854 state |= EXP_INT;
9871
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2855 while (*cp >= '0' && *cp <= '9')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2856 cp++;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2857 }
21911
8087931b409e (isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents: 21799
diff changeset
2858 else if (cp == start)
8087931b409e (isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents: 21799
diff changeset
2859 ;
20815
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2860 else if (cp[-1] == '+' && cp[0] == 'I' && cp[1] == 'N' && cp[2] == 'F')
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2861 {
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2862 state |= EXP_INT;
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2863 cp += 3;
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2864 }
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2865 else if (cp[-1] == '+' && cp[0] == 'N' && cp[1] == 'a' && cp[2] == 'N')
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2866 {
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2867 state |= EXP_INT;
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2868 cp += 3;
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2869 }
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2870
11172
e1ca77e22c12 (isfloat_string): Permit trailing space.
Richard M. Stallman <rms@gnu.org>
parents: 11079
diff changeset
2871 return (((*cp == 0) || (*cp == ' ') || (*cp == '\t') || (*cp == '\n') || (*cp == '\r') || (*cp == '\f'))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2872 && (state == (LEAD_INT|DOT_CHAR|TRAIL_INT)
826
e9b9a1cff2c9 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 796
diff changeset
2873 || state == (DOT_CHAR|TRAIL_INT)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2874 || state == (LEAD_INT|E_CHAR|EXP_INT)
826
e9b9a1cff2c9 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 796
diff changeset
2875 || state == (LEAD_INT|DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT)
e9b9a1cff2c9 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 796
diff changeset
2876 || state == (DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT)));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2877 }
27727
9400865ec7cf Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents: 27645
diff changeset
2878
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2879
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2880 static Lisp_Object
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2881 read_vector (readcharfun, bytecodeflag)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2882 Lisp_Object readcharfun;
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2883 int bytecodeflag;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2884 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2885 register int i;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2886 register int size;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2887 register Lisp_Object *ptr;
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2888 register Lisp_Object tem, item, vector;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2889 register struct Lisp_Cons *otem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2890 Lisp_Object len;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2891
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2892 tem = read_list (1, readcharfun);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2893 len = Flength (tem);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2894 vector = (read_pure ? make_pure_vector (XINT (len)) : Fmake_vector (len, Qnil));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2895
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2896 size = XVECTOR (vector)->size;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2897 ptr = XVECTOR (vector)->contents;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2898 for (i = 0; i < size; i++)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2899 {
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2900 item = Fcar (tem);
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2901 /* If `load-force-doc-strings' is t when reading a lazily-loaded
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2902 bytecode object, the docstring containing the bytecode and
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2903 constants values must be treated as unibyte and passed to
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2904 Fread, to get the actual bytecode string and constants vector. */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2905 if (bytecodeflag && load_force_doc_strings)
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2906 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2907 if (i == COMPILED_BYTECODE)
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2908 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2909 if (!STRINGP (item))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2910 error ("Invalid byte code");
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2911
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2912 /* Delay handling the bytecode slot until we know whether
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2913 it is lazily-loaded (we can tell by whether the
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2914 constants slot is nil). */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2915 ptr[COMPILED_CONSTANTS] = item;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2916 item = Qnil;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2917 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2918 else if (i == COMPILED_CONSTANTS)
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2919 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2920 Lisp_Object bytestr = ptr[COMPILED_CONSTANTS];
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2921
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2922 if (NILP (item))
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2923 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2924 /* Coerce string to unibyte (like string-as-unibyte,
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2925 but without generating extra garbage and
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2926 guaranteeing no change in the contents). */
46375
e90f58d3450c * lread.c (read_vector): Use STRING_SET_CHARS.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
2927 STRING_SET_CHARS (bytestr, SBYTES (bytestr));
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2928 STRING_SET_UNIBYTE (bytestr);
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2929
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2930 item = Fread (bytestr);
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2931 if (!CONSP (item))
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
2932 error ("Invalid byte code");
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2933
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2934 otem = XCONS (item);
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25555
diff changeset
2935 bytestr = XCAR (item);
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25555
diff changeset
2936 item = XCDR (item);
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2937 free_cons (otem);
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2938 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2939
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2940 /* Now handle the bytecode slot. */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2941 ptr[COMPILED_BYTECODE] = read_pure ? Fpurecopy (bytestr) : bytestr;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2942 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2943 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2944 ptr[i] = read_pure ? Fpurecopy (item) : item;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2945 otem = XCONS (tem);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2946 tem = Fcdr (tem);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2947 free_cons (otem);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2948 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2949 return vector;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2950 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2951
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2952 /* FLAG = 1 means check for ] to terminate rather than ) and .
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2953 FLAG = -1 means check for starting with defun
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2954 and make structure pure. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2955
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2956 static Lisp_Object
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2957 read_list (flag, readcharfun)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2958 int flag;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2959 register Lisp_Object readcharfun;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2960 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2961 /* -1 means check next element for defun,
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2962 0 means don't check,
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2963 1 means already checked and found defun. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2964 int defunflag = flag < 0 ? -1 : 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2965 Lisp_Object val, tail;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2966 register Lisp_Object elt, tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2967 struct gcpro gcpro1, gcpro2;
12639
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2968 /* 0 is the normal case.
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2969 1 means this list is a doc reference; replace it with the number 0.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
2970 2 means this list is a doc reference; replace it with the doc string. */
12639
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2971 int doc_reference = 0;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2972
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2973 /* Initialize this to 1 if we are reading a list. */
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2974 int first_in_list = flag <= 0;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2975
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2976 val = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2977 tail = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2978
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2979 while (1)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2980 {
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
2981 int ch;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2982 GCPRO2 (val, tail);
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2983 elt = read1 (readcharfun, &ch, first_in_list);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2984 UNGCPRO;
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2985
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2986 first_in_list = 0;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2987
12639
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2988 /* While building, if the list starts with #$, treat it specially. */
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2989 if (EQ (elt, Vload_file_name)
20048
5324d8b2322b (read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents: 20024
diff changeset
2990 && ! NILP (elt)
12639
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2991 && !NILP (Vpurify_flag))
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2992 {
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2993 if (NILP (Vdoc_file_name))
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2994 /* We have not yet called Snarf-documentation, so assume
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2995 this file is described in the DOC-MM.NN file
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2996 and Snarf-documentation will fill in the right value later.
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2997 For now, replace the whole list with 0. */
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2998 doc_reference = 1;
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2999 else
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3000 /* We have already called Snarf-documentation, so make a relative
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3001 file name for this file, so it can be found properly
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3002 in the installed Lisp directory.
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3003 We don't use Fexpand_file_name because that would make
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3004 the directory absolute now. */
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3005 elt = concat2 (build_string ("../lisp/"),
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3006 Ffile_name_nondirectory (elt));
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3007 }
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3008 else if (EQ (elt, Vload_file_name)
20048
5324d8b2322b (read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents: 20024
diff changeset
3009 && ! NILP (elt)
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3010 && load_force_doc_strings)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3011 doc_reference = 2;
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
3012
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
3013 if (ch)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3014 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3015 if (flag > 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3016 {
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
3017 if (ch == ']')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3018 return val;
12639
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3019 Fsignal (Qinvalid_read_syntax,
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3020 Fcons (make_string (") or . in a vector", 18), Qnil));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3021 }
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
3022 if (ch == ')')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3023 return val;
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
3024 if (ch == '.')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3025 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3026 GCPRO2 (val, tail);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
3027 if (!NILP (tail))
40690
ba7239b8872e (Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents: 40656
diff changeset
3028 XSETCDR (tail, read0 (readcharfun));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3029 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3030 val = read0 (readcharfun);
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
3031 read1 (readcharfun, &ch, 0);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3032 UNGCPRO;
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
3033 if (ch == ')')
12639
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3034 {
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3035 if (doc_reference == 1)
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3036 return make_number (0);
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3037 if (doc_reference == 2)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3038 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3039 /* Get a doc string from the file we are loading.
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3040 If it's in saved_doc_string, get it from there. */
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25555
diff changeset
3041 int pos = XINT (XCDR (val));
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3042 /* Position is negative for user variables. */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3043 if (pos < 0) pos = -pos;
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3044 if (pos >= saved_doc_string_position
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3045 && pos < (saved_doc_string_position
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3046 + saved_doc_string_length))
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3047 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3048 int start = pos - saved_doc_string_position;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3049 int from, to;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3050
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3051 /* Process quoting with ^A,
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3052 and find the end of the string,
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3053 which is marked with ^_ (037). */
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3054 for (from = start, to = start;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3055 saved_doc_string[from] != 037;)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3056 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3057 int c = saved_doc_string[from++];
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3058 if (c == 1)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3059 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3060 c = saved_doc_string[from++];
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3061 if (c == 1)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3062 saved_doc_string[to++] = c;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3063 else if (c == '0')
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3064 saved_doc_string[to++] = 0;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3065 else if (c == '_')
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3066 saved_doc_string[to++] = 037;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3067 }
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3068 else
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3069 saved_doc_string[to++] = c;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3070 }
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3071
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3072 return make_string (saved_doc_string + start,
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3073 to - start);
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3074 }
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3075 /* Look in prev_saved_doc_string the same way. */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3076 else if (pos >= prev_saved_doc_string_position
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3077 && pos < (prev_saved_doc_string_position
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3078 + prev_saved_doc_string_length))
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3079 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3080 int start = pos - prev_saved_doc_string_position;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3081 int from, to;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3082
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3083 /* Process quoting with ^A,
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3084 and find the end of the string,
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3085 which is marked with ^_ (037). */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3086 for (from = start, to = start;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3087 prev_saved_doc_string[from] != 037;)
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3088 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3089 int c = prev_saved_doc_string[from++];
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3090 if (c == 1)
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3091 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3092 c = prev_saved_doc_string[from++];
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3093 if (c == 1)
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3094 prev_saved_doc_string[to++] = c;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3095 else if (c == '0')
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3096 prev_saved_doc_string[to++] = 0;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3097 else if (c == '_')
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3098 prev_saved_doc_string[to++] = 037;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3099 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3100 else
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3101 prev_saved_doc_string[to++] = c;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3102 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3103
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3104 return make_string (prev_saved_doc_string + start,
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3105 to - start);
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
3106 }
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3107 else
22603
329fe9a2bdb8 (read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents: 22420
diff changeset
3108 return get_doc_string (val, 0, 0);
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3109 }
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3110
12639
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3111 return val;
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
3112 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3113 return Fsignal (Qinvalid_read_syntax, Fcons (make_string (". in wrong context", 18), Qnil));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3114 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3115 return Fsignal (Qinvalid_read_syntax, Fcons (make_string ("] in a list", 11), Qnil));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3116 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3117 tem = (read_pure && flag <= 0
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3118 ? pure_cons (elt, Qnil)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3119 : Fcons (elt, Qnil));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
3120 if (!NILP (tail))
40690
ba7239b8872e (Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents: 40656
diff changeset
3121 XSETCDR (tail, tem);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3122 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3123 val = tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3124 tail = tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3125 if (defunflag < 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3126 defunflag = EQ (elt, Qdefun);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3127 else if (defunflag > 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3128 read_pure = 1;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3129 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3130 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3131
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3132 Lisp_Object Vobarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3133 Lisp_Object initial_obarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3134
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3135 /* oblookup stores the bucket number here, for the sake of Funintern. */
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3136
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3137 int oblookup_last_bucket_number;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3138
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3139 static int hash_string ();
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3140
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3141 /* Get an error if OBARRAY is not an obarray.
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3142 If it is one, return it. */
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3143
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3144 Lisp_Object
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3145 check_obarray (obarray)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3146 Lisp_Object obarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3147 {
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
3148 while (!VECTORP (obarray) || XVECTOR (obarray)->size == 0)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3149 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3150 /* If Vobarray is now invalid, force it to be valid. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3151 if (EQ (Vobarray, obarray)) Vobarray = initial_obarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3152
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3153 obarray = wrong_type_argument (Qvectorp, obarray);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3154 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3155 return obarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3156 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3157
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3158 /* Intern the C string STR: return a symbol with that name,
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3159 interned in the current obarray. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3160
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3161 Lisp_Object
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3162 intern (str)
46472
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
3163 const char *str;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3164 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3165 Lisp_Object tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3166 int len = strlen (str);
6503
7c566d0e4b3d (read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6471
diff changeset
3167 Lisp_Object obarray;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3168
6503
7c566d0e4b3d (read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6471
diff changeset
3169 obarray = Vobarray;
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
3170 if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3171 obarray = check_obarray (obarray);
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
3172 tem = oblookup (obarray, str, len, len);
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
3173 if (SYMBOLP (tem))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3174 return tem;
18051
b985b9739beb (intern): Don't make a pure string here, since Fintern does that.
Richard M. Stallman <rms@gnu.org>
parents: 17918
diff changeset
3175 return Fintern (make_string (str, len), obarray);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3176 }
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3177
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3178 /* Create an uninterned symbol with name STR. */
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3179
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3180 Lisp_Object
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3181 make_symbol (str)
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3182 char *str;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3183 {
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3184 int len = strlen (str);
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3185
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3186 return Fmake_symbol ((!NILP (Vpurify_flag)
21251
05fbf4f5b14f (read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
3187 ? make_pure_string (str, len, len, 0)
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3188 : make_string (str, len)));
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3189 }
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3190
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3191 DEFUN ("intern", Fintern, Sintern, 1, 2, 0,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3192 doc: /* Return the canonical symbol whose name is STRING.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3193 If there is none, one is created by this function and returned.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3194 A second optional argument specifies the obarray to use;
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3195 it defaults to the value of `obarray'. */)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3196 (string, obarray)
14092
279f5f3528a8 (Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 14036
diff changeset
3197 Lisp_Object string, obarray;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3198 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3199 register Lisp_Object tem, sym, *ptr;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3200
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
3201 if (NILP (obarray)) obarray = Vobarray;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3202 obarray = check_obarray (obarray);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3203
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40558
diff changeset
3204 CHECK_STRING (string);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3205
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3206 tem = oblookup (obarray, SDATA (string),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3207 SCHARS (string),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3208 SBYTES (string));
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
3209 if (!INTEGERP (tem))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3210 return tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3211
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
3212 if (!NILP (Vpurify_flag))
14092
279f5f3528a8 (Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 14036
diff changeset
3213 string = Fpurecopy (string);
279f5f3528a8 (Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 14036
diff changeset
3214 sym = Fmake_symbol (string);
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3215
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3216 if (EQ (obarray, initial_obarray))
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3217 XSYMBOL (sym)->interned = SYMBOL_INTERNED_IN_INITIAL_OBARRAY;
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3218 else
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3219 XSYMBOL (sym)->interned = SYMBOL_INTERNED;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3220
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3221 if ((SREF (string, 0) == ':')
21982
456f95c03285 (Fintern): Properly compare lisp objects.
Richard M. Stallman <rms@gnu.org>
parents: 21936
diff changeset
3222 && EQ (obarray, initial_obarray))
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3223 {
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3224 XSYMBOL (sym)->constant = 1;
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3225 XSYMBOL (sym)->value = sym;
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3226 }
17918
72aec83491a2 (Fintern): Give keywords a value when interned.
Richard M. Stallman <rms@gnu.org>
parents: 17605
diff changeset
3227
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3228 ptr = &XVECTOR (obarray)->contents[XINT (tem)];
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
3229 if (SYMBOLP (*ptr))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3230 XSYMBOL (sym)->next = XSYMBOL (*ptr);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3231 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3232 XSYMBOL (sym)->next = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3233 *ptr = sym;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3234 return sym;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3235 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3236
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3237 DEFUN ("intern-soft", Fintern_soft, Sintern_soft, 1, 2, 0,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3238 doc: /* Return the canonical symbol named NAME, or nil if none exists.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3239 NAME may be a string or a symbol. If it is a symbol, that exact
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3240 symbol is searched for.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3241 A second optional argument specifies the obarray to use;
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3242 it defaults to the value of `obarray'. */)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3243 (name, obarray)
26735
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3244 Lisp_Object name, obarray;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3245 {
46446
34f82dbd015b (Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents: 46429
diff changeset
3246 register Lisp_Object tem, string;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3247
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
3248 if (NILP (obarray)) obarray = Vobarray;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3249 obarray = check_obarray (obarray);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3250
26735
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3251 if (!SYMBOLP (name))
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3252 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40558
diff changeset
3253 CHECK_STRING (name);
46446
34f82dbd015b (Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents: 46429
diff changeset
3254 string = name;
26735
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3255 }
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3256 else
46446
34f82dbd015b (Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents: 46429
diff changeset
3257 string = SYMBOL_NAME (name);
34f82dbd015b (Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents: 46429
diff changeset
3258
34f82dbd015b (Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents: 46429
diff changeset
3259 tem = oblookup (obarray, SDATA (string), SCHARS (string), SBYTES (string));
26735
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3260 if (INTEGERP (tem) || (SYMBOLP (name) && !EQ (name, tem)))
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3261 return Qnil;
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3262 else
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3263 return tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3264 }
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3265
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3266 DEFUN ("unintern", Funintern, Sunintern, 1, 2, 0,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3267 doc: /* Delete the symbol named NAME, if any, from OBARRAY.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3268 The value is t if a symbol was found and deleted, nil otherwise.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3269 NAME may be a string or a symbol. If it is a symbol, that symbol
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3270 is deleted, if it belongs to OBARRAY--no other symbol is deleted.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3271 OBARRAY defaults to the value of the variable `obarray'. */)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3272 (name, obarray)
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3273 Lisp_Object name, obarray;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3274 {
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3275 register Lisp_Object string, tem;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3276 int hash;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3277
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3278 if (NILP (obarray)) obarray = Vobarray;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3279 obarray = check_obarray (obarray);
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3280
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3281 if (SYMBOLP (name))
45406
6f19e244af49 * lread.c (Fintern_soft, oblookup): Use SYMBOL_NAME and XSTRING
Ken Raeburn <raeburn@raeburn.org>
parents: 45001
diff changeset
3282 string = SYMBOL_NAME (name);
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3283 else
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3284 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40558
diff changeset
3285 CHECK_STRING (name);
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3286 string = name;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3287 }
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3288
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3289 tem = oblookup (obarray, SDATA (string),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3290 SCHARS (string),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3291 SBYTES (string));
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3292 if (INTEGERP (tem))
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3293 return Qnil;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3294 /* If arg was a symbol, don't delete anything but that symbol itself. */
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3295 if (SYMBOLP (name) && !EQ (name, tem))
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3296 return Qnil;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3297
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3298 XSYMBOL (tem)->interned = SYMBOL_UNINTERNED;
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3299 XSYMBOL (tem)->constant = 0;
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3300 XSYMBOL (tem)->indirect_variable = 0;
20773
6c655dc99321 (Funintern): Clear the symbol's obarray field.
Richard M. Stallman <rms@gnu.org>
parents: 20706
diff changeset
3301
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3302 hash = oblookup_last_bucket_number;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3303
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3304 if (EQ (XVECTOR (obarray)->contents[hash], tem))
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3305 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3306 if (XSYMBOL (tem)->next)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3307 XSETSYMBOL (XVECTOR (obarray)->contents[hash], XSYMBOL (tem)->next);
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3308 else
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3309 XSETINT (XVECTOR (obarray)->contents[hash], 0);
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3310 }
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3311 else
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3312 {
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3313 Lisp_Object tail, following;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3314
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3315 for (tail = XVECTOR (obarray)->contents[hash];
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3316 XSYMBOL (tail)->next;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3317 tail = following)
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3318 {
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3319 XSETSYMBOL (following, XSYMBOL (tail)->next);
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3320 if (EQ (following, tem))
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3321 {
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3322 XSYMBOL (tail)->next = XSYMBOL (following)->next;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3323 break;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3324 }
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3325 }
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3326 }
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3327
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3328 return Qt;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3329 }
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3330
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3331 /* Return the symbol in OBARRAY whose names matches the string
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
3332 of SIZE characters (SIZE_BYTE bytes) at PTR.
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
3333 If there is no such symbol in OBARRAY, return nil.
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3334
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3335 Also store the bucket number in oblookup_last_bucket_number. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3336
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3337 Lisp_Object
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
3338 oblookup (obarray, ptr, size, size_byte)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3339 Lisp_Object obarray;
46472
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
3340 register const char *ptr;
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
3341 int size, size_byte;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3342 {
8828
2ff6fed642b1 (Fload): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents: 8596
diff changeset
3343 int hash;
2ff6fed642b1 (Fload): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents: 8596
diff changeset
3344 int obsize;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3345 register Lisp_Object tail;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3346 Lisp_Object bucket, tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3347
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
3348 if (!VECTORP (obarray)
5243
13cce14b5a0c Line breaking change.
Richard M. Stallman <rms@gnu.org>
parents: 5185
diff changeset
3349 || (obsize = XVECTOR (obarray)->size) == 0)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3350 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3351 obarray = check_obarray (obarray);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3352 obsize = XVECTOR (obarray)->size;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3353 }
13455
4f5a9ce67782 (oblookup): Clear ARRAY_MARK_FLAG in obsize.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
3354 /* This is sometimes needed in the middle of GC. */
4f5a9ce67782 (oblookup): Clear ARRAY_MARK_FLAG in obsize.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
3355 obsize &= ~ARRAY_MARK_FLAG;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3356 /* Combining next two lines breaks VMS C 2.3. */
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
3357 hash = hash_string (ptr, size_byte);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3358 hash %= obsize;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3359 bucket = XVECTOR (obarray)->contents[hash];
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3360 oblookup_last_bucket_number = hash;
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3361 if (EQ (bucket, make_number (0)))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3362 ;
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
3363 else if (!SYMBOLP (bucket))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3364 error ("Bad data in guts of obarray"); /* Like CADR error message */
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3365 else
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3366 for (tail = bucket; ; XSETSYMBOL (tail, XSYMBOL (tail)->next))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3367 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3368 if (SBYTES (SYMBOL_NAME (tail)) == size_byte
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3369 && SCHARS (SYMBOL_NAME (tail)) == size
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3370 && !bcmp (SDATA (SYMBOL_NAME (tail)), ptr, size_byte))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3371 return tail;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3372 else if (XSYMBOL (tail)->next == 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3373 break;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3374 }
9274
5c66d8b65a7c (Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents: 9149
diff changeset
3375 XSETINT (tem, hash);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3376 return tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3377 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3378
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3379 static int
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3380 hash_string (ptr, len)
46472
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
3381 const unsigned char *ptr;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3382 int len;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3383 {
46472
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
3384 register const unsigned char *p = ptr;
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
3385 register const unsigned char *end = p + len;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3386 register unsigned char c;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3387 register int hash = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3388
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3389 while (p != end)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3390 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3391 c = *p++;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3392 if (c >= 0140) c -= 40;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3393 hash = ((hash<<3) + (hash>>28) + c);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3394 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3395 return hash & 07777777777;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3396 }
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3397
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3398 void
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3399 map_obarray (obarray, fn, arg)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3400 Lisp_Object obarray;
20298
b7d23d2eded1 (read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents: 20168
diff changeset
3401 void (*fn) P_ ((Lisp_Object, Lisp_Object));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3402 Lisp_Object arg;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3403 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3404 register int i;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3405 register Lisp_Object tail;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40558
diff changeset
3406 CHECK_VECTOR (obarray);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3407 for (i = XVECTOR (obarray)->size - 1; i >= 0; i--)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3408 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3409 tail = XVECTOR (obarray)->contents[i];
19020
1ee295d0114a (map_obarray): Don't crash if something strange is in the obarray.
Richard M. Stallman <rms@gnu.org>
parents: 18771
diff changeset
3410 if (SYMBOLP (tail))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3411 while (1)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3412 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3413 (*fn) (tail, arg);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3414 if (XSYMBOL (tail)->next == 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3415 break;
9274
5c66d8b65a7c (Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents: 9149
diff changeset
3416 XSETSYMBOL (tail, XSYMBOL (tail)->next);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3417 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3418 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3419 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3420
20298
b7d23d2eded1 (read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents: 20168
diff changeset
3421 void
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3422 mapatoms_1 (sym, function)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3423 Lisp_Object sym, function;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3424 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3425 call1 (function, sym);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3426 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3427
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3428 DEFUN ("mapatoms", Fmapatoms, Smapatoms, 1, 2, 0,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3429 doc: /* Call FUNCTION on every symbol in OBARRAY.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3430 OBARRAY defaults to the value of `obarray'. */)
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3431 (function, obarray)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3432 Lisp_Object function, obarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3433 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
3434 if (NILP (obarray)) obarray = Vobarray;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3435 obarray = check_obarray (obarray);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3436
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3437 map_obarray (obarray, mapatoms_1, function);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3438 return Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3439 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3440
5117
951396781a0e (OBARRAY_SIZE): Increase from 509.
Richard M. Stallman <rms@gnu.org>
parents: 5017
diff changeset
3441 #define OBARRAY_SIZE 1511
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3442
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3443 void
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3444 init_obarray ()
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3445 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3446 Lisp_Object oblength;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3447 int hash;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3448 Lisp_Object *tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3449
9313
ed68c3822e4b (read_filtered_event, init_obarray): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9274
diff changeset
3450 XSETFASTINT (oblength, OBARRAY_SIZE);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3451
21251
05fbf4f5b14f (read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
3452 Qnil = Fmake_symbol (make_pure_string ("nil", 3, 3, 0));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3453 Vobarray = Fmake_vector (oblength, make_number (0));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3454 initial_obarray = Vobarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3455 staticpro (&initial_obarray);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3456 /* Intern nil in the obarray */
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3457 XSYMBOL (Qnil)->interned = SYMBOL_INTERNED_IN_INITIAL_OBARRAY;
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3458 XSYMBOL (Qnil)->constant = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
3459
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3460 /* These locals are to kludge around a pyramid compiler bug. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3461 hash = hash_string ("nil", 3);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3462 /* Separate statement here to avoid VAXC bug. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3463 hash %= OBARRAY_SIZE;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3464 tem = &XVECTOR (Vobarray)->contents[hash];
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3465 *tem = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3466
21251
05fbf4f5b14f (read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
3467 Qunbound = Fmake_symbol (make_pure_string ("unbound", 7, 7, 0));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3468 XSYMBOL (Qnil)->function = Qunbound;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3469 XSYMBOL (Qunbound)->value = Qunbound;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3470 XSYMBOL (Qunbound)->function = Qunbound;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3471
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3472 Qt = intern ("t");
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3473 XSYMBOL (Qnil)->value = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3474 XSYMBOL (Qnil)->plist = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3475 XSYMBOL (Qt)->value = Qt;
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3476 XSYMBOL (Qt)->constant = 1;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3477
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3478 /* Qt is correct even if CANNOT_DUMP. loadup.el will set to nil at end. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3479 Vpurify_flag = Qt;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3480
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3481 Qvariable_documentation = intern ("variable-documentation");
16228
fa7a56c543df (init_obarray): staticpro Qvariable_documentation.
Erik Naggum <erik@naggum.no>
parents: 16165
diff changeset
3482 staticpro (&Qvariable_documentation);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3483
26866
305531847450 (readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26755
diff changeset
3484 read_buffer_size = 100 + MAX_MULTIBYTE_LENGTH;
27852
98f55bbdbbad (Fload): Use `xfree' instead of `free'.
Gerd Moellmann <gerd@gnu.org>
parents: 27763
diff changeset
3485 read_buffer = (char *) xmalloc (read_buffer_size);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3486 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3487
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3488 void
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3489 defsubr (sname)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3490 struct Lisp_Subr *sname;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3491 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3492 Lisp_Object sym;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3493 sym = intern (sname->symbol_name);
9274
5c66d8b65a7c (Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents: 9149
diff changeset
3494 XSETSUBR (XSYMBOL (sym)->function, sname);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3495 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3496
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3497 #ifdef NOTDEF /* use fset in subr.el now */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3498 void
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3499 defalias (sname, string)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3500 struct Lisp_Subr *sname;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3501 char *string;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3502 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3503 Lisp_Object sym;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3504 sym = intern (string);
9274
5c66d8b65a7c (Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents: 9149
diff changeset
3505 XSETSUBR (XSYMBOL (sym)->function, sname);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3506 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3507 #endif /* NOTDEF */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3508
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3509 /* Define an "integer variable"; a symbol whose value is forwarded
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3510 to a C variable of type int. Sample call: */
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3511 /* DEFVAR_INT ("indent-tabs-mode", &indent_tabs_mode, "Documentation"); */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3512 void
7765
688637ba31c5 (defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents: 7675
diff changeset
3513 defvar_int (namestring, address)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3514 char *namestring;
43713
f92c4d87863a Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 43700
diff changeset
3515 EMACS_INT *address;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3516 {
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3517 Lisp_Object sym, val;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3518 sym = intern (namestring);
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3519 val = allocate_misc ();
11242
36e8e27c8625 (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3520 XMISCTYPE (val) = Lisp_Misc_Intfwd;
9913
c921977bb0ce (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_per_buffer): Use accessor
Karl Heuer <kwzh@gnu.org>
parents: 9871
diff changeset
3521 XINTFWD (val)->intvar = address;
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3522 SET_SYMBOL_VALUE (sym, val);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3523 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3524
42206
0f4506820432 Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 41463
diff changeset
3525 /* Similar but define a variable whose value is t if address contains 1,
0f4506820432 Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 41463
diff changeset
3526 nil if address contains 0 */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3527 void
7765
688637ba31c5 (defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents: 7675
diff changeset
3528 defvar_bool (namestring, address)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3529 char *namestring;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3530 int *address;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3531 {
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3532 Lisp_Object sym, val;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3533 sym = intern (namestring);
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3534 val = allocate_misc ();
11242
36e8e27c8625 (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3535 XMISCTYPE (val) = Lisp_Misc_Boolfwd;
9913
c921977bb0ce (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_per_buffer): Use accessor
Karl Heuer <kwzh@gnu.org>
parents: 9871
diff changeset
3536 XBOOLFWD (val)->boolvar = address;
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3537 SET_SYMBOL_VALUE (sym, val);
25555
301ce7f0b398 (Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents: 25251
diff changeset
3538 Vbyte_boolean_vars = Fcons (sym, Vbyte_boolean_vars);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3539 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3540
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3541 /* Similar but define a variable whose value is the Lisp Object stored
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3542 at address. Two versions: with and without gc-marking of the C
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3543 variable. The nopro version is used when that variable will be
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3544 gc-marked for some other reason, since marking the same slot twice
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3545 can cause trouble with strings. */
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3546 void
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3547 defvar_lisp_nopro (namestring, address)
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3548 char *namestring;
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3549 Lisp_Object *address;
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3550 {
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3551 Lisp_Object sym, val;
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3552 sym = intern (namestring);
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3553 val = allocate_misc ();
11242
36e8e27c8625 (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3554 XMISCTYPE (val) = Lisp_Misc_Objfwd;
9913
c921977bb0ce (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_per_buffer): Use accessor
Karl Heuer <kwzh@gnu.org>
parents: 9871
diff changeset
3555 XOBJFWD (val)->objvar = address;
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3556 SET_SYMBOL_VALUE (sym, val);
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3557 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3558
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3559 void
7765
688637ba31c5 (defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents: 7675
diff changeset
3560 defvar_lisp (namestring, address)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3561 char *namestring;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3562 Lisp_Object *address;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3563 {
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3564 defvar_lisp_nopro (namestring, address);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3565 staticpro (address);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3566 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3567
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3568 /* Similar but define a variable whose value is the Lisp Object stored in
9363
4ccd5f13788d (defvar_per_buffer): Access buffer_local_flags as Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents: 9361
diff changeset
3569 the current buffer. address is the address of the slot in the buffer
4ccd5f13788d (defvar_per_buffer): Access buffer_local_flags as Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents: 9361
diff changeset
3570 that is current now. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3571
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3572 void
1009
bf78b5ea9b3a * lread.c (defvar_per_buffer): Support new TYPE argument, by
Jim Blandy <jimb@redhat.com>
parents: 851
diff changeset
3573 defvar_per_buffer (namestring, address, type, doc)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3574 char *namestring;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3575 Lisp_Object *address;
1009
bf78b5ea9b3a * lread.c (defvar_per_buffer): Support new TYPE argument, by
Jim Blandy <jimb@redhat.com>
parents: 851
diff changeset
3576 Lisp_Object type;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3577 char *doc;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3578 {
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3579 Lisp_Object sym, val;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3580 int offset;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3581
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3582 sym = intern (namestring);
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3583 val = allocate_misc ();
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3584 offset = (char *)address - (char *)current_buffer;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3585
11242
36e8e27c8625 (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3586 XMISCTYPE (val) = Lisp_Misc_Buffer_Objfwd;
9913
c921977bb0ce (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_per_buffer): Use accessor
Karl Heuer <kwzh@gnu.org>
parents: 9871
diff changeset
3587 XBUFFER_OBJFWD (val)->offset = offset;
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3588 SET_SYMBOL_VALUE (sym, val);
28367
27133646d187 Use new macro names for handling per-buffer variables.
Gerd Moellmann <gerd@gnu.org>
parents: 28318
diff changeset
3589 PER_BUFFER_SYMBOL (offset) = sym;
27133646d187 Use new macro names for handling per-buffer variables.
Gerd Moellmann <gerd@gnu.org>
parents: 28318
diff changeset
3590 PER_BUFFER_TYPE (offset) = type;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
3591
28367
27133646d187 Use new macro names for handling per-buffer variables.
Gerd Moellmann <gerd@gnu.org>
parents: 28318
diff changeset
3592 if (PER_BUFFER_IDX (offset) == 0)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3593 /* Did a DEFVAR_PER_BUFFER without initializing the corresponding
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3594 slot of buffer_local_flags */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3595 abort ();
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3596 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3597
10606
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3598
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3599 /* Similar but define a variable whose value is the Lisp Object stored
11020
0951bb12c8ee (defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents: 10650
diff changeset
3600 at a particular offset in the current kboard object. */
10606
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3601
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3602 void
11020
0951bb12c8ee (defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents: 10650
diff changeset
3603 defvar_kboard (namestring, offset)
10606
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3604 char *namestring;
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3605 int offset;
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3606 {
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3607 Lisp_Object sym, val;
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3608 sym = intern (namestring);
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3609 val = allocate_misc ();
11242
36e8e27c8625 (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3610 XMISCTYPE (val) = Lisp_Misc_Kboard_Objfwd;
11020
0951bb12c8ee (defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents: 10650
diff changeset
3611 XKBOARD_OBJFWD (val)->offset = offset;
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3612 SET_SYMBOL_VALUE (sym, val);
10606
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3613 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3614
14130
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
3615 /* Record the value of load-path used at the start of dumping
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
3616 so we can see if the site changed it later during dumping. */
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
3617 static Lisp_Object dump_path;
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
3618
20298
b7d23d2eded1 (read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents: 20168
diff changeset
3619 void
364
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3620 init_lread ()
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3621 {
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3622 char *normal;
11735
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3623 int turn_off_warning = 0;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3624
364
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3625 /* Compute the default load-path. */
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3626 #ifdef CANNOT_DUMP
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3627 normal = PATH_LOADSEARCH;
638
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
3628 Vload_path = decode_env_path (0, normal);
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3629 #else
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3630 if (NILP (Vpurify_flag))
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3631 normal = PATH_LOADSEARCH;
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3632 else
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3633 normal = PATH_DUMPLOADSEARCH;
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3634
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3635 /* In a dumped Emacs, we normally have to reset the value of
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3636 Vload_path from PATH_LOADSEARCH, since the value that was dumped
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3637 uses ../lisp, instead of the path of the installed elisp
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3638 libraries. However, if it appears that Vload_path was changed
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3639 from the default before dumping, don't override that value. */
621
eca8812e61cd *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
3640 if (initialized)
eca8812e61cd *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
3641 {
eca8812e61cd *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
3642 if (! NILP (Fequal (dump_path, Vload_path)))
4482
09d0f4b26641 (init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents: 3704
diff changeset
3643 {
09d0f4b26641 (init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents: 3704
diff changeset
3644 Vload_path = decode_env_path (0, normal);
5617
0b312b3fa24e (init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents: 5568
diff changeset
3645 if (!NILP (Vinstallation_directory))
4482
09d0f4b26641 (init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents: 3704
diff changeset
3646 {
42797
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3647 Lisp_Object tem, tem1, sitelisp;
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3648
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3649 /* Remove site-lisp dirs from path temporarily and store
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3650 them in sitelisp, then conc them on at the end so
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3651 they're always first in path. */
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3652 sitelisp = Qnil;
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3653 while (1)
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3654 {
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3655 tem = Fcar (Vload_path);
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3656 tem1 = Fstring_match (build_string ("site-lisp"),
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3657 tem, Qnil);
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3658 if (!NILP (tem1))
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3659 {
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3660 Vload_path = Fcdr (Vload_path);
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3661 sitelisp = Fcons (tem, sitelisp);
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3662 }
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3663 else
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3664 break;
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3665 }
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3666
5617
0b312b3fa24e (init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents: 5568
diff changeset
3667 /* Add to the path the lisp subdir of the
7004
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3668 installation dir, if it exists. */
5617
0b312b3fa24e (init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents: 5568
diff changeset
3669 tem = Fexpand_file_name (build_string ("lisp"),
0b312b3fa24e (init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents: 5568
diff changeset
3670 Vinstallation_directory);
7004
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3671 tem1 = Ffile_exists_p (tem);
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3672 if (!NILP (tem1))
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3673 {
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3674 if (NILP (Fmember (tem, Vload_path)))
11735
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3675 {
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3676 turn_off_warning = 1;
42797
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3677 Vload_path = Fcons (tem, Vload_path);
11735
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3678 }
7004
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3679 }
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3680 else
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3681 /* That dir doesn't exist, so add the build-time
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3682 Lisp dirs instead. */
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3683 Vload_path = nconc2 (Vload_path, dump_path);
11311
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3684
18530
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3685 /* Add leim under the installation dir, if it exists. */
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3686 tem = Fexpand_file_name (build_string ("leim"),
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3687 Vinstallation_directory);
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3688 tem1 = Ffile_exists_p (tem);
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3689 if (!NILP (tem1))
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3690 {
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3691 if (NILP (Fmember (tem, Vload_path)))
42797
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3692 Vload_path = Fcons (tem, Vload_path);
18530
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3693 }
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3694
11311
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3695 /* Add site-list under the installation dir, if it exists. */
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3696 tem = Fexpand_file_name (build_string ("site-lisp"),
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3697 Vinstallation_directory);
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3698 tem1 = Ffile_exists_p (tem);
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3699 if (!NILP (tem1))
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3700 {
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3701 if (NILP (Fmember (tem, Vload_path)))
42797
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3702 Vload_path = Fcons (tem, Vload_path);
11311
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3703 }
18084
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3704
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3705 /* If Emacs was not built in the source directory,
18530
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3706 and it is run from where it was built, add to load-path
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3707 the lisp, leim and site-lisp dirs under that directory. */
18084
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3708
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3709 if (NILP (Fequal (Vinstallation_directory, Vsource_directory)))
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3710 {
18771
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3711 Lisp_Object tem2;
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3712
18084
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3713 tem = Fexpand_file_name (build_string ("src/Makefile"),
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3714 Vinstallation_directory);
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3715 tem1 = Ffile_exists_p (tem);
18771
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3716
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3717 /* Don't be fooled if they moved the entire source tree
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3718 AFTER dumping Emacs. If the build directory is indeed
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3719 different from the source dir, src/Makefile.in and
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3720 src/Makefile will not be found together. */
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3721 tem = Fexpand_file_name (build_string ("src/Makefile.in"),
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3722 Vinstallation_directory);
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3723 tem2 = Ffile_exists_p (tem);
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3724 if (!NILP (tem1) && NILP (tem2))
18084
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3725 {
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3726 tem = Fexpand_file_name (build_string ("lisp"),
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3727 Vsource_directory);
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3728
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3729 if (NILP (Fmember (tem, Vload_path)))
42797
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3730 Vload_path = Fcons (tem, Vload_path);
18084
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3731
18530
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3732 tem = Fexpand_file_name (build_string ("leim"),
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3733 Vsource_directory);
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3734
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3735 if (NILP (Fmember (tem, Vload_path)))
42797
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3736 Vload_path = Fcons (tem, Vload_path);
18530
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3737
18084
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3738 tem = Fexpand_file_name (build_string ("site-lisp"),
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3739 Vsource_directory);
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3740
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3741 if (NILP (Fmember (tem, Vload_path)))
42797
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3742 Vload_path = Fcons (tem, Vload_path);
18084
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3743 }
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3744 }
42797
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3745 if (!NILP (sitelisp))
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3746 Vload_path = nconc2 (Fnreverse (sitelisp), Vload_path);
4482
09d0f4b26641 (init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents: 3704
diff changeset
3747 }
09d0f4b26641 (init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents: 3704
diff changeset
3748 }
621
eca8812e61cd *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
3749 }
eca8812e61cd *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
3750 else
14130
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
3751 {
17605
83850481ae70 (init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents: 17325
diff changeset
3752 /* NORMAL refers to the lisp dir in the source directory. */
83850481ae70 (init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents: 17325
diff changeset
3753 /* We used to add ../lisp at the front here, but
83850481ae70 (init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents: 17325
diff changeset
3754 that caused trouble because it was copied from dump_path
83850481ae70 (init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents: 17325
diff changeset
3755 into Vload_path, aboe, when Vinstallation_directory was non-nil.
83850481ae70 (init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents: 17325
diff changeset
3756 It should be unnecessary. */
83850481ae70 (init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents: 17325
diff changeset
3757 Vload_path = decode_env_path (0, normal);
14130
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
3758 dump_path = Vload_path;
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
3759 }
364
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3760 #endif
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3761
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3762 #if (!(defined(WINDOWSNT) || (defined(HAVE_CARBON))))
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
3763 /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
3764 almost never correct, thereby causing a warning to be printed out that
14036
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13772
diff changeset
3765 confuses users. Since PATH_LOADSEARCH is always overridden by the
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3766 EMACSLOADPATH environment variable below, disable the warning on NT.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3767 Also, when using the "self-contained" option for Carbon Emacs for MacOSX,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3768 the "standard" paths may not exist and would be overridden by
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3769 EMACSLOADPATH as on NT. Since this depends on how the executable
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3770 was build and packaged, turn off the warnings in general */
9790
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
3771
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3772 /* Warn if dirs in the *standard* path don't exist. */
11735
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3773 if (!turn_off_warning)
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3774 {
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3775 Lisp_Object path_tail;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3776
11735
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3777 for (path_tail = Vload_path;
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3778 !NILP (path_tail);
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25555
diff changeset
3779 path_tail = XCDR (path_tail))
11735
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3780 {
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3781 Lisp_Object dirfile;
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3782 dirfile = Fcar (path_tail);
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3783 if (STRINGP (dirfile))
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3784 {
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3785 dirfile = Fdirectory_file_name (dirfile);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3786 if (access (SDATA (dirfile), 0) < 0)
16487
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3787 dir_warning ("Warning: Lisp directory `%s' does not exist.\n",
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25555
diff changeset
3788 XCAR (path_tail));
11735
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3789 }
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3790 }
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3791 }
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3792 #endif /* !(WINDOWSNT || HAVE_CARBON) */
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3793
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3794 /* If the EMACSLOADPATH environment variable is set, use its value.
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3795 This doesn't apply if we're dumping. */
11955
d972c95e7577 (init_lread) [CANNOT_DUMP]: Set Vload_path to EMACSLOADPATH.
Geoff Voelker <voelker@cs.washington.edu>
parents: 11868
diff changeset
3796 #ifndef CANNOT_DUMP
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3797 if (NILP (Vpurify_flag)
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3798 && egetenv ("EMACSLOADPATH"))
11955
d972c95e7577 (init_lread) [CANNOT_DUMP]: Set Vload_path to EMACSLOADPATH.
Geoff Voelker <voelker@cs.washington.edu>
parents: 11868
diff changeset
3799 #endif
364
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3800 Vload_path = decode_env_path ("EMACSLOADPATH", normal);
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3801
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3802 Vvalues = Qnil;
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3803
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3804 load_in_progress = 0;
15283
b2be450a8da4 (init_lread): Init Vload_file_name to Qnil.
Karl Heuer <kwzh@gnu.org>
parents: 15091
diff changeset
3805 Vload_file_name = Qnil;
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
3806
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
3807 load_descriptor_list = Qnil;
21291
b039d32d8399 (init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents: 21251
diff changeset
3808
b039d32d8399 (init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents: 21251
diff changeset
3809 Vstandard_input = Qt;
31536
76cf765a7dad (init_lread): Set Vloads_in_progress to nil.
Gerd Moellmann <gerd@gnu.org>
parents: 31534
diff changeset
3810 Vloads_in_progress = Qnil;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3811 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3812
16487
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3813 /* Print a warning, using format string FORMAT, that directory DIRNAME
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3814 does not exist. Print it on stderr and put it in *Message*. */
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3815
20298
b7d23d2eded1 (read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents: 20168
diff changeset
3816 void
16487
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3817 dir_warning (format, dirname)
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3818 char *format;
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3819 Lisp_Object dirname;
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3820 {
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3821 char *buffer
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3822 = (char *) alloca (SCHARS (dirname) + strlen (format) + 5);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3823
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3824 fprintf (stderr, format, SDATA (dirname));
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3825 sprintf (buffer, format, SDATA (dirname));
21736
f654c3b16214 (dir_warning): Don't log a warning if Emacs hasn't
Geoff Voelker <voelker@cs.washington.edu>
parents: 21724
diff changeset
3826 /* Don't log the warning before we've initialized!! */
f654c3b16214 (dir_warning): Don't log a warning if Emacs hasn't
Geoff Voelker <voelker@cs.washington.edu>
parents: 21724
diff changeset
3827 if (initialized)
f654c3b16214 (dir_warning): Don't log a warning if Emacs hasn't
Geoff Voelker <voelker@cs.washington.edu>
parents: 21724
diff changeset
3828 message_dolog (buffer, strlen (buffer), 0, STRING_MULTIBYTE (dirname));
16487
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3829 }
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3830
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3831 void
364
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3832 syms_of_lread ()
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3833 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3834 defsubr (&Sread);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3835 defsubr (&Sread_from_string);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3836 defsubr (&Sintern);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3837 defsubr (&Sintern_soft);
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3838 defsubr (&Sunintern);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3839 defsubr (&Sload);
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
3840 defsubr (&Seval_buffer);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3841 defsubr (&Seval_region);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3842 defsubr (&Sread_char);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3843 defsubr (&Sread_char_exclusive);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3844 defsubr (&Sread_event);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3845 defsubr (&Sget_file_char);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3846 defsubr (&Smapatoms);
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
3847 defsubr (&Slocate_file_internal);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3848
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3849 DEFVAR_LISP ("obarray", &Vobarray,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3850 doc: /* Symbol table for use by `intern' and `read'.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3851 It is a vector whose length ought to be prime for best results.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3852 The vector's contents don't make sense if examined from Lisp programs;
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3853 to find all the symbols in an obarray, use `mapatoms'. */);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3854
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3855 DEFVAR_LISP ("values", &Vvalues,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3856 doc: /* List of values of all expressions which were read, evaluated and printed.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3857 Order is reverse chronological. */);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3858
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3859 DEFVAR_LISP ("standard-input", &Vstandard_input,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3860 doc: /* Stream for read to get input from.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3861 See documentation of `read' for possible values. */);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3862 Vstandard_input = Qt;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3863
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3864 DEFVAR_LISP ("read-with-symbol-positions", &Vread_with_symbol_positions,
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3865 doc: /* If non-nil, add position of read symbols to `read-symbol-positions-list'.
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3866
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3867 If this variable is a buffer, then only forms read from that buffer
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3868 will be added to `read-symbol-positions-list'.
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3869 If this variable is t, then all read forms will be added.
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3870 The effect of all other values other than nil are not currently
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3871 defined, although they may be in the future.
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3872
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3873 The positions are relative to the last call to `read' or
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3874 `read-from-string'. It is probably a bad idea to set this variable at
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3875 the toplevel; bind it instead. */);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3876 Vread_with_symbol_positions = Qnil;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3877
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3878 DEFVAR_LISP ("read-symbol-positions-list", &Vread_symbol_positions_list,
47919
b85eeb858fb1 (syms_of_lread): Fix typos.
Juanma Barranquero <lekktu@gmail.com>
parents: 47847
diff changeset
3879 doc: /* A list mapping read symbols to their positions.
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3880 This variable is modified during calls to `read' or
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3881 `read-from-string', but only when `read-with-symbol-positions' is
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3882 non-nil.
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3883
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3884 Each element of the list looks like (SYMBOL . CHAR-POSITION), where
47919
b85eeb858fb1 (syms_of_lread): Fix typos.
Juanma Barranquero <lekktu@gmail.com>
parents: 47847
diff changeset
3885 CHAR-POSITION is an integer giving the offset of that occurrence of the
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3886 symbol from the position where `read' or `read-from-string' started.
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3887
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3888 Note that a symbol will appear multiple times in this list, if it was
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3889 read multiple times. The list is in the same order as the symbols
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3890 were read in. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
3891 Vread_symbol_positions_list = Qnil;
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3892
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3893 DEFVAR_LISP ("load-path", &Vload_path,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3894 doc: /* *List of directories to search for files to load.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3895 Each element is a string (directory name) or nil (try default directory).
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3896 Initialized based on EMACSLOADPATH environment variable, if any,
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3897 otherwise to default specified by file `epaths.h' when Emacs was built. */);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3898
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
3899 DEFVAR_LISP ("load-suffixes", &Vload_suffixes,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3900 doc: /* *List of suffixes to try for files to load.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3901 This list should not include the empty string. */);
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
3902 Vload_suffixes = Fcons (build_string (".elc"),
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
3903 Fcons (build_string (".el"), Qnil));
39809
57070445ceac (syms_of_lread): Fix init of default_suffixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39808
diff changeset
3904 /* We don't use empty_string because it's not initialized yet. */
57070445ceac (syms_of_lread): Fix init of default_suffixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39808
diff changeset
3905 default_suffixes = Fcons (build_string (""), Qnil);
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
3906 staticpro (&default_suffixes);
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
3907
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3908 DEFVAR_BOOL ("load-in-progress", &load_in_progress,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3909 doc: /* Non-nil iff inside of `load'. */);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3910
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3911 DEFVAR_LISP ("after-load-alist", &Vafter_load_alist,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3912 doc: /* An alist of expressions to be evalled when particular files are loaded.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3913 Each element looks like (FILENAME FORMS...).
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3914 When `load' is run and the file-name argument is FILENAME,
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3915 the FORMS in the corresponding element are executed at the end of loading.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3916
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3917 FILENAME must match exactly! Normally FILENAME is the name of a library,
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3918 with no directory specified, since that is how `load' is normally called.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3919 An error in FORMS does not undo the load,
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3920 but does prevent execution of the rest of the FORMS.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3921 FILENAME can also be a symbol (a feature) and FORMS are then executed
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3922 when the corresponding call to `provide' is made. */);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3923 Vafter_load_alist = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3924
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
3925 DEFVAR_LISP ("load-history", &Vload_history,
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3926 doc: /* Alist mapping file names to symbols and features.
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3927 Each alist element is a list that starts with a file name,
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3928 except for one element (optional) that starts with nil and describes
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3929 definitions evaluated from buffers not visiting files.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3930 The remaining elements of each list are symbols defined as variables
47021
3bd4234e0844 (build_load_history): Use Fmember to see if a definition
Richard M. Stallman <rms@gnu.org>
parents: 46472
diff changeset
3931 and cons cells of the form `(provide . FEATURE)', `(require . FEATURE)',
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3932 `(defun . FUNCTION)', `(autoload . SYMBOL)', and `(t . SYMBOL)'.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3933 An element `(t . SYMBOL)' precedes an entry `(defun . FUNCTION)',
48726
8e3eb5de7b47 (syms_of_lread) <load-history>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 48149
diff changeset
3934 and means that SYMBOL was an autoload before this file redefined it
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3935 as a function.
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3936
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3937 During preloading, the file name recorded is relative to the main Lisp
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3938 directory. These file names are converted to absolute at startup. */);
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
3939 Vload_history = Qnil;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
3940
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
3941 DEFVAR_LISP ("load-file-name", &Vload_file_name,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3942 doc: /* Full name of file being loaded by `load'. */);
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
3943 Vload_file_name = Qnil;
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
3944
24817
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
3945 DEFVAR_LISP ("user-init-file", &Vuser_init_file,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3946 doc: /* File name, including directory, of user's initialization file.
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3947 If the file loaded had extension `.elc', and the corresponding source file
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
3948 exists, this variable contains the name of source file, suitable for use
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3949 by functions like `custom-save-all' which edit the init file. */);
24817
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
3950 Vuser_init_file = Qnil;
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
3951
2901
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
3952 DEFVAR_LISP ("current-load-list", &Vcurrent_load_list,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3953 doc: /* Used for internal purposes by `load'. */);
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
3954 Vcurrent_load_list = Qnil;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
3955
11079
aeaaa579d967 (Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 11020
diff changeset
3956 DEFVAR_LISP ("load-read-function", &Vload_read_function,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3957 doc: /* Function used by `load' and `eval-region' for reading expressions.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3958 The default is nil, which means use the function `read'. */);
11079
aeaaa579d967 (Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 11020
diff changeset
3959 Vload_read_function = Qnil;
aeaaa579d967 (Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 11020
diff changeset
3960
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
3961 DEFVAR_LISP ("load-source-file-function", &Vload_source_file_function,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3962 doc: /* Function called in `load' for loading an Emacs lisp source file.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3963 This function is for doing code conversion before reading the source file.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3964 If nil, loading is done without any code conversion.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3965 Arguments are FULLNAME, FILE, NOERROR, NOMESSAGE, where
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3966 FULLNAME is the full name of FILE.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3967 See `load' for the meaning of the remaining arguments. */);
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
3968 Vload_source_file_function = Qnil;
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
3969
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3970 DEFVAR_BOOL ("load-force-doc-strings", &load_force_doc_strings,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3971 doc: /* Non-nil means `load' should force-load all dynamic doc strings.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3972 This is useful when the file being loaded is a temporary copy. */);
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3973 load_force_doc_strings = 0;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3974
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
3975 DEFVAR_BOOL ("load-convert-to-unibyte", &load_convert_to_unibyte,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3976 doc: /* Non-nil means `read' converts strings to unibyte whenever possible.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3977 This is normally bound by `load' and `eval-buffer' to control `read',
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3978 and is not meant for users to change. */);
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
3979 load_convert_to_unibyte = 0;
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
3980
13601
0a091134e047 (Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13455
diff changeset
3981 DEFVAR_LISP ("source-directory", &Vsource_directory,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3982 doc: /* Directory in which Emacs sources were found when Emacs was built.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3983 You cannot count on them to still be there! */);
14300
f777822a5d81 (syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
3984 Vsource_directory
f777822a5d81 (syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
3985 = Fexpand_file_name (build_string ("../"),
f777822a5d81 (syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
3986 Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH)));
f777822a5d81 (syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
3987
18665
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
3988 DEFVAR_LISP ("preloaded-file-list", &Vpreloaded_file_list,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3989 doc: /* List of files that were preloaded (when dumping Emacs). */);
18665
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
3990 Vpreloaded_file_list = Qnil;
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
3991
25555
301ce7f0b398 (Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents: 25251
diff changeset
3992 DEFVAR_LISP ("byte-boolean-vars", &Vbyte_boolean_vars,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3993 doc: /* List of all DEFVAR_BOOL variables, used by the byte code optimizer. */);
25555
301ce7f0b398 (Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents: 25251
diff changeset
3994 Vbyte_boolean_vars = Qnil;
301ce7f0b398 (Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents: 25251
diff changeset
3995
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
3996 DEFVAR_BOOL ("load-dangerous-libraries", &load_dangerous_libraries,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3997 doc: /* Non-nil means load dangerous compiled Lisp files.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3998 Some versions of XEmacs use different byte codes than Emacs. These
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3999 incompatible byte codes can make Emacs crash when it tries to execute
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
4000 them. */);
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
4001 load_dangerous_libraries = 0;
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
4002
31367
22eb2b661cdf (syms_of_lread): Make Vbytecomp_version_regexp a Lisp
Gerd Moellmann <gerd@gnu.org>
parents: 31315
diff changeset
4003 DEFVAR_LISP ("bytecomp-version-regexp", &Vbytecomp_version_regexp,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
4004 doc: /* Regular expression matching safe to load compiled Lisp files.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
4005 When Emacs loads a compiled Lisp file, it reads the first 512 bytes
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
4006 from the file, and matches them against this regular expression.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
4007 When the regular expression matches, the file is considered to be safe
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
4008 to load. See also `load-dangerous-libraries'. */);
31367
22eb2b661cdf (syms_of_lread): Make Vbytecomp_version_regexp a Lisp
Gerd Moellmann <gerd@gnu.org>
parents: 31315
diff changeset
4009 Vbytecomp_version_regexp
31464
2efc0e152012 (syms_of_lread): Change value of regexp
Gerd Moellmann <gerd@gnu.org>
parents: 31367
diff changeset
4010 = build_string ("^;;;.\\(in Emacs version\\|bytecomp version FSF\\)");
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
4011
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
4012 DEFVAR_LISP ("eval-buffer-list", &Veval_buffer_list,
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
4013 doc: /* List of buffers being read from by calls to `eval-buffer' and `eval-region'. */);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
4014 Veval_buffer_list = Qnil;
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
4015
14300
f777822a5d81 (syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
4016 /* Vsource_directory was initialized in init_lread. */
f777822a5d81 (syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
4017
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
4018 load_descriptor_list = Qnil;
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
4019 staticpro (&load_descriptor_list);
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
4020
2901
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
4021 Qcurrent_load_list = intern ("current-load-list");
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
4022 staticpro (&Qcurrent_load_list);
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
4023
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4024 Qstandard_input = intern ("standard-input");
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4025 staticpro (&Qstandard_input);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4026
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4027 Qread_char = intern ("read-char");
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4028 staticpro (&Qread_char);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4029
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4030 Qget_file_char = intern ("get-file-char");
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4031 staticpro (&Qget_file_char);
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
4032
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
4033 Qbackquote = intern ("`");
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
4034 staticpro (&Qbackquote);
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
4035 Qcomma = intern (",");
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
4036 staticpro (&Qcomma);
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
4037 Qcomma_at = intern (",@");
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
4038 staticpro (&Qcomma_at);
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
4039 Qcomma_dot = intern (",.");
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
4040 staticpro (&Qcomma_dot);
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
4041
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
4042 Qinhibit_file_name_operation = intern ("inhibit-file-name-operation");
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
4043 staticpro (&Qinhibit_file_name_operation);
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
4044
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
4045 Qascii_character = intern ("ascii-character");
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
4046 staticpro (&Qascii_character);
3625
57174f9b1870 (Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents: 3041
diff changeset
4047
13235
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
4048 Qfunction = intern ("function");
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
4049 staticpro (&Qfunction);
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
4050
3625
57174f9b1870 (Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents: 3041
diff changeset
4051 Qload = intern ("load");
57174f9b1870 (Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents: 3041
diff changeset
4052 staticpro (&Qload);
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
4053
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
4054 Qload_file_name = intern ("load-file-name");
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
4055 staticpro (&Qload_file_name);
14130
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
4056
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
4057 Qeval_buffer_list = intern ("eval-buffer-list");
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
4058 staticpro (&Qeval_buffer_list);
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
4059
14130
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
4060 staticpro (&dump_path);
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
4061
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
4062 staticpro (&read_objects);
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
4063 read_objects = Qnil;
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
4064 staticpro (&seen_list);
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
4065 seen_list = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48910
diff changeset
4066
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
4067 Vloads_in_progress = Qnil;
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
4068 staticpro (&Vloads_in_progress);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4069 }
88155
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
4070
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
4071 /* arch-tag: a0d02733-0f96-4844-a659-9fd53c4f414d
d7ddb3e565de sync with trunk
Henrik Enberg <henrik.enberg@telia.com>
parents: 49765
diff changeset
4072 (do not change this comment) */