annotate src/lread.c @ 47849:7d0ce3907ecc

*** empty log message ***
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sat, 12 Oct 2002 20:33:46 +0000
parents dd601595b35d
children b85eeb858fb1
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.
36256
e033d60bd048 Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents: 35543
diff changeset
2 Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99, 2000, 2001
18771
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3 Free Software Foundation, Inc.
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 This file is part of GNU Emacs.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 GNU Emacs is free software; you can redistribute it and/or modify
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 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
9 the Free Software Foundation; either version 2, or (at your option)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 any later version.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 GNU General Public License for more details.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 along with GNU Emacs; see the file COPYING. If not, write to
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14130
diff changeset
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14130
diff changeset
20 Boston, MA 02111-1307, USA. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22
7898
1d65b2152c4e Put config.h first.
Richard M. Stallman <rms@gnu.org>
parents: 7823
diff changeset
23 #include <config.h>
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
24 #include <stdio.h>
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
25 #include <sys/types.h>
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26 #include <sys/stat.h>
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
27 #include <sys/file.h>
8083
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
28 #include <errno.h>
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
29 #include "lisp.h"
25787
3d1138357287 (readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
30 #include "intervals.h"
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31 #include "buffer.h"
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
32 #include "charset.h"
24412
d11ac02f9d6a Use epaths.h istead of paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 23933
diff changeset
33 #include <epaths.h>
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
34 #include "commands.h"
1591
765cb54fa9af * lread.c: #include "keyboard.h".
Jim Blandy <jimb@redhat.com>
parents: 1519
diff changeset
35 #include "keyboard.h"
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
36 #include "termhooks.h"
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
37 #include "coding.h"
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
38
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
39 #ifdef lint
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
40 #include <sys/inode.h>
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
41 #endif /* lint */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
42
14972
a6889b33d21c [MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 14950
diff changeset
43 #ifdef MSDOS
a6889b33d21c [MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 14950
diff changeset
44 #if __DJGPP__ < 2
a6889b33d21c [MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 14950
diff changeset
45 #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
46 #endif
a6889b33d21c [MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 14950
diff changeset
47 #include "msdos.h"
a6889b33d21c [MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 14950
diff changeset
48 #endif
a6889b33d21c [MSDOS]: If DJGPP version 2, include unistd.h.
Richard M. Stallman <rms@gnu.org>
parents: 14950
diff changeset
49
21799
7a44b61e263b Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21797
diff changeset
50 #ifdef HAVE_UNISTD_H
7a44b61e263b Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21797
diff changeset
51 #include <unistd.h>
7a44b61e263b Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21797
diff changeset
52 #endif
7a44b61e263b Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21797
diff changeset
53
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
54 #ifndef X_OK
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
55 #define X_OK 01
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
56 #endif
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
57
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
58 #include <math.h>
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
59
14950
f5abde0d2904 Include locale.h.
Richard M. Stallman <rms@gnu.org>
parents: 14945
diff changeset
60 #ifdef HAVE_SETLOCALE
f5abde0d2904 Include locale.h.
Richard M. Stallman <rms@gnu.org>
parents: 14945
diff changeset
61 #include <locale.h>
f5abde0d2904 Include locale.h.
Richard M. Stallman <rms@gnu.org>
parents: 14945
diff changeset
62 #endif /* HAVE_SETLOCALE */
f5abde0d2904 Include locale.h.
Richard M. Stallman <rms@gnu.org>
parents: 14945
diff changeset
63
8596
ccd3c3ca2aef (O_RDONLY): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 8182
diff changeset
64 #ifndef O_RDONLY
ccd3c3ca2aef (O_RDONLY): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 8182
diff changeset
65 #define O_RDONLY 0
ccd3c3ca2aef (O_RDONLY): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 8182
diff changeset
66 #endif
ccd3c3ca2aef (O_RDONLY): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 8182
diff changeset
67
34428
b2ec0cbfd60a (file_offset, file_tell): Depend on HAVE_FSEEKO, not
Gerd Moellmann <gerd@gnu.org>
parents: 34362
diff changeset
68 #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
69 #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
70 #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
71 #else
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
72 #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
73 #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
74 #endif
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
75
31100
92f108b8b281 [USE_CRT_DLL]: Remove unnecessary extern, which
Andrew Innes <andrewi@gnu.org>
parents: 30985
diff changeset
76 #ifndef USE_CRT_DLL
8083
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
77 extern int errno;
31100
92f108b8b281 [USE_CRT_DLL]: Remove unnecessary extern, which
Andrew Innes <andrewi@gnu.org>
parents: 30985
diff changeset
78 #endif
8083
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
79
2901
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
80 Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
81 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
82 Lisp_Object Qascii_character, Qload, Qload_file_name;
13235
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
83 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
84 Lisp_Object Qinhibit_file_name_operation;
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
85
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
86 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
87 extern Lisp_Object Qfile_exists_p;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
88
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
89 /* non-zero if inside `load' */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
90 int load_in_progress;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91
13601
0a091134e047 (Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13455
diff changeset
92 /* Directory in which the sources were found. */
0a091134e047 (Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13455
diff changeset
93 Lisp_Object Vsource_directory;
0a091134e047 (Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13455
diff changeset
94
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
95 /* 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
96 Lisp_Object Vload_path, Vload_suffixes, default_suffixes;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
97
24817
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
98 /* File name of user's init file. */
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
99 Lisp_Object Vuser_init_file;
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
100
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
101 /* 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
102 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
103 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
104
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
105 /* 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
106 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
107
18665
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
108 /* List of files that were preloaded. */
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
109 Lisp_Object Vpreloaded_file_list;
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
110
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
111 /* 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
112 Lisp_Object Vload_file_name;
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
113
11079
aeaaa579d967 (Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 11020
diff changeset
114 /* 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
115 Lisp_Object Vload_read_function;
aeaaa579d967 (Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 11020
diff changeset
116
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
117 /* 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
118 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
119 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
120 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
121 Lisp_Object read_objects;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
122
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
123 /* 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
124 static int load_force_doc_strings;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
125
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
126 /* 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
127 static int load_convert_to_unibyte;
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
128
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
129 /* Function to use for loading an Emacs lisp source file (not
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
130 compiled) instead of readevalloop. */
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
131 Lisp_Object Vload_source_file_function;
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
132
25555
301ce7f0b398 (Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents: 25251
diff changeset
133 /* 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
134 Lisp_Object Vbyte_boolean_vars;
301ce7f0b398 (Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents: 25251
diff changeset
135
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
136 /* 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
137 read. */
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
138 Lisp_Object Vread_with_symbol_positions;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
139
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
140 /* List of (SYMBOL . POSITION) accumulated so far. */
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
141 Lisp_Object Vread_symbol_positions_list;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
142
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
143 /* 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
144 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
145
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
146 /* File for get_file_char to read from. Use by load. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
147 static FILE *instream;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
148
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
149 /* When nonzero, read conses in pure space */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
150 static int read_pure;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
151
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
152 /* For use within read-from-string (this reader is non-reentrant!!) */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153 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
154 static int read_from_string_index_byte;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
155 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
156
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
157 /* 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
158 that `readchar' has already advanced over. */
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
159 static int readchar_backlog;
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
160 /* 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
161 Fread_from_string. */
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
162 static int readchar_count;
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
163
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
164 /* This contains the last string skipped with #@. */
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
165 static char *saved_doc_string;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
166 /* Length of buffer allocated in saved_doc_string. */
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
167 static int saved_doc_string_size;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
168 /* Length of actual data in saved_doc_string. */
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
169 static int saved_doc_string_length;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
170 /* 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
171 static file_offset saved_doc_string_position;
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
172
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
173 /* 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
174 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
175 is put in saved_doc_string. */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
176 static char *prev_saved_doc_string;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
177 /* 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
178 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
179 /* 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
180 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
181 /* 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
182 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
183
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
184 /* 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
185 with no surrounding parentheses.
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
186 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
187 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
188 static int new_backquote_flag;
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
189
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
190 /* 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
191 check for recursive loads. */
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
192
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
193 static Lisp_Object Vloads_in_progress;
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
194
31804
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
195 /* Non-zero means load dangerous compiled Lisp files. */
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
196
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
197 int load_dangerous_libraries;
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
198
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
199 /* 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
200
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
201 static Lisp_Object Vbytecomp_version_regexp;
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
202
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
203 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
204 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
205 Lisp_Object (*) (), int,
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
206 Lisp_Object, Lisp_Object));
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
207 static Lisp_Object load_unwind P_ ((Lisp_Object));
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
208 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
209
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
210
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
211 /* Handle unreading and rereading of characters.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212 Write READCHAR to read a character,
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
213 UNREAD(c) to unread c to be read again.
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
214
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
215 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
216 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
217 should manage them if necessary.
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
218
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
219 [ 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
220 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
221 comment just out of date?
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
222 -- 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
223 */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
225 #define READCHAR readchar (readcharfun)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
226 #define UNREAD(c) unreadchar (readcharfun, c)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
227
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
228 static int
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
229 readchar (readcharfun)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230 Lisp_Object readcharfun;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
231 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
232 Lisp_Object tem;
25787
3d1138357287 (readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
233 register int c;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
235 readchar_count++;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
236
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
237 if (BUFFERP (readcharfun))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238 {
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
239 register struct buffer *inbuffer = XBUFFER (readcharfun);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
240
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
241 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
242 int orig_pt_byte = pt_byte;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
243
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
244 if (readchar_backlog > 0)
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
245 /* 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
246 which is the last byte of the character.
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
247 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
248 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
249 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
250 - --readchar_backlog);
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
251
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
252 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
253 return -1;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
254
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
255 readchar_backlog = -1;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
256
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
257 if (! NILP (inbuffer->enable_multibyte_characters))
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
258 {
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
259 /* 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
260 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
261 BUF_INC_POS (inbuffer, pt_byte);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
262 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
263 }
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
264 else
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
265 {
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
266 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
267 pt_byte++;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
268 }
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
269 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
270
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
271 return c;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
272 }
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
273 if (MARKERP (readcharfun))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
274 {
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
275 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
276
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
277 int bytepos = marker_byte_position (readcharfun);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
278 int orig_bytepos = bytepos;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
279
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
280 if (readchar_backlog > 0)
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
281 /* 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
282 which is the last byte of the character.
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
283 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
284 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
285 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
286 - --readchar_backlog);
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
287
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
288 if (bytepos >= BUF_ZV_BYTE (inbuffer))
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
289 return -1;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
290
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
291 readchar_backlog = -1;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
292
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
293 if (! NILP (inbuffer->enable_multibyte_characters))
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
294 {
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
295 /* 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
296 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
297 BUF_INC_POS (inbuffer, bytepos);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
298 c = STRING_CHAR (p, bytepos - orig_bytepos);
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
299 }
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
300 else
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
301 {
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
302 c = BUF_FETCH_BYTE (inbuffer, bytepos);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
303 bytepos++;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
304 }
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
305
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
306 XMARKER (readcharfun)->bytepos = bytepos;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
307 XMARKER (readcharfun)->charpos++;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
308
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
309 return c;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
310 }
22691
ff0ed53342b3 (read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents: 22603
diff changeset
311
ff0ed53342b3 (read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents: 22603
diff changeset
312 if (EQ (readcharfun, Qlambda))
ff0ed53342b3 (read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents: 22603
diff changeset
313 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
314
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
315 if (EQ (readcharfun, Qget_file_char))
8083
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
316 {
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
317 c = getc (instream);
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
318 #ifdef EINTR
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
319 /* 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
320 while (c == EOF && ferror (instream) && errno == EINTR)
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
321 {
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
322 clearerr (instream);
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 }
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
325 #endif
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
326 return c;
dc62b2daf48e (readchar): Restart interrupted I/O.
Karl Heuer <kwzh@gnu.org>
parents: 7898
diff changeset
327 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
328
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
329 if (STRINGP (readcharfun))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
330 {
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
331 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
332 c = -1;
29014
4c02859dda27 (read1): On reading multibyte string, be sure to make
Kenichi Handa <handa@m17n.org>
parents: 28746
diff changeset
333 else
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
334 FETCH_STRING_CHAR_ADVANCE (c, readcharfun,
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
335 read_from_string_index,
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
336 read_from_string_index_byte);
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
337
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
338 return c;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
339 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
340
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
341 tem = call0 (readcharfun);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
342
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
343 if (NILP (tem))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
344 return -1;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
345 return XINT (tem);
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 /* Unread the character C in the way appropriate for the stream READCHARFUN.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
349 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
350
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
351 static void
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
352 unreadchar (readcharfun, c)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
353 Lisp_Object readcharfun;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
354 int c;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
355 {
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
356 readchar_count--;
6471
4e6b54b64d94 (unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents: 6470
diff changeset
357 if (c == -1)
4e6b54b64d94 (unreadchar): Don't back up the pointer when unreading EOF.
Karl Heuer <kwzh@gnu.org>
parents: 6470
diff changeset
358 /* 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
359 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
360 ;
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
361 else if (BUFFERP (readcharfun))
20691
cf1919e207ef (unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents: 20669
diff changeset
362 {
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
363 struct buffer *b = XBUFFER (readcharfun);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
364 int bytepos = BUF_PT_BYTE (b);
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
365
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
366 if (readchar_backlog >= 0)
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
367 readchar_backlog++;
20691
cf1919e207ef (unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents: 20669
diff changeset
368 else
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
369 {
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
370 BUF_PT (b)--;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
371 if (! NILP (b->enable_multibyte_characters))
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
372 BUF_DEC_POS (b, bytepos);
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
373 else
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
374 bytepos--;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
375
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
376 BUF_PT_BYTE (b) = bytepos;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
377 }
20691
cf1919e207ef (unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents: 20669
diff changeset
378 }
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
379 else if (MARKERP (readcharfun))
20691
cf1919e207ef (unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents: 20669
diff changeset
380 {
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
381 struct buffer *b = XMARKER (readcharfun)->buffer;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
382 int bytepos = XMARKER (readcharfun)->bytepos;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
383
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
384 if (readchar_backlog >= 0)
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
385 readchar_backlog++;
20691
cf1919e207ef (unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents: 20669
diff changeset
386 else
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
387 {
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
388 XMARKER (readcharfun)->charpos--;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
389 if (! NILP (b->enable_multibyte_characters))
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
390 BUF_DEC_POS (b, bytepos);
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
391 else
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
392 bytepos--;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
393
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
394 XMARKER (readcharfun)->bytepos = bytepos;
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
395 }
20691
cf1919e207ef (unreadchar): For unreading an ASCII char
Richard M. Stallman <rms@gnu.org>
parents: 20669
diff changeset
396 }
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
397 else if (STRINGP (readcharfun))
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
398 {
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
399 read_from_string_index--;
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
400 read_from_string_index_byte
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
401 = 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
402 }
22691
ff0ed53342b3 (read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents: 22603
diff changeset
403 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
404 read_bytecode_char (1);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
405 else if (EQ (readcharfun, Qget_file_char))
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
406 ungetc (c, instream);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
407 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
408 call1 (readcharfun, make_number (c));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
409 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
410
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
411 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
412 Lisp_Object));
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
413 static Lisp_Object read0 P_ ((Lisp_Object));
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
414 static Lisp_Object read1 P_ ((Lisp_Object, int *, int));
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
415
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
416 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
417 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
418 static int read_multibyte P_ ((int, Lisp_Object));
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
419
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
420 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
421 Lisp_Object));
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
422 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
423 Lisp_Object));
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
424 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
425
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
426
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
427 /* Get a character from the tty. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
428
1519
5d0837ebee9c * lread.c (read_char): Add an extern declaration for this,
Jim Blandy <jimb@redhat.com>
parents: 1092
diff changeset
429 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
430
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
431 /* 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
432
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
433 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
434 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
435 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
436
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
437 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
438 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
439 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
440
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
441 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
442 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
443 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
444 character.
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
445
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
446 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
447 if the character warrants that. */
14483
7f49c41db1e8 (Fread_char_exclusive): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 14300
diff changeset
448
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
449 Lisp_Object
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
450 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
451 input_method)
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
452 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
453 {
6503
7c566d0e4b3d (read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6471
diff changeset
454 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
455
28633
83d4e44ed68e (read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
456 #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
457 if (display_hourglass_p)
e033d60bd048 Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents: 35543
diff changeset
458 cancel_hourglass ();
28633
83d4e44ed68e (read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
459 #endif
83d4e44ed68e (read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
460
6503
7c566d0e4b3d (read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6471
diff changeset
461 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
462
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
463 /* 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
464 retry:
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
465 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
466 (input_method ? Qnil : Qt),
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
467 0);
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
468
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
469 if (BUFFERP (val))
5888
0d02ee7ee659 (read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents: 5687
diff changeset
470 goto retry;
0d02ee7ee659 (read_filtered_event): Retry read_char after a buffer change.
Karl Heuer <kwzh@gnu.org>
parents: 5687
diff changeset
471
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
472 /* switch-frame events are put off until after the next ASCII
14036
621a575db6f7 Comment fixes.
Karl Heuer <kwzh@gnu.org>
parents: 13772
diff changeset
473 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
474 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
475 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
476 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
477 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
478 && 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
479 && 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
480 {
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
481 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
482 goto retry;
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
483 }
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
484
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
485 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
486 {
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
487 /* 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
488 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
489 {
25787
3d1138357287 (readchar): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25663
diff changeset
490 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
491 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
492 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
493 {
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
494 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
495 /* 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
496 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
497 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
498 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
499 }
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
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
502 /* 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
503 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
504 {
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
505 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
506 {
7106
06542cc6ddcd (read_filtered_event): Use Vunread_command_events.
Richard M. Stallman <rms@gnu.org>
parents: 7028
diff changeset
507 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
508 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
509 }
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
510 else
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
511 goto retry;
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
512 }
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
513 }
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
514
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
515 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
516 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
517
43700
2388863b284b (read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents: 43669
diff changeset
518 #if 0
2388863b284b (read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents: 43669
diff changeset
519
28633
83d4e44ed68e (read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
520 #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
521 if (display_hourglass_p)
e033d60bd048 Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
Gerd Moellmann <gerd@gnu.org>
parents: 35543
diff changeset
522 start_hourglass ();
28633
83d4e44ed68e (read_filtered_event): Cancel and start busy cursor.
Gerd Moellmann <gerd@gnu.org>
parents: 28507
diff changeset
523 #endif
43700
2388863b284b (read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents: 43669
diff changeset
524
2388863b284b (read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents: 43669
diff changeset
525 #endif
2388863b284b (read_filtered_event): Do not call start_hourglass before returning.
Pavel Janík <Pavel@Janik.cz>
parents: 43669
diff changeset
526
2654
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
527 return val;
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
528 }
ba685dcc3750 Arrange for Fy_or_n_p to put off switch-frame events.
Jim Blandy <jimb@redhat.com>
parents: 2545
diff changeset
529
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
530 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
531 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
532 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
533 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
534 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
535 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
536 be read.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
537 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
538 `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
539
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 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
541 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
542 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
543 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
544 (prompt, inherit_input_method)
23933
d993b7332153 (Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents: 23284
diff changeset
545 Lisp_Object prompt, inherit_input_method;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
546 {
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
547 if (! NILP (prompt))
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
548 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
549 return read_filtered_event (1, 1, 1, ! NILP (inherit_input_method));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
550 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
551
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
552 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
553 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
554 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
555 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
556 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
557 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
558 (prompt, inherit_input_method)
23933
d993b7332153 (Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents: 23284
diff changeset
559 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
560 {
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
561 if (! NILP (prompt))
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
562 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
563 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
564 }
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
565
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
566 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
567 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
568 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
569
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
570 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
571 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
572 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
573 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
574 (prompt, inherit_input_method)
23933
d993b7332153 (Fread_char): Change the meaning of the second argument.
Kenichi Handa <handa@m17n.org>
parents: 23284
diff changeset
575 Lisp_Object prompt, inherit_input_method;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
576 {
23056
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
577 if (! NILP (prompt))
1b44597160c3 (read_filtered_event): New arg INPUT_METHOD. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22889
diff changeset
578 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
579 return read_filtered_event (1, 1, 0, ! NILP (inherit_input_method));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
580 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
581
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
582 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
583 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
584 ()
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
585 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
586 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
587 XSETINT (val, getc (instream));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
588 return val;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
589 }
31804
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
590
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
591
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
592
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
593 /* 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
594 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
595 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
596 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
597 byte compiler. */
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
598
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
599 static int
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
600 safe_to_load_p (fd)
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
601 int fd;
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
602 {
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
603 char buf[512];
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
604 int nbytes, i;
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
605 int safe_p = 1;
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
606
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
607 /* 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
608 specifying the byte compiler version used. */
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
609 nbytes = emacs_read (fd, buf, sizeof buf - 1);
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
610 if (nbytes > 0)
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
611 {
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
612 buf[nbytes] = '\0';
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 /* 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
615 with NUL bytes following it. */
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
616 for (i = 0; i < nbytes && buf[i] != '\n'; ++i)
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
617 ;
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 if (i < nbytes
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
620 && fast_c_string_match_ignore_case (Vbytecomp_version_regexp,
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
621 buf + i) < 0)
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
622 safe_p = 0;
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
623 }
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 lseek (fd, 0, SEEK_SET);
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
626 return safe_p;
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
627 }
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
628
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
629
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
630 /* 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
631 after loading a file successfully. */
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
632
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
633 static Lisp_Object
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
634 record_load_unwind (old)
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
635 Lisp_Object old;
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
636 {
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
637 return Vloads_in_progress = old;
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
638 }
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
19115
266915689f9e (Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents: 19020
diff changeset
641 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
642 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
643 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
644 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
645 `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
646 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
647 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
648 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
649 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
650 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
651 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
652 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
653 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
654 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
655 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
656 it ends in one of those suffixes or includes a directory name.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
657 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
658 (file, noerror, nomessage, nosuffix, must_suffix)
19115
266915689f9e (Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents: 19020
diff changeset
659 Lisp_Object file, noerror, nomessage, nosuffix, must_suffix;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
660 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
661 register FILE *stream;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
662 register int fd = -1;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
663 register Lisp_Object lispstream;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45970
diff changeset
664 int count = SPECPDL_INDEX ();
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
665 Lisp_Object temp;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
666 struct gcpro gcpro1;
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
667 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
668 /* 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
669 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
670 /* 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
671 int compiled = 0;
3625
57174f9b1870 (Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents: 3041
diff changeset
672 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
673 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
674 char *fmode = "r";
9790
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
675 #ifdef DOS_NT
21936
6635a9f225a9 (Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents: 21935
diff changeset
676 fmode = "rt";
9790
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
677 #endif /* DOS_NT */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
678
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40558
diff changeset
679 CHECK_STRING (file);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
680
3625
57174f9b1870 (Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents: 3041
diff changeset
681 /* 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
682 /* 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
683 handler = Ffind_file_name_handler (file, Qload);
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
684 if (!NILP (handler))
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
685 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
686
10014
d149c4dc84f3 (Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents: 9938
diff changeset
687 /* 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
688 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
689 (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
690 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
691 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
692 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
693 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
694 that it seemed risky to remove. */
13036
cd0e7903d0a9 (Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents: 12780
diff changeset
695 file = Fsubstitute_in_file_name (file);
10014
d149c4dc84f3 (Fload): Call Fsubstitute_in_file_name after trying handler.
Richard M. Stallman <rms@gnu.org>
parents: 9938
diff changeset
696
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
697 /* Avoid weird lossage with null string as arg,
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
698 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
699 if (SCHARS (file) > 0)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
700 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
701 int size = SBYTES (file);
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
702 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
703
13036
cd0e7903d0a9 (Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents: 12780
diff changeset
704 GCPRO1 (file);
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
705
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
706 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
707 {
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
708 /* 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
709 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
710 && !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
711 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
712 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
713 && !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
714 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
715 /* 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
716 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
717 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
718 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
719 }
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
720
19115
266915689f9e (Fload): New optional arg MUST-SUFFIX.
Richard M. Stallman <rms@gnu.org>
parents: 19020
diff changeset
721 fd = openp (Vload_path, file,
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
722 (!NILP (nosuffix) ? Qnil
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
723 : !NILP (must_suffix) ? Vload_suffixes
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
724 : Fappend (2, (tmp[0] = Vload_suffixes,
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
725 tmp[1] = default_suffixes,
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
726 tmp))),
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
727 &found, Qnil);
6392
58e075552627 (openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents: 6072
diff changeset
728 UNGCPRO;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
729 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
730
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
731 if (fd == -1)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
732 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
733 if (NILP (noerror))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
734 while (1)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
735 Fsignal (Qfile_error, Fcons (build_string ("Cannot open load file"),
13036
cd0e7903d0a9 (Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents: 12780
diff changeset
736 Fcons (file, Qnil)));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
737 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
738 return Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
739 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
740
29122
47f68a566622 (Fload): Add a comment about the meaning of
Gerd Moellmann <gerd@gnu.org>
parents: 29014
diff changeset
741 /* 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
742 if (EQ (Qt, Vuser_init_file))
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
743 Vuser_init_file = found;
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
744
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
745 /* 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
746 if (fd == -2)
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
747 {
23193
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
748 if (NILP (Fequal (found, file)))
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
749 /* 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
750 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
751 the `load' operation on FILE. */
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
752 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
753 else
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
754 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
755 if (! NILP (handler))
c12a3c0be4ee (Fload): Handle case where openp finds a magic file
Karl Heuer <kwzh@gnu.org>
parents: 23159
diff changeset
756 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
757 }
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
758
31804
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
759 /* 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
760
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
761 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
762 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
763 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
764 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
765 leads to a certain amount of ``normal'' recursion.
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
766
e57e942d4ca1 (Vrecursive_load_depth_limit): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31554
diff changeset
767 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
768 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
769 {
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
770 int count = 0;
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
771 Lisp_Object tem;
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
772 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
773 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
774 count++;
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
775 if (count > 3)
078a3890c752 (Fload): Detect recursive load error for more than 3
Richard M. Stallman <rms@gnu.org>
parents: 40931
diff changeset
776 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
777 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
778 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
779 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
780 }
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
781
46429
eb5964b8cc24 * lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents: 46375
diff changeset
782 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
783 ".elc", 4))
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
784 /* 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
785 remote and have no handler! */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
786 {
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
787 if (fd != -2)
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
788 {
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
789 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
790 int result;
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
791
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
792 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
793 {
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
794 safe_p = 0;
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
795 if (!load_dangerous_libraries)
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
796 error ("File `%s' was not compiled in Emacs",
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
797 SDATA (found));
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
798 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
799 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
800 }
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
801
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
802 compiled = 1;
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
803
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
804 GCPRO1 (efound);
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
805 efound = ENCODE_FILE (found);
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
806
33570
32e84d2e9891 (Fload): Fix #ifdef for pcc.
Dave Love <fx@gnu.org>
parents: 33442
diff changeset
807 #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
808 fmode = "rb";
33570
32e84d2e9891 (Fload): Fix #ifdef for pcc.
Dave Love <fx@gnu.org>
parents: 33442
diff changeset
809 #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
810 stat ((char *)SDATA (efound), &s1);
46429
eb5964b8cc24 * lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents: 46375
diff changeset
811 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
812 result = stat ((char *)SDATA (efound), &s2);
46429
eb5964b8cc24 * lread.c (Fload): Use SDATA, SSET.
Ken Raeburn <raeburn@raeburn.org>
parents: 46375
diff changeset
813 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
814 UNGCPRO;
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
815
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
816 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
817 {
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
818 /* 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
819 newer = 1;
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
820
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
821 /* 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
822 if (!NILP (nomessage))
ae392efb1660 (Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents: 43713
diff changeset
823 {
ae392efb1660 (Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents: 43713
diff changeset
824 Lisp_Object file;
ae392efb1660 (Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents: 43713
diff changeset
825 file = Fsubstring (found, make_number (0), make_number (-1));
ae392efb1660 (Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents: 43713
diff changeset
826 message_with_string ("Source file `%s' newer than byte-compiled file",
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
827 file, STRING_MULTIBYTE (file));
43837
ae392efb1660 (Fload): Don't assume that message_with_ntring uses the
Gerd Moellmann <gerd@gnu.org>
parents: 43713
diff changeset
828 }
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
829 }
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
830 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
831 }
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
832 else
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
833 {
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
834 /* We are loading a source file (*.el). */
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
835 if (!NILP (Vload_source_file_function))
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
836 {
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
837 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
838
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
839 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
840 emacs_close (fd);
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
841 val = call4 (Vload_source_file_function, found, file,
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
842 NILP (noerror) ? Qnil : Qt,
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
843 NILP (nomessage) ? Qnil : Qt);
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
844 return unbind_to (count, val);
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
845 }
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
846 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
847
21936
6635a9f225a9 (Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents: 21935
diff changeset
848 #ifdef WINDOWSNT
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
849 emacs_close (fd);
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
850 GCPRO1 (efound);
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
851 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
852 stream = fopen ((char *) SDATA (efound), fmode);
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
853 UNGCPRO;
21936
6635a9f225a9 (Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents: 21935
diff changeset
854 #else /* not WINDOWSNT */
6635a9f225a9 (Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents: 21935
diff changeset
855 stream = fdopen (fd, fmode);
6635a9f225a9 (Fload): Rename dosmode to fmode and use it on all
Eli Zaretskii <eliz@gnu.org>
parents: 21935
diff changeset
856 #endif /* not WINDOWSNT */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
857 if (stream == 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
858 {
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
859 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
860 error ("Failure to create stdio stream for %s", SDATA (file));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
861 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
862
18665
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
863 if (! NILP (Vpurify_flag))
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
864 Vpreloaded_file_list = Fcons (file, Vpreloaded_file_list);
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
865
16012
3b5ffd35defe (Fload): Add "source is newer" info to the "loading" and "done" messages.
Richard M. Stallman <rms@gnu.org>
parents: 15283
diff changeset
866 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
867 {
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
868 if (!safe_p)
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
869 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
870 file, 1);
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
871 else if (!compiled)
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
872 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
873 else if (newer)
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
874 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
875 file, 1);
20168
13074c25ab06 Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents: 20048
diff changeset
876 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
877 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
878 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
879
13036
cd0e7903d0a9 (Fload): Rename arg STR to FILE.
Richard M. Stallman <rms@gnu.org>
parents: 12780
diff changeset
880 GCPRO1 (file);
9361
c11cc966dc6a (Fload, load_unwind): Store stream pointer as a cons of two integers,
Karl Heuer <kwzh@gnu.org>
parents: 9358
diff changeset
881 lispstream = Fcons (Qnil, Qnil);
40690
ba7239b8872e (Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents: 40656
diff changeset
882 XSETCARFASTINT (lispstream, (EMACS_UINT)stream >> 16);
ba7239b8872e (Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents: 40656
diff changeset
883 XSETCDRFASTINT (lispstream, (EMACS_UINT)stream & 0xffff);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
884 record_unwind_protect (load_unwind, lispstream);
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
885 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
886 specbind (Qload_file_name, found);
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
887 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
888 load_descriptor_list
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
889 = Fcons (make_number (fileno (stream)), load_descriptor_list);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
890 load_in_progress++;
22420
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
891 readevalloop (Qget_file_char, stream, file, Feval, 0, Qnil, Qnil);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
892 unbind_to (count, Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
893
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
894 /* 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
895 temp = Fassoc (file, Vafter_load_alist);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
896 if (!NILP (temp))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
897 Fprogn (Fcdr (temp));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
898 UNGCPRO;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
899
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
900 if (saved_doc_string)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
901 free (saved_doc_string);
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
902 saved_doc_string = 0;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
903 saved_doc_string_size = 0;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
904
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
905 if (prev_saved_doc_string)
27852
98f55bbdbbad (Fload): Use `xfree' instead of `free'.
Gerd Moellmann <gerd@gnu.org>
parents: 27763
diff changeset
906 xfree (prev_saved_doc_string);
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
907 prev_saved_doc_string = 0;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
908 prev_saved_doc_string_size = 0;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
909
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
910 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
911 {
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
912 if (!safe_p)
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
913 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
914 file, 1);
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
915 else if (!compiled)
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
916 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
917 else if (newer)
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
918 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
919 file, 1);
20168
13074c25ab06 Indicate in messages if source code is being loaded.
Simon Marshall <simon@gnu.org>
parents: 20048
diff changeset
920 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
921 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
922 }
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
923
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
924 return Qt;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
925 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
926
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
927 static Lisp_Object
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
928 load_unwind (stream) /* used as unwind-protect function in load */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
929 Lisp_Object stream;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
930 {
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25555
diff changeset
931 fclose ((FILE *) (XFASTINT (XCAR (stream)) << 16
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25555
diff changeset
932 | XFASTINT (XCDR (stream))));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
933 if (--load_in_progress < 0) load_in_progress = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
934 return Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
935 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
936
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
937 static Lisp_Object
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
938 load_descriptor_unwind (oldlist)
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
939 Lisp_Object oldlist;
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
940 {
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
941 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
942 return Qnil;
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
943 }
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
944
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
945 /* 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
946 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
947
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
948 void
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
949 close_load_descs ()
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
950 {
15091
e05dd165b889 (close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents: 14972
diff changeset
951 #ifndef WINDOWSNT
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
952 Lisp_Object tail;
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25555
diff changeset
953 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
954 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
955 #endif
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
956 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
957
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
958 static int
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
959 complete_filename_p (pathname)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
960 Lisp_Object pathname;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
961 {
46472
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
962 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
963 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
964 || (SCHARS (pathname) > 2
9790
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
965 && IS_DEVICE_SEP (s[1]) && IS_DIRECTORY_SEP (s[2]))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
966 #ifdef ALTOS
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
967 || *s == '@'
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
968 #endif
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
969 #ifdef VMS
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
970 || index (s, ':')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
971 #endif /* VMS */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
972 );
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
973 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
974
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
975 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
976 doc: /* Search for FILENAME through PATH.
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
977 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
978 file name when searching.
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
979 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
980 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
981 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
982 (filename, path, suffixes, predicate)
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
983 Lisp_Object filename, path, suffixes, predicate;
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
984 {
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
985 Lisp_Object file;
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
986 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
987 if (NILP (predicate) && fd > 0)
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
988 close (fd);
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
989 return file;
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
990 }
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
991
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
992
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
993 /* Search for a file whose name is STR, looking in directories
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
994 in the Lisp list PATH, and trying suffixes from SUFFIX.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
995 On success, returns a file descriptor. On failure, returns -1.
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
996
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
997 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
998 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
999
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1000 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
1001 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
1002 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
1003 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
1004 are ignored).
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1005
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1006 If STOREPTR is nonzero, it points to a slot where the name of
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1007 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
1008 nil is stored there on failure.
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1009
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
1010 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
1011 but store the found remote file name in *STOREPTR. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1012
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1013 int
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1014 openp (path, str, suffixes, storeptr, predicate)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1015 Lisp_Object path, str;
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1016 Lisp_Object suffixes;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1017 Lisp_Object *storeptr;
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1018 Lisp_Object predicate;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1019 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1020 register int fd;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1021 int fn_size = 100;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1022 char buf[100];
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1023 register char *fn = buf;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1024 int absolute = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1025 int want_size;
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1026 Lisp_Object filename;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1027 struct stat st;
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1028 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
1029 Lisp_Object string, tail, encoded_fn;
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1030 int max_suffix_len = 0;
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1031
40211
19a89ce104dd (syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1032 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
1033 {
40690
ba7239b8872e (Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents: 40656
diff changeset
1034 CHECK_STRING_CAR (tail);
40211
19a89ce104dd (syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1035 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
1036 SBYTES (XCAR (tail)));
40211
19a89ce104dd (syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1037 }
19a89ce104dd (syms_of_lread)<recursive-load-depth-limit>: Raise to
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1038
31307
dd074ffca70f (openp): GCPRO local variable `filename'.
Gerd Moellmann <gerd@gnu.org>
parents: 31250
diff changeset
1039 string = filename = Qnil;
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1040 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
1041
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1042 if (storeptr)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1043 *storeptr = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1044
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1045 if (complete_filename_p (str))
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1046 absolute = 1;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1047
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1048 for (; CONSP (path); path = XCDR (path))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1049 {
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1050 filename = Fexpand_file_name (str, XCAR (path));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1051 if (!complete_filename_p (filename))
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1052 /* If there are non-absolute elts in PATH (eg ".") */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1053 /* Of course, this could conceivably lose if luser sets
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1054 default-directory to be something non-absolute... */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1055 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1056 filename = Fexpand_file_name (filename, current_buffer->directory);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1057 if (!complete_filename_p (filename))
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1058 /* Give up on this path element! */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1059 continue;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1060 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1061
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1062 /* Calculate maximum size of any filename made from
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1063 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
1064 want_size = max_suffix_len + SBYTES (filename) + 1;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1065 if (fn_size < want_size)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1066 fn = (char *) alloca (fn_size = 100 + want_size);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1067
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1068 /* Loop over suffixes. */
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1069 for (tail = NILP (suffixes) ? default_suffixes : suffixes;
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1070 CONSP (tail); tail = XCDR (tail))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1071 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1072 int lsuffix = SBYTES (XCAR (tail));
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1073 Lisp_Object handler;
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1074 int exists;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1075
16383
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1076 /* 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
1077 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
1078 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
1079 && 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
1080 && SREF (filename, 1) == ':')
16383
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1081 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1082 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
1083 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
1084 fn[SBYTES (filename) - 2] = 0;
16383
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1085 }
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1086 else
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1087 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1088 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
1089 SBYTES (filename));
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1090 fn[SBYTES (filename)] = 0;
16383
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1091 }
497b37552adb (openp): Omit /: from start of file name.
Richard M. Stallman <rms@gnu.org>
parents: 16342
diff changeset
1092
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1093 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
1094 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
1095
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1096 /* 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
1097 /* 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
1098 if (absolute)
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1099 handler = Qnil;
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1100 else
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1101 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
1102 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
1103 (load "/bar.el") where the file is actually "/bar.el.gz". */
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
1104 handler = Ffind_file_name_handler (filename, Qfile_exists_p);
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1105 string = build_string (fn);
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1106 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
1107 {
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1108 if (NILP (predicate))
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1109 exists = !NILP (Ffile_readable_p (string));
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1110 else
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1111 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
1112 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
1113 exists = 0;
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1114
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1115 if (exists)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1116 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1117 /* We succeeded; return this descriptor and filename. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1118 if (storeptr)
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1119 *storeptr = string;
8906
93f3d6f5753c (openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8828
diff changeset
1120 UNGCPRO;
33442
ec5c714ae981 (openp): Return -2 instead of 0 for the `remote file' case.
Miles Bader <miles@gnu.org>
parents: 31804
diff changeset
1121 return -2;
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1122 }
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1123 }
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1124 else
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1125 {
46472
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
1126 const char *pfn;
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1127
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1128 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
1129 pfn = SDATA (encoded_fn);
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1130 exists = (stat (pfn, &st) >= 0
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1131 && (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
1132 if (exists)
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1133 {
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1134 /* 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
1135 if (NATNUMP (predicate))
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1136 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
1137 else
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1138 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
1139
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1140 if (fd >= 0)
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1141 {
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1142 /* 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
1143 if (storeptr)
44222
885bedb3a37b (openp, Fload): Encode the file name before pasing it
Eli Zaretskii <eliz@gnu.org>
parents: 43837
diff changeset
1144 *storeptr = string;
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1145 UNGCPRO;
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1146 return fd;
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
1147 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1148 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1149 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1150 }
6392
58e075552627 (openp, Fload): GCPRO some things.
Karl Heuer <kwzh@gnu.org>
parents: 6072
diff changeset
1151 if (absolute)
8906
93f3d6f5753c (openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8828
diff changeset
1152 break;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1153 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1154
8906
93f3d6f5753c (openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8828
diff changeset
1155 UNGCPRO;
93f3d6f5753c (openp): Fix Lisp_Object vs. int problems.
Karl Heuer <kwzh@gnu.org>
parents: 8828
diff changeset
1156 return -1;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1157 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1158
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1159
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1160 /* 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
1161 into the load_history variable. The details depend on whether
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1162 the source has an associated file name or not. */
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1163
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1164 static void
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1165 build_load_history (stream, source)
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1166 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
1167 Lisp_Object source;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1168 {
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1169 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
1170 register Lisp_Object tem, tem2;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1171 register int foundit, loading;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1172
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1173 loading = stream || !NARROWED;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1174
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1175 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
1176 prev = Qnil;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1177 foundit = 0;
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1178 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
1179 {
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1180 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
1181
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1182 /* Find the feature's previous assoc list... */
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1183 if (!NILP (Fequal (source, Fcar (tem))))
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1184 {
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1185 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
1186
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1187 /* If we're loading, remove it. */
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1188 if (loading)
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1189 {
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1190 if (NILP (prev))
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1191 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
1192 else
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1193 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
1194 }
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1195
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1196 /* 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
1197 else
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1198 {
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1199 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
1200
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1201 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
1202 {
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1203 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
1204
47021
3bd4234e0844 (build_load_history): Use Fmember to see if a definition
Richard M. Stallman <rms@gnu.org>
parents: 46472
diff changeset
1205 if (NILP (Fmember (newelt, tem)))
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1206 Fsetcar (tail, Fcons (XCAR (tem),
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1207 Fcons (newelt, XCDR (tem))));
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1208
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1209 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
1210 QUIT;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1211 }
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1212 }
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1213 }
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1214 else
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1215 prev = tail;
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
1216 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
1217 QUIT;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1218 }
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1219
2901
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
1220 /* If we're loading, cons the new assoc onto the front of load-history,
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
1221 the most-recently-loaded position. Also do this if we didn't find
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
1222 an existing member for the current source. */
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
1223 if (loading || !foundit)
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
1224 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
1225 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
1226 }
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1227
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1228 Lisp_Object
30917
469d242e5f72 Prototype readevalloop, load_unwind,
Dave Love <fx@gnu.org>
parents: 29486
diff changeset
1229 unreadpure (junk) /* Used as unwind-protect function in readevalloop */
469d242e5f72 Prototype readevalloop, load_unwind,
Dave Love <fx@gnu.org>
parents: 29486
diff changeset
1230 Lisp_Object junk;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1231 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1232 read_pure = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1233 return Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1234 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1235
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1236 static Lisp_Object
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1237 readevalloop_1 (old)
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1238 Lisp_Object old;
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1239 {
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1240 load_convert_to_unibyte = ! NILP (old);
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1241 return Qnil;
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1242 }
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1243
28733
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1244 /* 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
1245 information. */
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1246
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1247 static void
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1248 end_of_file_error ()
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1249 {
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1250 Lisp_Object data;
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1251
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1252 if (STRINGP (Vload_file_name))
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1253 data = Fcons (Vload_file_name, Qnil);
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1254 else
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1255 data = Qnil;
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1256
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1257 Fsignal (Qend_of_file, data);
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1258 }
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1259
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1260 /* 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
1261 for this invocation.
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1262 READFUN, if non-nil, is used instead of `read'. */
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1263
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1264 static void
22420
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1265 readevalloop (readcharfun, stream, sourcename, evalfun, printflag, unibyte, readfun)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1266 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
1267 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
1268 Lisp_Object sourcename;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1269 Lisp_Object (*evalfun) ();
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1270 int printflag;
22420
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1271 Lisp_Object unibyte, readfun;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1272 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1273 register int c;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1274 register Lisp_Object val;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45970
diff changeset
1275 int count = SPECPDL_INDEX ();
2901
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
1276 struct gcpro gcpro1;
5185
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1277 struct buffer *b = 0;
29486
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1278 int continue_reading_p;
5185
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1279
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1280 if (BUFFERP (readcharfun))
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1281 b = XBUFFER (readcharfun);
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1282 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
1283 b = XMARKER (readcharfun)->buffer;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1284
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1285 specbind (Qstandard_input, readcharfun);
2901
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
1286 specbind (Qcurrent_load_list, Qnil);
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1287 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
1288 load_convert_to_unibyte = !NILP (unibyte);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1289
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
1290 readchar_backlog = -1;
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
1291
2901
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
1292 GCPRO1 (sourcename);
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1293
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1294 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
1295
29486
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1296 continue_reading_p = 1;
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1297 while (continue_reading_p)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1298 {
5185
52629d087993 (readevalloop): Get error if buffer being eval'd is killed.
Richard M. Stallman <rms@gnu.org>
parents: 5117
diff changeset
1299 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
1300 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
1301
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1302 instream = stream;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1303 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1304 if (c == ';')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1305 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1306 while ((c = READCHAR) != '\n' && c != -1);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1307 continue;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1308 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1309 if (c < 0) break;
10163
70b04b218216 (readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents: 10014
diff changeset
1310
70b04b218216 (readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents: 10014
diff changeset
1311 /* Ignore whitespace here, so we can detect eof. */
70b04b218216 (readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents: 10014
diff changeset
1312 if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r')
70b04b218216 (readevalloop): Ignore ^M here.
Richard M. Stallman <rms@gnu.org>
parents: 10014
diff changeset
1313 continue;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1314
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
1315 if (!NILP (Vpurify_flag) && c == '(')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1316 {
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45970
diff changeset
1317 int count1 = SPECPDL_INDEX ();
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1318 record_unwind_protect (unreadpure, Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1319 val = read_list (-1, readcharfun);
8182
94f524e0d5cd (readevalloop): Correctly unbind the unwind protect.
Richard M. Stallman <rms@gnu.org>
parents: 8083
diff changeset
1320 unbind_to (count1, Qnil);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1321 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1322 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1323 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1324 UNREAD (c);
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
1325 read_objects = Qnil;
29486
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1326 if (!NILP (readfun))
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1327 {
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1328 val = call1 (readfun, readcharfun);
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1329
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1330 /* 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
1331 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
1332 to a different value when evaluated. */
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1333 if (BUFFERP (readcharfun))
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1334 {
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1335 struct buffer *b = XBUFFER (readcharfun);
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1336 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
1337 continue_reading_p = 0;
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1338 }
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1339 }
22420
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1340 else if (! NILP (Vload_read_function))
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1341 val = call1 (Vload_read_function, readcharfun);
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1342 else
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1343 val = read_internal_start (readcharfun, Qnil, Qnil);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1344 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1345
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1346 val = (*evalfun) (val);
29486
033cf607b908 (readevalloop): If READCHARFUN sets point to ZV, arrange
Gerd Moellmann <gerd@gnu.org>
parents: 29389
diff changeset
1347
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1348 if (printflag)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1349 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1350 Vvalues = Fcons (val, Vvalues);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1351 if (EQ (Vstandard_output, Qt))
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1352 Fprin1 (val, Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1353 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1354 Fprint (val, Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1355 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1356 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1357
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1358 build_load_history (stream, sourcename);
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1359 UNGCPRO;
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1360
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1361 unbind_to (count, Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1362 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1363
25206
f2c7d7fb6198 (Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents: 25165
diff changeset
1364 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
1365 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
1366 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
1367 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
1368 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
1369 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
1370
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1371 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
1372 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
1373 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
1374 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
1375
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1376 The optional fifth argument DO-ALLOW-PRINT, if not-nil, specifies that
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1377 `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
1378
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1379 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
1380 (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
1381 Lisp_Object buffer, printflag, filename, unibyte, do_allow_print;
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1382 {
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45970
diff changeset
1383 int count = SPECPDL_INDEX ();
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1384 Lisp_Object tem, buf;
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1385
14092
279f5f3528a8 (Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 14036
diff changeset
1386 if (NILP (buffer))
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1387 buf = Fcurrent_buffer ();
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1388 else
14092
279f5f3528a8 (Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 14036
diff changeset
1389 buf = Fget_buffer (buffer);
673
6217fa6e2cab *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 672
diff changeset
1390 if (NILP (buf))
19803
7573e51f9c41 (Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents: 19626
diff changeset
1391 error ("No such buffer");
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1392
25206
f2c7d7fb6198 (Feval_buffer): New arg DO_ALLOW_PRINT.
Richard M. Stallman <rms@gnu.org>
parents: 25165
diff changeset
1393 if (NILP (printflag) && NILP (do_allow_print))
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1394 tem = Qsymbolp;
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1395 else
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1396 tem = printflag;
19803
7573e51f9c41 (Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents: 19626
diff changeset
1397
7573e51f9c41 (Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents: 19626
diff changeset
1398 if (NILP (filename))
7573e51f9c41 (Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents: 19626
diff changeset
1399 filename = XBUFFER (buf)->filename;
7573e51f9c41 (Feval_buffer): New arg FILENAME.
Richard M. Stallman <rms@gnu.org>
parents: 19626
diff changeset
1400
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1401 specbind (Qstandard_output, tem);
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1402 record_unwind_protect (save_excursion_restore, save_excursion_save ());
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1403 BUF_SET_PT (XBUFFER (buf), BUF_BEGV (XBUFFER (buf)));
22420
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1404 readevalloop (buf, 0, filename, Feval, !NILP (printflag), unibyte, Qnil);
1924
21bd3a2189d3 * keyboard.c (recursive_edit_1, command_loop_1): Pass the proper
Jim Blandy <jimb@redhat.com>
parents: 1887
diff changeset
1405 unbind_to (count, Qnil);
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1406
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1407 return Qnil;
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1408 }
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
1409
22420
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1410 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
1411 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
1412 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
1413 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
1414 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
1415 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
1416 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
1417 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
1418 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
1419 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
1420
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
1421 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
1422 (start, end, printflag, read_function)
22420
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1423 Lisp_Object start, end, printflag, read_function;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1424 {
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45970
diff changeset
1425 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
1426 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
1427
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
1428 cbuf = Fcurrent_buffer ();
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1429
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
1430 if (NILP (printflag))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1431 tem = Qsymbolp;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1432 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1433 tem = printflag;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1434 specbind (Qstandard_output, tem);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1435
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
1436 if (NILP (printflag))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1437 record_unwind_protect (save_excursion_restore, save_excursion_save ());
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1438 record_unwind_protect (save_restriction_restore, save_restriction_save ());
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1439
14092
279f5f3528a8 (Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 14036
diff changeset
1440 /* This both uses start and checks its type. */
279f5f3528a8 (Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 14036
diff changeset
1441 Fgoto_char (start);
279f5f3528a8 (Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 14036
diff changeset
1442 Fnarrow_to_region (make_number (BEGV), end);
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
1443 readevalloop (cbuf, 0, XBUFFER (cbuf)->filename, Feval,
22420
cb77a5a6a629 (readevalloop): New arg READFUN. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 22321
diff changeset
1444 !NILP (printflag), Qnil, read_function);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1445
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1446 return unbind_to (count, Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1447 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1448
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1449
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1450 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
1451 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
1452 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
1453 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
1454 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
1455 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
1456 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
1457 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
1458 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
1459 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
1460 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
1461 (stream)
12545
ccc20d466150 (Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents: 11955
diff changeset
1462 Lisp_Object stream;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1463 {
12545
ccc20d466150 (Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents: 11955
diff changeset
1464 if (NILP (stream))
ccc20d466150 (Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents: 11955
diff changeset
1465 stream = Vstandard_input;
ccc20d466150 (Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents: 11955
diff changeset
1466 if (EQ (stream, Qt))
ccc20d466150 (Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents: 11955
diff changeset
1467 stream = Qread_char;
ccc20d466150 (Fread): Rename arg READCHARFUN to STREAM.
Karl Heuer <kwzh@gnu.org>
parents: 11955
diff changeset
1468 if (EQ (stream, Qread_char))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1469 return Fread_minibuffer (build_string ("Lisp expression: "), Qnil);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1470
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1471 return read_internal_start (stream, Qnil, Qnil);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1472 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1473
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1474 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
1475 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
1476 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
1477 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
1478 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
1479 (string, start, end)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1480 Lisp_Object string, start, end;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1481 {
45577
30f1ddc50732 Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents: 45576
diff changeset
1482 Lisp_Object ret;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40558
diff changeset
1483 CHECK_STRING (string);
45577
30f1ddc50732 Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents: 45576
diff changeset
1484 /* read_internal_start sets read_from_string_index. */
30f1ddc50732 Fix previous change (oops).
Colin Walters <walters@gnu.org>
parents: 45576
diff changeset
1485 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
1486 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
1487 }
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1488
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1489 /* 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
1490 calls. */
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1491 static Lisp_Object
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1492 read_internal_start (stream, start, end)
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1493 Lisp_Object stream;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1494 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
1495 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
1496 {
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1497 Lisp_Object retval;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1498
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1499 readchar_backlog = -1;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1500 readchar_count = 0;
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
1501 new_backquote_flag = 0;
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
1502 read_objects = Qnil;
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1503 if (EQ (Vread_with_symbol_positions, Qt)
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1504 || EQ (Vread_with_symbol_positions, stream))
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1505 Vread_symbol_positions_list = Qnil;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1506
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1507 if (STRINGP (stream))
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1508 {
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1509 int startval, endval;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1510 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
1511 endval = SCHARS (stream);
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1512 else
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1513 {
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1514 CHECK_NUMBER (end);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1515 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
1516 if (endval < 0 || endval > SCHARS (stream))
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1517 args_out_of_range (stream, end);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1518 }
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1519
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1520 if (NILP (start))
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1521 startval = 0;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1522 else
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1523 {
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1524 CHECK_NUMBER (start);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1525 startval = XINT (start);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1526 if (startval < 0 || startval > endval)
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1527 args_out_of_range (stream, start);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1528 }
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1529 read_from_string_index = startval;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1530 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
1531 read_from_string_limit = endval;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1532 }
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1533
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1534 retval = read0 (stream);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1535 if (EQ (Vread_with_symbol_positions, Qt)
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1536 || EQ (Vread_with_symbol_positions, stream))
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1537 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
1538 return retval;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1539 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1540
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
1541 /* 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
1542 are not allowed. */
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
1543
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1544 static Lisp_Object
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1545 read0 (readcharfun)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1546 Lisp_Object readcharfun;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1547 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1548 register Lisp_Object val;
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
1549 int c;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1550
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
1551 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
1552 if (c)
21211
293254dae80a (read0): Swap args to Fmake_string.
Richard M. Stallman <rms@gnu.org>
parents: 20815
diff changeset
1553 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
1554 make_number (c)),
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
1555 Qnil));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1556
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1557 return val;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1558 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1559
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1560 static int read_buffer_size;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1561 static char *read_buffer;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1562
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1563 /* 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
1564 byte of multibyte form, and rest of them are read from
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1565 READCHARFUN. */
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
1566
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1567 static int
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1568 read_multibyte (c, readcharfun)
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1569 register int c;
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1570 Lisp_Object readcharfun;
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1571 {
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1572 /* We need the actual character code of this multibyte
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1573 characters. */
26866
305531847450 (readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26755
diff changeset
1574 unsigned char str[MAX_MULTIBYTE_LENGTH];
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1575 int len = 0;
36757
23382dbfb9d0 (read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents: 36256
diff changeset
1576 int bytes;
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1577
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1578 if (c < 0)
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1579 return c;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1580
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1581 str[len++] = c;
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1582 while ((c = READCHAR) >= 0xA0
26866
305531847450 (readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26755
diff changeset
1583 && len < MAX_MULTIBYTE_LENGTH)
45554
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 str[len++] = c;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1586 readchar_count--;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
1587 }
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1588 UNREAD (c);
36757
23382dbfb9d0 (read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents: 36256
diff changeset
1589 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
1590 return STRING_CHAR (str, len);
23382dbfb9d0 (read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents: 36256
diff changeset
1591 /* 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
1592 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
1593 while (--len > 0)
23382dbfb9d0 (read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents: 36256
diff changeset
1594 UNREAD (str[len]);
23382dbfb9d0 (read_multibyte): Check the validity of multibyte sequence. If
Kenichi Handa <handa@m17n.org>
parents: 36256
diff changeset
1595 return str[0];
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1596 }
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1597
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1598 /* 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
1599 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
1600 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
1601 Otherwise store 0 into *BYTEREP. */
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
1602
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1603 static int
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1604 read_escape (readcharfun, stringp, byterep)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1605 Lisp_Object readcharfun;
20669
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
1606 int stringp;
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1607 int *byterep;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1608 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1609 register int c = READCHAR;
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1610
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1611 *byterep = 0;
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1612
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1613 switch (c)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1614 {
15091
e05dd165b889 (close_load_descs) [WINDOWS_NT]: Don't actually do anything.
Richard M. Stallman <rms@gnu.org>
parents: 14972
diff changeset
1615 case -1:
40931
50b111aed6d5 (read_escape): Use end_of_file_error for reporting eof.
Richard M. Stallman <rms@gnu.org>
parents: 40796
diff changeset
1616 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
1617
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1618 case 'a':
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
1619 return '\007';
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1620 case 'b':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1621 return '\b';
2018
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1622 case 'd':
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1623 return 0177;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1624 case 'e':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1625 return 033;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1626 case 'f':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1627 return '\f';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1628 case 'n':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1629 return '\n';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1630 case 'r':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1631 return '\r';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1632 case 't':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1633 return '\t';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1634 case 'v':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1635 return '\v';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1636 case '\n':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1637 return -1;
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
1638 case ' ':
20669
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
1639 if (stringp)
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
1640 return -1;
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
1641 return ' ';
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1642
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1643 case 'M':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1644 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1645 if (c != '-')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1646 error ("Invalid escape character syntax");
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1647 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1648 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1649 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
1650 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
1651
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1652 case 'S':
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1653 c = READCHAR;
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1654 if (c != '-')
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1655 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
1656 c = READCHAR;
7c970ef8949d (read_escape): Handle M-, C- and S- for new convention.
Richard M. Stallman <rms@gnu.org>
parents: 1966
diff changeset
1657 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1658 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
1659 return c | shift_modifier;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1660
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1661 case 'H':
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1662 c = READCHAR;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1663 if (c != '-')
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1664 error ("Invalid escape character syntax");
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1665 c = READCHAR;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1666 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1667 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
1668 return c | hyper_modifier;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1669
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1670 case 'A':
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1671 c = READCHAR;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1672 if (c != '-')
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1673 error ("Invalid escape character syntax");
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1674 c = READCHAR;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1675 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1676 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
1677 return c | alt_modifier;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1678
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1679 case 's':
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1680 c = READCHAR;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1681 if (c != '-')
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1682 error ("Invalid escape character syntax");
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1683 c = READCHAR;
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1684 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1685 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
1686 return c | super_modifier;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1687
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1688 case 'C':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1689 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1690 if (c != '-')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1691 error ("Invalid escape character syntax");
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1692 case '^':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1693 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1694 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1695 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
1696 if ((c & ~CHAR_MODIFIER_MASK) == '?')
1fb18e7e3f35 (read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents: 25206
diff changeset
1697 return 0177 | (c & CHAR_MODIFIER_MASK);
1fb18e7e3f35 (read_escape): For Control modifier, pay attention to
Kenichi Handa <handa@m17n.org>
parents: 25206
diff changeset
1698 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
1699 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
1700 /* 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
1701 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
1702 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
1703 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
1704 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
1705 return (c & (037 | ~0177));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1706 else
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
1707 return c | ctrl_modifier;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1708
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1709 case '0':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1710 case '1':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1711 case '2':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1712 case '3':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1713 case '4':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1714 case '5':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1715 case '6':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1716 case '7':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1717 /* An octal escape, as in ANSI C. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1718 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1719 register int i = c - '0';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1720 register int count = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1721 while (++count < 3)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1722 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1723 if ((c = READCHAR) >= '0' && c <= '7')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1724 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1725 i *= 8;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1726 i += c - '0';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1727 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1728 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1729 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1730 UNREAD (c);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1731 break;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1732 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1733 }
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1734
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1735 *byterep = 1;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1736 return i;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1737 }
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 'x':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1740 /* A hex escape, as in ANSI C. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1741 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1742 int i = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1743 while (1)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1744 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1745 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1746 if (c >= '0' && c <= '9')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1747 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1748 i *= 16;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1749 i += c - '0';
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1750 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1751 else if ((c >= 'a' && c <= 'f')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1752 || (c >= 'A' && c <= 'F'))
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1753 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1754 i *= 16;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1755 if (c >= 'a' && c <= 'f')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1756 i += c - 'a' + 10;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1757 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1758 i += c - 'A' + 10;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1759 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1760 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1761 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1762 UNREAD (c);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1763 break;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1764 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1765 }
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1766
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
1767 *byterep = 2;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1768 return i;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1769 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1770
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1771 default:
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1772 if (BASE_LEADING_CODE_P (c))
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
1773 c = read_multibyte (c, readcharfun);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1774 return c;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1775 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1776 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1777
28165
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1778
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1779 /* Read an integer in radix RADIX using READCHARFUN to read
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1780 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
1781 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
1782 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
1783 range. */
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1784
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1785 static Lisp_Object
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1786 read_integer (readcharfun, radix)
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1787 Lisp_Object readcharfun;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1788 int radix;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1789 {
35543
c809110e1433 (read_integer): Use type EMACS_INT instead of int.
Gerd Moellmann <gerd@gnu.org>
parents: 34604
diff changeset
1790 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
1791 EMACS_INT number = 0;
28165
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1792
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1793 if (radix < 2 || radix > 36)
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1794 invalid_p = 1;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1795 else
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1796 {
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1797 number = ndigits = invalid_p = 0;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1798 sign = 1;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1799
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1800 c = READCHAR;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1801 if (c == '-')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1802 {
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1803 c = READCHAR;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1804 sign = -1;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1805 }
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1806 else if (c == '+')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1807 c = READCHAR;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1808
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1809 while (c >= 0)
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1810 {
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1811 int digit;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1812
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1813 if (c >= '0' && c <= '9')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1814 digit = c - '0';
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1815 else if (c >= 'a' && c <= 'z')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1816 digit = c - 'a' + 10;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1817 else if (c >= 'A' && c <= 'Z')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1818 digit = c - 'A' + 10;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1819 else
28190
aa79cfcecd73 (read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents: 28165
diff changeset
1820 {
aa79cfcecd73 (read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents: 28165
diff changeset
1821 UNREAD (c);
aa79cfcecd73 (read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents: 28165
diff changeset
1822 break;
aa79cfcecd73 (read_integer): Unread the last char not consumed.
Gerd Moellmann <gerd@gnu.org>
parents: 28165
diff changeset
1823 }
28165
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1824
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1825 if (digit < 0 || digit >= radix)
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1826 invalid_p = 1;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1827
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1828 number = radix * number + digit;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1829 ++ndigits;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1830 c = READCHAR;
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1831 }
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1832 }
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1833
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1834 if (ndigits == 0 || invalid_p)
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1835 {
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1836 char buf[50];
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1837 sprintf (buf, "integer, radix %d", radix);
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1838 Fsignal (Qinvalid_read_syntax, Fcons (build_string (buf), Qnil));
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1839 }
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1840
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1841 return make_number (sign * number);
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1842 }
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1843
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
1844
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1845 /* Convert unibyte text in read_buffer to multibyte.
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1846
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1847 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
1848 the pointer *END points after the end of read_buffer.
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1849
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1850 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
1851 of the conversion, reallocate it and adjust *P and *END.
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1852
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1853 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
1854 return in *NCHARS the number of characters in the converted
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1855 text. */
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1856
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1857 static void
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1858 to_multibyte (p, end, nchars)
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1859 char **p, **end;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1860 int *nchars;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1861 {
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1862 int nbytes;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1863
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1864 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
1865 if (read_buffer_size < 2 * nbytes)
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1866 {
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1867 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
1868 read_buffer_size = 2 * max (read_buffer_size, nbytes);
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1869 read_buffer = (char *) xrealloc (read_buffer, read_buffer_size);
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1870 *p = read_buffer + offset;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1871 *end = read_buffer + read_buffer_size;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1872 }
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1873
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1874 if (nbytes != *nchars)
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1875 nbytes = str_as_multibyte (read_buffer, read_buffer_size,
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1876 *p - read_buffer, nchars);
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1877
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1878 *p = read_buffer + nbytes;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1879 }
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1880
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
1881
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
1882 /* 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
1883 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
1884 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
1885
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
1886 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
1887
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1888 static Lisp_Object
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
1889 read1 (readcharfun, pch, first_in_list)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1890 register Lisp_Object readcharfun;
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
1891 int *pch;
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
1892 int first_in_list;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1893 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1894 register int c;
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
1895 int uninterned_symbol = 0;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
1896
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
1897 *pch = 0;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1898
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1899 retry:
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1900
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1901 c = READCHAR;
28733
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1902 if (c < 0)
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
1903 end_of_file_error ();
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1904
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1905 switch (c)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1906 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1907 case '(':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1908 return read_list (0, readcharfun);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1909
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1910 case '[':
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
1911 return read_vector (readcharfun, 0);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1912
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1913 case ')':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1914 case ']':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1915 {
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
1916 *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
1917 return Qnil;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1918 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1919
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1920 case '#':
373
7c6f74ef31a3 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 364
diff changeset
1921 c = READCHAR;
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1922 if (c == '^')
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1923 {
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1924 c = READCHAR;
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1925 if (c == '[')
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1926 {
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1927 Lisp_Object tmp;
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
1928 tmp = read_vector (readcharfun, 0);
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1929 if (XVECTOR (tmp)->size < CHAR_TABLE_STANDARD_SLOTS
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1930 || XVECTOR (tmp)->size > CHAR_TABLE_STANDARD_SLOTS + 10)
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1931 error ("Invalid size char-table");
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1932 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
1933 XCHAR_TABLE (tmp)->top = Qt;
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1934 return tmp;
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1935 }
17325
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
1936 else if (c == '^')
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
1937 {
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
1938 c = READCHAR;
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
1939 if (c == '[')
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
1940 {
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
1941 Lisp_Object tmp;
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
1942 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
1943 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
1944 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
1945 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
1946 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
1947 return tmp;
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
1948 }
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
1949 Fsignal (Qinvalid_read_syntax,
c19c552c486f (read1): Adjusted for the new structure of Lisp_Char_Table.
Kenichi Handa <handa@m17n.org>
parents: 17125
diff changeset
1950 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
1951 }
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1952 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
1953 }
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1954 if (c == '&')
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1955 {
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1956 Lisp_Object length;
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1957 length = read1 (readcharfun, pch, first_in_list);
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1958 c = READCHAR;
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1959 if (c == '"')
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1960 {
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1961 Lisp_Object tmp, val;
16925
2b35e4ccbb32 (read1): Round size of bool-vector properly.
Richard M. Stallman <rms@gnu.org>
parents: 16856
diff changeset
1962 int size_in_chars = ((XFASTINT (length) + BITS_PER_CHAR - 1)
13363
941c37982f37 (BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG):
Karl Heuer <kwzh@gnu.org>
parents: 13235
diff changeset
1963 / BITS_PER_CHAR);
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1964
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1965 UNREAD (c);
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1966 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
1967 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
1968 /* 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
1969 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
1970 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
1971 && ! (XFASTINT (length)
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1972 == (SCHARS (tmp) - 1) * BITS_PER_CHAR))
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1973 Fsignal (Qinvalid_read_syntax,
16856
f838ff9a4d39 Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 16855
diff changeset
1974 Fcons (make_string ("#&...", 5), Qnil));
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1975
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1976 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
1977 bcopy (SDATA (tmp), XBOOL_VECTOR (val)->data,
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1978 size_in_chars);
21935
8dad06385435 (read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents: 21911
diff changeset
1979 /* Clear the extraneous bits in the last byte. */
8dad06385435 (read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents: 21911
diff changeset
1980 if (XINT (length) != size_in_chars * BITS_PER_CHAR)
8dad06385435 (read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents: 21911
diff changeset
1981 XBOOL_VECTOR (val)->data[size_in_chars - 1]
8dad06385435 (read1): Clear out extraneous bits at end of bool-vector.
Eli Zaretskii <eliz@gnu.org>
parents: 21911
diff changeset
1982 &= (1 << (XINT (length) % BITS_PER_CHAR)) - 1;
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1983 return val;
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1984 }
16856
f838ff9a4d39 Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 16855
diff changeset
1985 Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#&...", 5),
16855
d10bb3a79eff (read1): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 16487
diff changeset
1986 Qnil));
13146
6182d95acd14 (read1): Handle chartables and boolvectors.
Richard M. Stallman <rms@gnu.org>
parents: 13036
diff changeset
1987 }
373
7c6f74ef31a3 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 364
diff changeset
1988 if (c == '[')
7c6f74ef31a3 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 364
diff changeset
1989 {
7c6f74ef31a3 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 364
diff changeset
1990 /* 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
1991 build them using function calls. */
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
1992 Lisp_Object tmp;
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
1993 tmp = read_vector (readcharfun, 1);
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
1994 return Fmake_byte_code (XVECTOR (tmp)->size,
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
1995 XVECTOR (tmp)->contents);
373
7c6f74ef31a3 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 364
diff changeset
1996 }
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
1997 if (c == '(')
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
1998 {
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
1999 Lisp_Object tmp;
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2000 struct gcpro gcpro1;
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
2001 int ch;
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2002
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2003 /* 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
2004 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
2005 if (ch != 0 || !STRINGP (tmp))
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2006 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
2007 GCPRO1 (tmp);
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2008 /* Read the intervals and their properties. */
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2009 while (1)
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2010 {
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2011 Lisp_Object beg, end, plist;
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2012
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2013 beg = read1 (readcharfun, &ch, 0);
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
2014 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
2015 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
2016 break;
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2017 if (ch == 0)
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2018 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
2019 if (ch == 0)
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2020 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
2021 if (ch)
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2022 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
2023 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
2024 Qnil));
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2025 Fset_text_properties (beg, end, plist, tmp);
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2026 }
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2027 UNGCPRO;
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2028 return tmp;
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2029 }
26404
c3c9cc1c2379 Remove USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
2030
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2031 /* #@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
2032 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
2033 and function definitions. */
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2034 if (c == '@')
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2035 {
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2036 int i, nskip = 0;
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2037
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2038 /* Read a decimal integer. */
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2039 while ((c = READCHAR) >= 0
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2040 && c >= '0' && c <= '9')
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2041 {
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2042 nskip *= 10;
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2043 nskip += c - '0';
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2044 }
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2045 if (c >= 0)
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2046 UNREAD (c);
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2047
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2048 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
2049 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2050 /* 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
2051 record the last string that we skipped,
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2052 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
2053
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2054 /* But first exchange saved_doc_string
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2055 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
2056 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2057 char *temp = saved_doc_string;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2058 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
2059 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
2060 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
2061
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2062 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
2063 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
2064 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
2065 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
2066
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2067 prev_saved_doc_string = temp;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2068 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
2069 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
2070 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
2071 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2072
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2073 if (saved_doc_string_size == 0)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2074 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2075 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
2076 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
2077 }
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2078 if (nskip > saved_doc_string_size)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2079 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2080 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
2081 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
2082 saved_doc_string_size);
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2083 }
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2084
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26072
diff changeset
2085 saved_doc_string_position = file_tell (instream);
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2086
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2087 /* Copy that many characters into saved_doc_string. */
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2088 for (i = 0; i < nskip && c >= 0; i++)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2089 saved_doc_string[i] = c = READCHAR;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2090
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2091 saved_doc_string_length = i;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2092 }
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2093 else
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2094 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2095 /* Skip that many characters. */
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2096 for (i = 0; i < nskip && c >= 0; i++)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2097 c = READCHAR;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2098 }
20048
5324d8b2322b (read_list): Don't recognize Vload_file_name
Karl Heuer <kwzh@gnu.org>
parents: 20024
diff changeset
2099
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2100 goto retry;
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2101 }
47184
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2102 if (c == '!')
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2103 {
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2104 /* #! 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
2105 Skip the first line. */
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2106 while (c != '\n')
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2107 c = READCHAR;
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2108 goto retry;
04a4d5eda995 (read1): Handle #! by skipping the line.
Richard M. Stallman <rms@gnu.org>
parents: 47021
diff changeset
2109 }
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2110 if (c == '$')
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2111 return Vload_file_name;
13235
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
2112 if (c == '\'')
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
2113 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
2114 /* #: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
2115 if (c == ':')
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2116 {
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2117 uninterned_symbol = 1;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2118 c = READCHAR;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2119 goto default_label;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2120 }
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2121 /* 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
2122 if (c >= '0' && c <= '9')
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2123 {
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2124 int n = 0;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2125 Lisp_Object tem;
13235
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
2126
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2127 /* Read a non-negative integer. */
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2128 while (c >= '0' && c <= '9')
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2129 {
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2130 n *= 10;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2131 n += c - '0';
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2132 c = READCHAR;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2133 }
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2134 /* #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
2135 if (c == '=')
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2136 {
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2137 /* 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
2138 Lisp_Object placeholder;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2139 Lisp_Object cell;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2140
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2141 placeholder = Fcons(Qnil, Qnil);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2142 cell = Fcons (make_number (n), placeholder);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2143 read_objects = Fcons (cell, read_objects);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2144
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2145 /* Read the object itself. */
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2146 tem = read0 (readcharfun);
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2147
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2148 /* 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
2149 substitute_object_in_subtree (tem, placeholder);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2150
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2151 /* ...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
2152 Fsetcdr (cell, tem);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2153
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2154 return tem;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2155 }
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2156 /* #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
2157 if (c == '#')
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2158 {
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2159 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
2160 if (CONSP (tem))
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2161 return XCDR (tem);
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2162 /* Fall through to error message. */
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2163 }
28165
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2164 else if (c == 'r' || c == 'R')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2165 return read_integer (readcharfun, n);
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2166
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2167 /* Fall through to error message. */
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2168 }
28165
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2169 else if (c == 'x' || c == 'X')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2170 return read_integer (readcharfun, 16);
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2171 else if (c == 'o' || c == 'O')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2172 return read_integer (readcharfun, 8);
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2173 else if (c == 'b' || c == 'B')
9a61aec440a7 (read_integer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28156
diff changeset
2174 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
2175
373
7c6f74ef31a3 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 364
diff changeset
2176 UNREAD (c);
1966
bcc34323a475 (read1--strings with properties case):
Richard M. Stallman <rms@gnu.org>
parents: 1924
diff changeset
2177 Fsignal (Qinvalid_read_syntax, Fcons (make_string ("#", 1), Qnil));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2178
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2179 case ';':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2180 while ((c = READCHAR) >= 0 && c != '\n');
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2181 goto retry;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2182
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2183 case '\'':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2184 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2185 return Fcons (Qquote, Fcons (read0 (readcharfun), Qnil));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2186 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2187
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2188 case '`':
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2189 if (first_in_list)
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2190 goto default_label;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2191 else
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2192 {
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2193 Lisp_Object value;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2194
40784
d57f74c55909 (read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40690
diff changeset
2195 new_backquote_flag++;
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2196 value = read0 (readcharfun);
40784
d57f74c55909 (read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40690
diff changeset
2197 new_backquote_flag--;
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2198
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2199 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
2200 }
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2201
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2202 case ',':
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2203 if (new_backquote_flag)
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2204 {
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2205 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
2206 Lisp_Object value;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2207 int ch = READCHAR;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2208
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2209 if (ch == '@')
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2210 comma_type = Qcomma_at;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2211 else if (ch == '.')
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2212 comma_type = Qcomma_dot;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2213 else
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2214 {
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2215 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
2216 comma_type = Qcomma;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2217 }
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2218
40784
d57f74c55909 (read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40690
diff changeset
2219 new_backquote_flag--;
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2220 value = read0 (readcharfun);
40784
d57f74c55909 (read1): Fix behavior with nested backquoting.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40690
diff changeset
2221 new_backquote_flag++;
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2222 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
2223 }
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2224 else
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2225 goto default_label;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2226
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2227 case '?':
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2228 {
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2229 int discard;
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2230
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2231 c = READCHAR;
28733
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
2232 if (c < 0)
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
2233 end_of_file_error ();
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2234
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2235 if (c == '\\')
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2236 c = read_escape (readcharfun, 0, &discard);
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
2237 else if (BASE_LEADING_CODE_P (c))
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
2238 c = read_multibyte (c, readcharfun);
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2239
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2240 return make_number (c);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2241 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2242
22103
cbec85828fad (readchar): Use readchar_backlog again
Richard M. Stallman <rms@gnu.org>
parents: 21982
diff changeset
2243 case '"':
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2244 {
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2245 char *p = read_buffer;
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2246 char *end = read_buffer + read_buffer_size;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2247 register int c;
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2248 /* 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
2249 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
2250 int force_multibyte = 0;
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2251 /* 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
2252 a single-byte character. */
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
2253 int force_singlebyte = 0;
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2254 /* 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
2255 int is_multibyte = 0;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2256 int cancel = 0;
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2257 int nchars = 0;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2258
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2259 while ((c = READCHAR) >= 0
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2260 && c != '\"')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2261 {
26866
305531847450 (readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26755
diff changeset
2262 if (end - p < MAX_MULTIBYTE_LENGTH)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2263 {
34362
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2264 int offset = p - read_buffer;
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2265 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
2266 read_buffer_size *= 2);
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2267 p = read_buffer + offset;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2268 end = read_buffer + read_buffer_size;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2269 }
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2270
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2271 if (c == '\\')
19240
c962562027d4 (read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents: 19115
diff changeset
2272 {
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2273 int byterep;
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2274
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2275 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
2276
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2277 /* 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
2278 if (c == -1)
19240
c962562027d4 (read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents: 19115
diff changeset
2279 {
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2280 if (p == read_buffer)
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2281 cancel = 1;
19240
c962562027d4 (read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents: 19115
diff changeset
2282 continue;
c962562027d4 (read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents: 19115
diff changeset
2283 }
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2284
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2285 if (byterep == 1)
20669
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
2286 force_singlebyte = 1;
42424
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2287 else if (byterep == 2)
87b4443a330e (read_escape): New arg BYTEREP for reporting whether
Richard M. Stallman <rms@gnu.org>
parents: 42206
diff changeset
2288 force_multibyte = 1;
19240
c962562027d4 (read1): Handle read_escape making a multibyte character.
Richard M. Stallman <rms@gnu.org>
parents: 19115
diff changeset
2289 }
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2290
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2291 /* 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
2292 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
2293 force_multibyte = 1;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2294
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2295 /* 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
2296 convert the text accumulated thus far. */
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2297 if (force_multibyte && ! is_multibyte)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2298 {
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2299 is_multibyte = 1;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2300 to_multibyte (&p, &end, &nchars);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2301 }
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2302
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2303 /* Allow `\C- ' and `\C-?'. */
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2304 if (c == (CHAR_CTL | ' '))
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2305 c = 0;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2306 else if (c == (CHAR_CTL | '?'))
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2307 c = 127;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2308
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2309 if (c & CHAR_SHIFT)
6470
651b49e52c9e (read1): Check for invalid modifier bits in a string.
Karl Heuer <kwzh@gnu.org>
parents: 6392
diff changeset
2310 {
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2311 /* 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
2312 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
2313 c &= ~CHAR_SHIFT;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2314 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
2315 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
2316 }
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2317
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2318 if (c & CHAR_META)
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2319 /* 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
2320 c = (c & ~CHAR_META) | 0x80;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2321 if (c & CHAR_MODIFIER_MASK)
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2322 error ("Invalid modifier in string");
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2323
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2324 if (is_multibyte)
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2325 p += CHAR_STRING (c, p);
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2326 else
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2327 *p++ = c;
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2328
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2329 nchars++;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2330 }
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2331
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2332 if (c < 0)
28733
3234d64a07bf (end_of_file_error): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28633
diff changeset
2333 end_of_file_error ();
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2334
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2335 /* If purifying, and string starts with \ newline,
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2336 return zero instead. This is for doc strings
604
63a8e7b3c547 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
2337 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
2338 if (!NILP (Vpurify_flag) && NILP (Vdoc_file_name) && cancel)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2339 return make_number (0);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2340
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2341 if (is_multibyte || force_singlebyte)
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2342 ;
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2343 else if (load_convert_to_unibyte)
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2344 {
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2345 Lisp_Object string;
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2346 to_multibyte (&p, &end, &nchars);
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2347 if (p - read_buffer != nchars)
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2348 {
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2349 string = make_multibyte_string (read_buffer, nchars,
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2350 p - read_buffer);
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2351 return Fstring_make_unibyte (string);
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2352 }
43080
a6382f0fcb2a (read1): Redesign strategy for force_multibyte and
Richard M. Stallman <rms@gnu.org>
parents: 42797
diff changeset
2353 /* 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
2354 is_multibyte = 0;
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
2355 }
22889
beddbcd21407 (read1): In reading a string, treat Qlambda like Qget_file_char.
Richard M. Stallman <rms@gnu.org>
parents: 22691
diff changeset
2356 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
2357 || EQ (readcharfun, Qlambda))
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2358 {
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2359 /* Nowadays, reading directly from a file is used only for
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2360 compiled Emacs Lisp files, and those always use the
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2361 Emacs internal encoding. Meanwhile, Qlambda is used
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2362 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
2363 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
2364 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
2365 (to_multibyte is a no-op if not.) */
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2366 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
2367 is_multibyte = (p - read_buffer) != nchars;
40503
8f64b39c2a12 (to_multibyte): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 40211
diff changeset
2368 }
20669
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
2369 else
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2370 /* 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
2371 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
2372 ;
20669
fa76057543dd (read1): Escape codes can force multibyte or single-byte.
Karl Heuer <kwzh@gnu.org>
parents: 20609
diff changeset
2373
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2374 /* 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
2375 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
2376 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
2377 READCHAR *does* read multibyte characters from buffers. */
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2378 /* readchar_count -= (p - read_buffer) - nchars; */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2379 if (read_pure)
21251
05fbf4f5b14f (read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
2380 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
2381 is_multibyte);
21251
05fbf4f5b14f (read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
2382 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
2383 is_multibyte);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2384 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2385
762
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2386 case '.':
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2387 {
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2388 int next_char = READCHAR;
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2389 UNREAD (next_char);
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2390
28746
42f2ded9d9db (read1): Don't treat period followed by certain
Gerd Moellmann <gerd@gnu.org>
parents: 28733
diff changeset
2391 if (next_char <= 040
42f2ded9d9db (read1): Don't treat period followed by certain
Gerd Moellmann <gerd@gnu.org>
parents: 28733
diff changeset
2392 || index ("\"'`,(", next_char))
762
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2393 {
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2394 *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
2395 return Qnil;
762
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2396 }
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2397
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2398 /* Otherwise, we fall through! Note that the atom-reading loop
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2399 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
2400 try to UNREAD two characters in a row. */
852a2f5838da *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
2401 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2402 default:
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2403 default_label:
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2404 if (c <= 040) goto retry;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2405 {
31315
08bb5394dee1 (read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents: 31307
diff changeset
2406 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
2407 int quoted = 0;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2408
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2409 {
31315
08bb5394dee1 (read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents: 31307
diff changeset
2410 char *end = read_buffer + read_buffer_size;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2411
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2412 while (c > 040
31315
08bb5394dee1 (read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents: 31307
diff changeset
2413 && !(c == '\"' || c == '\'' || c == ';'
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2414 || c == '(' || c == ')'
31315
08bb5394dee1 (read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents: 31307
diff changeset
2415 || c == '[' || c == ']' || c == '#'))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2416 {
26866
305531847450 (readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26755
diff changeset
2417 if (end - p < MAX_MULTIBYTE_LENGTH)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2418 {
34362
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2419 int offset = p - read_buffer;
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2420 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
2421 read_buffer_size *= 2);
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2422 p = read_buffer + offset;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2423 end = read_buffer + read_buffer_size;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2424 }
31315
08bb5394dee1 (read1): Accept `?' as symbol constituent, for
Gerd Moellmann <gerd@gnu.org>
parents: 31307
diff changeset
2425
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2426 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
2427 {
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2428 c = READCHAR;
34604
e2ad3c71947b (read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents: 34428
diff changeset
2429 if (c == -1)
e2ad3c71947b (read1): Recognize end of file after `\\'.
Gerd Moellmann <gerd@gnu.org>
parents: 34428
diff changeset
2430 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
2431 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
2432 }
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2433
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2434 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
2435 p += CHAR_STRING (c, p);
21724
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2436 else
12a826a37249 (read_from_string_index_byte): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21677
diff changeset
2437 *p++ = c;
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2438
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2439 c = READCHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2440 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2441
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2442 if (p == end)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2443 {
34362
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2444 int offset = p - read_buffer;
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2445 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
2446 read_buffer_size *= 2);
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2447 p = read_buffer + offset;
020c1a0abaf6 (read1): Change the way buffers are reallocated to be
Gerd Moellmann <gerd@gnu.org>
parents: 33570
diff changeset
2448 end = read_buffer + read_buffer_size;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2449 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2450 *p = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2451 if (c >= 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2452 UNREAD (c);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2453 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2454
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
2455 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
2456 {
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2457 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
2458 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
2459 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
2460 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
2461 /* 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
2462 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
2463 {
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2464 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
2465 /* 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
2466 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
2467 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
2468 /* 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
2469 {
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2470 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
2471 p1[-1] = '\0';
11699
eb4b842ee557 (read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents: 11683
diff changeset
2472 if (sizeof (int) == sizeof (EMACS_INT))
eb4b842ee557 (read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents: 11683
diff changeset
2473 XSETINT (val, atoi (read_buffer));
eb4b842ee557 (read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents: 11683
diff changeset
2474 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
2475 XSETINT (val, atol (read_buffer));
eb4b842ee557 (read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents: 11683
diff changeset
2476 else
eb4b842ee557 (read1): Handle long EMACS_INT in atol.
Richard M. Stallman <rms@gnu.org>
parents: 11683
diff changeset
2477 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
2478 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
2479 }
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2480 }
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2481 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
2482 {
23159
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2483 /* 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
2484 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
2485 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
2486 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
2487
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2488 double value;
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2489
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2490 /* 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
2491 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
2492 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
2493 drops the sign. */
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2494 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
2495
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2496 /* 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
2497 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
2498 switch (p[-1])
20815
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2499 {
23159
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2500 case 'F':
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2501 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
2502 break;
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2503 case 'N':
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2504 value = zero / zero;
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2505 break;
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2506 default:
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2507 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
2508 break;
20815
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2509 }
23159
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2510
b468525b44b8 (read1): Don't assume that atof ("-0.0") yields -0.0.
Paul Eggert <eggert@twinsun.com>
parents: 23056
diff changeset
2511 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
2512 }
5017
9c277d938ccd (read1): If token has a \, don't treat it as a number.
Richard M. Stallman <rms@gnu.org>
parents: 4701
diff changeset
2513 }
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2514 {
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2515 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
2516 : intern (read_buffer);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2517 if (EQ (Vread_with_symbol_positions, Qt)
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2518 || EQ (Vread_with_symbol_positions, readcharfun))
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2519 Vread_symbol_positions_list =
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2520 /* 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
2521 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
2522 deal, though. */
45747
2049fa380cb1 (read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45577
diff changeset
2523 Fcons (Fcons (result,
2049fa380cb1 (read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45577
diff changeset
2524 make_number (readchar_count
2049fa380cb1 (read_integer): Remove unused var `tem'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45577
diff changeset
2525 - XFASTINT (Flength (Fsymbol_name (result))))),
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2526 Vread_symbol_positions_list);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2527 return result;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
2528 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2529 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2530 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2531 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2532
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2533
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2534 /* 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
2535 static Lisp_Object seen_list;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2536
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2537 static void
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2538 substitute_object_in_subtree (object, placeholder)
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2539 Lisp_Object object;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2540 Lisp_Object placeholder;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2541 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2542 Lisp_Object check_object;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2543
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2544 /* 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
2545 seen_list = Qnil;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2546
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2547 /* Make all the substitutions. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2548 check_object
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2549 = substitute_object_recurse (object, placeholder, object);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2550
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2551 /* 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
2552 seen_list = Qnil;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2553
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2554 /* 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
2555 original. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2556 if (!EQ (check_object, object))
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2557 error ("Unexpected mutation error in reader");
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2558 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2559
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2560 /* 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
2561 #define SUBSTITUTE(get_val, set_val) \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2562 { \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2563 Lisp_Object old_value = get_val; \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2564 Lisp_Object true_value \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2565 = substitute_object_recurse (object, placeholder,\
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2566 old_value); \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2567 \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2568 if (!EQ (old_value, true_value)) \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2569 { \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2570 set_val; \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2571 } \
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2572 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2573
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2574 static Lisp_Object
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2575 substitute_object_recurse (object, placeholder, subtree)
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2576 Lisp_Object object;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2577 Lisp_Object placeholder;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2578 Lisp_Object subtree;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2579 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2580 /* 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
2581 if (EQ (placeholder, subtree))
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2582 return object;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2583
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2584 /* 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
2585 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
2586 return subtree;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2587
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2588 /* 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
2589 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
2590 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
2591 read_objects. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2592 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
2593 seen_list = Fcons (subtree, seen_list);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2594
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2595 /* Recurse according to subtree's type.
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2596 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
2597 switch (XTYPE (subtree))
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2598 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2599 case Lisp_Vectorlike:
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2600 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2601 int i;
28507
b6f06a755c7d make_number/XINT/XUINT conversions; EQ/== fixes; ==Qnil -> NILP
Ken Raeburn <raeburn@raeburn.org>
parents: 28388
diff changeset
2602 int length = XINT (Flength(subtree));
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2603 for (i = 0; i < length; i++)
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2604 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2605 Lisp_Object idx = make_number (i);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2606 SUBSTITUTE (Faref (subtree, idx),
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2607 Faset (subtree, idx, true_value));
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2608 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2609 return subtree;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2610 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2611
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2612 case Lisp_Cons:
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2613 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2614 SUBSTITUTE (Fcar_safe (subtree),
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
2615 Fsetcar (subtree, true_value));
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2616 SUBSTITUTE (Fcdr_safe (subtree),
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
2617 Fsetcdr (subtree, true_value));
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2618 return subtree;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2619 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2620
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2621 case Lisp_String:
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2622 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2623 /* 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
2624 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
2625
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2626 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
2627 Lisp_Object arg = Fcons (object, placeholder);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2628
39857
6235c0f8e52c (substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39816
diff changeset
2629 traverse_intervals_noorder (root_interval,
6235c0f8e52c (substitute_object_recurse): Use traverse_intervals_noorder.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39816
diff changeset
2630 &substitute_in_interval, arg);
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2631
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2632 return subtree;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2633 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2634
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2635 /* 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
2636 default:
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2637 return subtree;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2638 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2639 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2640
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2641 /* Helper function for substitute_object_recurse. */
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2642 static void
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2643 substitute_in_interval (interval, arg)
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2644 INTERVAL interval;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2645 Lisp_Object arg;
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2646 {
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2647 Lisp_Object object = Fcar (arg);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2648 Lisp_Object placeholder = Fcdr (arg);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2649
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2650 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
2651 }
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2652
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
2653
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2654 #define LEAD_INT 1
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2655 #define DOT_CHAR 2
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2656 #define TRAIL_INT 4
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2657 #define E_CHAR 8
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2658 #define EXP_INT 16
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2659
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2660 int
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2661 isfloat_string (cp)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2662 register char *cp;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2663 {
21799
7a44b61e263b Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21797
diff changeset
2664 register int state;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2665
21911
8087931b409e (isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents: 21799
diff changeset
2666 char *start = cp;
8087931b409e (isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents: 21799
diff changeset
2667
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2668 state = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2669 if (*cp == '+' || *cp == '-')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2670 cp++;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2671
9871
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2672 if (*cp >= '0' && *cp <= '9')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2673 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2674 state |= LEAD_INT;
9871
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2675 while (*cp >= '0' && *cp <= '9')
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2676 cp++;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2677 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2678 if (*cp == '.')
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2679 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2680 state |= DOT_CHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2681 cp++;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2682 }
9871
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2683 if (*cp >= '0' && *cp <= '9')
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 state |= TRAIL_INT;
9871
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2686 while (*cp >= '0' && *cp <= '9')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2687 cp++;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2688 }
16342
b91af71f45f1 (isfloat_string): Accept E like e.
Richard M. Stallman <rms@gnu.org>
parents: 16228
diff changeset
2689 if (*cp == 'e' || *cp == 'E')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2690 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2691 state |= E_CHAR;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2692 cp++;
11735
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
2693 if (*cp == '+' || *cp == '-')
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
2694 cp++;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2695 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2696
9871
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2697 if (*cp >= '0' && *cp <= '9')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2698 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2699 state |= EXP_INT;
9871
e91d69642eab Don't include ctype.h.
Richard M. Stallman <rms@gnu.org>
parents: 9790
diff changeset
2700 while (*cp >= '0' && *cp <= '9')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2701 cp++;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2702 }
21911
8087931b409e (isfloat_string): Don't look at bytes before the string.
Richard M. Stallman <rms@gnu.org>
parents: 21799
diff changeset
2703 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
2704 ;
20815
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2705 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
2706 {
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2707 state |= EXP_INT;
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2708 cp += 3;
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2709 }
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2710 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
2711 {
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2712 state |= EXP_INT;
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2713 cp += 3;
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2714 }
d5ae7491d2b0 (read1): Handle infinities, NaN and -0.0 specially.
Richard M. Stallman <rms@gnu.org>
parents: 20773
diff changeset
2715
11172
e1ca77e22c12 (isfloat_string): Permit trailing space.
Richard M. Stallman <rms@gnu.org>
parents: 11079
diff changeset
2716 return (((*cp == 0) || (*cp == ' ') || (*cp == '\t') || (*cp == '\n') || (*cp == '\r') || (*cp == '\f'))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2717 && (state == (LEAD_INT|DOT_CHAR|TRAIL_INT)
826
e9b9a1cff2c9 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 796
diff changeset
2718 || state == (DOT_CHAR|TRAIL_INT)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2719 || state == (LEAD_INT|E_CHAR|EXP_INT)
826
e9b9a1cff2c9 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 796
diff changeset
2720 || state == (LEAD_INT|DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT)
e9b9a1cff2c9 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 796
diff changeset
2721 || state == (DOT_CHAR|TRAIL_INT|E_CHAR|EXP_INT)));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2722 }
27727
9400865ec7cf Remove `LISP_FLOAT_TYPE' and `standalone'.
Gerd Moellmann <gerd@gnu.org>
parents: 27645
diff changeset
2723
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2724
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2725 static Lisp_Object
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2726 read_vector (readcharfun, bytecodeflag)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2727 Lisp_Object readcharfun;
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2728 int bytecodeflag;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2729 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2730 register int i;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2731 register int size;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2732 register Lisp_Object *ptr;
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2733 register Lisp_Object tem, item, vector;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2734 register struct Lisp_Cons *otem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2735 Lisp_Object len;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2736
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2737 tem = read_list (1, readcharfun);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2738 len = Flength (tem);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2739 vector = (read_pure ? make_pure_vector (XINT (len)) : Fmake_vector (len, Qnil));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2740
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2741 size = XVECTOR (vector)->size;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2742 ptr = XVECTOR (vector)->contents;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2743 for (i = 0; i < size; i++)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2744 {
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2745 item = Fcar (tem);
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2746 /* 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
2747 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
2748 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
2749 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
2750 if (bytecodeflag && load_force_doc_strings)
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2751 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2752 if (i == COMPILED_BYTECODE)
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2753 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2754 if (!STRINGP (item))
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2755 error ("invalid byte code");
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2756
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2757 /* 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
2758 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
2759 constants slot is nil). */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2760 ptr[COMPILED_CONSTANTS] = item;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2761 item = Qnil;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2762 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2763 else if (i == COMPILED_CONSTANTS)
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2764 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2765 Lisp_Object bytestr = ptr[COMPILED_CONSTANTS];
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2766
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2767 if (NILP (item))
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2768 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2769 /* 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
2770 but without generating extra garbage and
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2771 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
2772 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
2773 STRING_SET_UNIBYTE (bytestr);
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2774
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2775 item = Fread (bytestr);
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2776 if (!CONSP (item))
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2777 error ("invalid byte code");
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2778
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2779 otem = XCONS (item);
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25555
diff changeset
2780 bytestr = XCAR (item);
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25555
diff changeset
2781 item = XCDR (item);
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2782 free_cons (otem);
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2783 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2784
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2785 /* Now handle the bytecode slot. */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2786 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
2787 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2788 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2789 ptr[i] = read_pure ? Fpurecopy (item) : item;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2790 otem = XCONS (tem);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2791 tem = Fcdr (tem);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2792 free_cons (otem);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2793 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2794 return vector;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2795 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2796
20548
e9733cb049d9 (readchar_backlog): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 20406
diff changeset
2797 /* 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
2798 FLAG = -1 means check for starting with defun
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2799 and make structure pure. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2800
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2801 static Lisp_Object
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2802 read_list (flag, readcharfun)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2803 int flag;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2804 register Lisp_Object readcharfun;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2805 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2806 /* -1 means check next element for defun,
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2807 0 means don't check,
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2808 1 means already checked and found defun. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2809 int defunflag = flag < 0 ? -1 : 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2810 Lisp_Object val, tail;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2811 register Lisp_Object elt, tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2812 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
2813 /* 0 is the normal case.
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2814 1 means this list is a doc reference; replace it with the number 0.
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2815 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
2816 int doc_reference = 0;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2817
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2818 /* 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
2819 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
2820
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2821 val = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2822 tail = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2823
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2824 while (1)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2825 {
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
2826 int ch;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2827 GCPRO2 (val, tail);
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2828 elt = read1 (readcharfun, &ch, first_in_list);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2829 UNGCPRO;
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2830
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2831 first_in_list = 0;
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2832
12639
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2833 /* 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
2834 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
2835 && ! 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
2836 && !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
2837 {
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2838 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
2839 /* 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
2840 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
2841 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
2842 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
2843 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
2844 else
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2845 /* 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
2846 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
2847 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
2848 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
2849 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
2850 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
2851 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
2852 }
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2853 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
2854 && ! NILP (elt)
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2855 && load_force_doc_strings)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2856 doc_reference = 2;
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
2857
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2858 if (ch)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2859 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2860 if (flag > 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2861 {
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2862 if (ch == ']')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2863 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
2864 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
2865 Fcons (make_string (") or . in a vector", 18), Qnil));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2866 }
9358
361c6409e7c1 (read1): New argument for returning out-of-band data, obviating the need for
Karl Heuer <kwzh@gnu.org>
parents: 9313
diff changeset
2867 if (ch == ')')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2868 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
2869 if (ch == '.')
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2870 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2871 GCPRO2 (val, tail);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
2872 if (!NILP (tail))
40690
ba7239b8872e (Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents: 40656
diff changeset
2873 XSETCDR (tail, read0 (readcharfun));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2874 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2875 val = read0 (readcharfun);
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
2876 read1 (readcharfun, &ch, 0);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2877 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
2878 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
2879 {
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2880 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
2881 return make_number (0);
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2882 if (doc_reference == 2)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2883 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2884 /* 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
2885 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
2886 int pos = XINT (XCDR (val));
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2887 /* Position is negative for user variables. */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2888 if (pos < 0) pos = -pos;
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2889 if (pos >= saved_doc_string_position
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2890 && pos < (saved_doc_string_position
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2891 + saved_doc_string_length))
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2892 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2893 int start = pos - saved_doc_string_position;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2894 int from, to;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2895
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2896 /* Process quoting with ^A,
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2897 and find the end of the string,
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2898 which is marked with ^_ (037). */
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2899 for (from = start, to = start;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2900 saved_doc_string[from] != 037;)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2901 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2902 int c = saved_doc_string[from++];
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2903 if (c == 1)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2904 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2905 c = saved_doc_string[from++];
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2906 if (c == 1)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2907 saved_doc_string[to++] = c;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2908 else if (c == '0')
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2909 saved_doc_string[to++] = 0;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2910 else if (c == '_')
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2911 saved_doc_string[to++] = 037;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2912 }
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2913 else
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2914 saved_doc_string[to++] = c;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2915 }
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2916
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2917 return make_string (saved_doc_string + start,
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2918 to - start);
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2919 }
22321
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2920 /* 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
2921 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
2922 && pos < (prev_saved_doc_string_position
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2923 + prev_saved_doc_string_length))
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2924 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2925 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
2926 int from, to;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2927
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2928 /* Process quoting with ^A,
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2929 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
2930 which is marked with ^_ (037). */
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2931 for (from = start, to = start;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2932 prev_saved_doc_string[from] != 037;)
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 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
2935 if (c == 1)
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2936 {
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2937 c = prev_saved_doc_string[from++];
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2938 if (c == 1)
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2939 prev_saved_doc_string[to++] = c;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2940 else if (c == '0')
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2941 prev_saved_doc_string[to++] = 0;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2942 else if (c == '_')
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2943 prev_saved_doc_string[to++] = 037;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2944 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2945 else
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2946 prev_saved_doc_string[to++] = c;
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2947 }
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2948
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2949 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
2950 to - start);
2b81c3b8f0c8 Remember the last TWO strings skipped with #@.
Richard M. Stallman <rms@gnu.org>
parents: 22103
diff changeset
2951 }
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2952 else
22603
329fe9a2bdb8 (read_list): Pass new arg to get_doc_string.
Richard M. Stallman <rms@gnu.org>
parents: 22420
diff changeset
2953 return get_doc_string (val, 0, 0);
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2954 }
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
2955
12639
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2956 return val;
1410ce7c4fab (read_list): When a file loaded from site-init.el uses #$,
Richard M. Stallman <rms@gnu.org>
parents: 12545
diff changeset
2957 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2958 return Fsignal (Qinvalid_read_syntax, Fcons (make_string (". in wrong context", 18), Qnil));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2959 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2960 return Fsignal (Qinvalid_read_syntax, Fcons (make_string ("] in a list", 11), Qnil));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2961 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2962 tem = (read_pure && flag <= 0
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2963 ? pure_cons (elt, Qnil)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2964 : Fcons (elt, Qnil));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
2965 if (!NILP (tail))
40690
ba7239b8872e (Fload): Use XSETCARFASTINT, XSETCDRFASTINT instead of treating XCAR and XCDR
Ken Raeburn <raeburn@raeburn.org>
parents: 40656
diff changeset
2966 XSETCDR (tail, tem);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2967 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2968 val = tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2969 tail = tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2970 if (defunflag < 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2971 defunflag = EQ (elt, Qdefun);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2972 else if (defunflag > 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2973 read_pure = 1;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2974 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2975 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2976
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2977 Lisp_Object Vobarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2978 Lisp_Object initial_obarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2979
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
2980 /* 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
2981
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
2982 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
2983
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
2984 static int hash_string ();
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
2985
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
2986 /* 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
2987 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
2988
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2989 Lisp_Object
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2990 check_obarray (obarray)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2991 Lisp_Object obarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2992 {
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
2993 while (!VECTORP (obarray) || XVECTOR (obarray)->size == 0)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2994 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2995 /* If Vobarray is now invalid, force it to be valid. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2996 if (EQ (Vobarray, obarray)) Vobarray = initial_obarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2997
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2998 obarray = wrong_type_argument (Qvectorp, obarray);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2999 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3000 return obarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3001 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3002
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3003 /* 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
3004 interned in the current obarray. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3005
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3006 Lisp_Object
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3007 intern (str)
46472
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
3008 const char *str;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3009 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3010 Lisp_Object tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3011 int len = strlen (str);
6503
7c566d0e4b3d (read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6471
diff changeset
3012 Lisp_Object obarray;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3013
6503
7c566d0e4b3d (read_filtered_event, intern): Use assignment instead of initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6471
diff changeset
3014 obarray = Vobarray;
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
3015 if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3016 obarray = check_obarray (obarray);
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
3017 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
3018 if (SYMBOLP (tem))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3019 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
3020 return Fintern (make_string (str, len), obarray);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3021 }
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3022
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3023 /* 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
3024
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3025 Lisp_Object
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3026 make_symbol (str)
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3027 char *str;
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3028 {
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3029 int len = strlen (str);
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3030
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3031 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
3032 ? 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
3033 : make_string (str, len)));
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3034 }
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3035
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3036 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
3037 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
3038 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
3039 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
3040 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
3041 (string, obarray)
14092
279f5f3528a8 (Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 14036
diff changeset
3042 Lisp_Object string, obarray;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3043 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3044 register Lisp_Object tem, sym, *ptr;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3045
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
3046 if (NILP (obarray)) obarray = Vobarray;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3047 obarray = check_obarray (obarray);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3048
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40558
diff changeset
3049 CHECK_STRING (string);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3050
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3051 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
3052 SCHARS (string),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3053 SBYTES (string));
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
3054 if (!INTEGERP (tem))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3055 return tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3056
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
3057 if (!NILP (Vpurify_flag))
14092
279f5f3528a8 (Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 14036
diff changeset
3058 string = Fpurecopy (string);
279f5f3528a8 (Feval_buffer, Feval_region, Fintern, Fintern_soft): Harmonize arguments
Erik Naggum <erik@naggum.no>
parents: 14036
diff changeset
3059 sym = Fmake_symbol (string);
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3060
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3061 if (EQ (obarray, initial_obarray))
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3062 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
3063 else
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3064 XSYMBOL (sym)->interned = SYMBOL_INTERNED;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3065
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3066 if ((SREF (string, 0) == ':')
21982
456f95c03285 (Fintern): Properly compare lisp objects.
Richard M. Stallman <rms@gnu.org>
parents: 21936
diff changeset
3067 && EQ (obarray, initial_obarray))
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3068 {
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3069 XSYMBOL (sym)->constant = 1;
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3070 XSYMBOL (sym)->value = sym;
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3071 }
17918
72aec83491a2 (Fintern): Give keywords a value when interned.
Richard M. Stallman <rms@gnu.org>
parents: 17605
diff changeset
3072
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3073 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
3074 if (SYMBOLP (*ptr))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3075 XSYMBOL (sym)->next = XSYMBOL (*ptr);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3076 else
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3077 XSYMBOL (sym)->next = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3078 *ptr = sym;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3079 return sym;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3080 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3081
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3082 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
3083 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
3084 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
3085 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
3086 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
3087 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
3088 (name, obarray)
26735
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3089 Lisp_Object name, obarray;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3090 {
46446
34f82dbd015b (Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents: 46429
diff changeset
3091 register Lisp_Object tem, string;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3092
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
3093 if (NILP (obarray)) obarray = Vobarray;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3094 obarray = check_obarray (obarray);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3095
26735
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3096 if (!SYMBOLP (name))
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3097 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40558
diff changeset
3098 CHECK_STRING (name);
46446
34f82dbd015b (Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents: 46429
diff changeset
3099 string = name;
26735
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3100 }
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3101 else
46446
34f82dbd015b (Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents: 46429
diff changeset
3102 string = SYMBOL_NAME (name);
34f82dbd015b (Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents: 46429
diff changeset
3103
34f82dbd015b (Fintern_soft): Use string macros instead of Lisp_String fields.
Ken Raeburn <raeburn@raeburn.org>
parents: 46429
diff changeset
3104 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
3105 if (INTEGERP (tem) || (SYMBOLP (name) && !EQ (name, tem)))
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3106 return Qnil;
c13ab7bc6fdc (Fintern_soft): Accept a symbol argument.
Gerd Moellmann <gerd@gnu.org>
parents: 26404
diff changeset
3107 else
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3108 return tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3109 }
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3110
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3111 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
3112 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
3113 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
3114 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
3115 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
3116 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
3117 (name, obarray)
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3118 Lisp_Object name, obarray;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3119 {
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3120 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
3121 int hash;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3122
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3123 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
3124 obarray = check_obarray (obarray);
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3125
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3126 if (SYMBOLP (name))
45406
6f19e244af49 * lread.c (Fintern_soft, oblookup): Use SYMBOL_NAME and XSTRING
Ken Raeburn <raeburn@raeburn.org>
parents: 45001
diff changeset
3127 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
3128 else
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3129 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40558
diff changeset
3130 CHECK_STRING (name);
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3131 string = name;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3132 }
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3133
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3134 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
3135 SCHARS (string),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3136 SBYTES (string));
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3137 if (INTEGERP (tem))
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3138 return Qnil;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3139 /* 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
3140 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
3141 return Qnil;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3142
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3143 XSYMBOL (tem)->interned = SYMBOL_UNINTERNED;
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3144 XSYMBOL (tem)->constant = 0;
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3145 XSYMBOL (tem)->indirect_variable = 0;
20773
6c655dc99321 (Funintern): Clear the symbol's obarray field.
Richard M. Stallman <rms@gnu.org>
parents: 20706
diff changeset
3146
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3147 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
3148
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3149 if (EQ (XVECTOR (obarray)->contents[hash], tem))
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3150 {
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3151 if (XSYMBOL (tem)->next)
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3152 XSETSYMBOL (XVECTOR (obarray)->contents[hash], XSYMBOL (tem)->next);
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3153 else
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3154 XSETINT (XVECTOR (obarray)->contents[hash], 0);
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3155 }
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3156 else
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3157 {
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3158 Lisp_Object tail, following;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3159
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3160 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
3161 XSYMBOL (tail)->next;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3162 tail = following)
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3163 {
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3164 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
3165 if (EQ (following, tem))
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3166 {
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3167 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
3168 break;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3169 }
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3170 }
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3171 }
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3172
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3173 return Qt;
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3174 }
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3175
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3176 /* 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
3177 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
3178 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
3179
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3180 Also store the bucket number in oblookup_last_bucket_number. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3181
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3182 Lisp_Object
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
3183 oblookup (obarray, ptr, size, size_byte)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3184 Lisp_Object obarray;
46472
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
3185 register const char *ptr;
20609
4bf29951648f (read_escape): `\ ' stands for nothing at all.
Richard M. Stallman <rms@gnu.org>
parents: 20566
diff changeset
3186 int size, size_byte;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3187 {
8828
2ff6fed642b1 (Fload): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents: 8596
diff changeset
3188 int hash;
2ff6fed642b1 (Fload): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents: 8596
diff changeset
3189 int obsize;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3190 register Lisp_Object tail;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3191 Lisp_Object bucket, tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3192
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
3193 if (!VECTORP (obarray)
5243
13cce14b5a0c Line breaking change.
Richard M. Stallman <rms@gnu.org>
parents: 5185
diff changeset
3194 || (obsize = XVECTOR (obarray)->size) == 0)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3195 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3196 obarray = check_obarray (obarray);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3197 obsize = XVECTOR (obarray)->size;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3198 }
13455
4f5a9ce67782 (oblookup): Clear ARRAY_MARK_FLAG in obsize.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
3199 /* 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
3200 obsize &= ~ARRAY_MARK_FLAG;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3201 /* 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
3202 hash = hash_string (ptr, size_byte);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3203 hash %= obsize;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3204 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
3205 oblookup_last_bucket_number = hash;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3206 if (XFASTINT (bucket) == 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3207 ;
9149
fe6b30db719d (readchar, readchar, unreadchar, read_filtered_event, Fread, read0, read1,
Karl Heuer <kwzh@gnu.org>
parents: 8906
diff changeset
3208 else if (!SYMBOLP (bucket))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3209 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
3210 else
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3211 for (tail = bucket; ; XSETSYMBOL (tail, XSYMBOL (tail)->next))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3212 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3213 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
3214 && 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
3215 && !bcmp (SDATA (SYMBOL_NAME (tail)), ptr, size_byte))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3216 return tail;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3217 else if (XSYMBOL (tail)->next == 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3218 break;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3219 }
9274
5c66d8b65a7c (Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents: 9149
diff changeset
3220 XSETINT (tem, hash);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3221 return tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3222 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3223
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3224 static int
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3225 hash_string (ptr, len)
46472
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
3226 const unsigned char *ptr;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3227 int len;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3228 {
46472
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
3229 register const unsigned char *p = ptr;
c246e05b9c70 (intern, oblookup, hash_string): String pointer args
Ken Raeburn <raeburn@raeburn.org>
parents: 46446
diff changeset
3230 register const unsigned char *end = p + len;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3231 register unsigned char c;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3232 register int hash = 0;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3233
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3234 while (p != end)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3235 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3236 c = *p++;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3237 if (c >= 0140) c -= 40;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3238 hash = ((hash<<3) + (hash>>28) + c);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3239 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3240 return hash & 07777777777;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3241 }
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3242
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3243 void
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3244 map_obarray (obarray, fn, arg)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3245 Lisp_Object obarray;
20298
b7d23d2eded1 (read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents: 20168
diff changeset
3246 void (*fn) P_ ((Lisp_Object, Lisp_Object));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3247 Lisp_Object arg;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3248 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3249 register int i;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3250 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
3251 CHECK_VECTOR (obarray);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3252 for (i = XVECTOR (obarray)->size - 1; i >= 0; i--)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3253 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3254 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
3255 if (SYMBOLP (tail))
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3256 while (1)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3257 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3258 (*fn) (tail, arg);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3259 if (XSYMBOL (tail)->next == 0)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3260 break;
9274
5c66d8b65a7c (Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents: 9149
diff changeset
3261 XSETSYMBOL (tail, XSYMBOL (tail)->next);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3262 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3263 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3264 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3265
20298
b7d23d2eded1 (read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents: 20168
diff changeset
3266 void
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3267 mapatoms_1 (sym, function)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3268 Lisp_Object sym, function;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3269 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3270 call1 (function, sym);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3271 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3272
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3273 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
3274 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
3275 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
3276 (function, obarray)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3277 Lisp_Object function, obarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3278 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 463
diff changeset
3279 if (NILP (obarray)) obarray = Vobarray;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3280 obarray = check_obarray (obarray);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3281
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3282 map_obarray (obarray, mapatoms_1, function);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3283 return Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3284 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3285
5117
951396781a0e (OBARRAY_SIZE): Increase from 509.
Richard M. Stallman <rms@gnu.org>
parents: 5017
diff changeset
3286 #define OBARRAY_SIZE 1511
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3287
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3288 void
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3289 init_obarray ()
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3290 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3291 Lisp_Object oblength;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3292 int hash;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3293 Lisp_Object *tem;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3294
9313
ed68c3822e4b (read_filtered_event, init_obarray): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9274
diff changeset
3295 XSETFASTINT (oblength, OBARRAY_SIZE);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3296
21251
05fbf4f5b14f (read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
3297 Qnil = Fmake_symbol (make_pure_string ("nil", 3, 3, 0));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3298 Vobarray = Fmake_vector (oblength, make_number (0));
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3299 initial_obarray = Vobarray;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3300 staticpro (&initial_obarray);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3301 /* Intern nil in the obarray */
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3302 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
3303 XSYMBOL (Qnil)->constant = 1;
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3304
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3305 /* These locals are to kludge around a pyramid compiler bug. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3306 hash = hash_string ("nil", 3);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3307 /* Separate statement here to avoid VAXC bug. */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3308 hash %= OBARRAY_SIZE;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3309 tem = &XVECTOR (Vobarray)->contents[hash];
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3310 *tem = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3311
21251
05fbf4f5b14f (read1): Pass new arg to make_pure_string.
Richard M. Stallman <rms@gnu.org>
parents: 21244
diff changeset
3312 Qunbound = Fmake_symbol (make_pure_string ("unbound", 7, 7, 0));
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3313 XSYMBOL (Qnil)->function = Qunbound;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3314 XSYMBOL (Qunbound)->value = Qunbound;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3315 XSYMBOL (Qunbound)->function = Qunbound;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3316
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3317 Qt = intern ("t");
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3318 XSYMBOL (Qnil)->value = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3319 XSYMBOL (Qnil)->plist = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3320 XSYMBOL (Qt)->value = Qt;
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3321 XSYMBOL (Qt)->constant = 1;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3322
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3323 /* 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
3324 Vpurify_flag = Qt;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3325
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3326 Qvariable_documentation = intern ("variable-documentation");
16228
fa7a56c543df (init_obarray): staticpro Qvariable_documentation.
Erik Naggum <erik@naggum.no>
parents: 16165
diff changeset
3327 staticpro (&Qvariable_documentation);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3328
26866
305531847450 (readchar): Adjusted for the change of CHAR_STRING.
Kenichi Handa <handa@m17n.org>
parents: 26755
diff changeset
3329 read_buffer_size = 100 + MAX_MULTIBYTE_LENGTH;
27852
98f55bbdbbad (Fload): Use `xfree' instead of `free'.
Gerd Moellmann <gerd@gnu.org>
parents: 27763
diff changeset
3330 read_buffer = (char *) xmalloc (read_buffer_size);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3331 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3332
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3333 void
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3334 defsubr (sname)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3335 struct Lisp_Subr *sname;
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 sym;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3338 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
3339 XSETSUBR (XSYMBOL (sym)->function, sname);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3340 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3342 #ifdef NOTDEF /* use fset in subr.el now */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3343 void
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3344 defalias (sname, string)
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3345 struct Lisp_Subr *sname;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3346 char *string;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3347 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3348 Lisp_Object sym;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3349 sym = intern (string);
9274
5c66d8b65a7c (Fget_file_char, Fload, read1, oblookup, map_obarray, defsubr, defalias,
Karl Heuer <kwzh@gnu.org>
parents: 9149
diff changeset
3350 XSETSUBR (XSYMBOL (sym)->function, sname);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3351 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3352 #endif /* NOTDEF */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3353
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3354 /* 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
3355 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
3356 /* DEFVAR_INT ("indent-tabs-mode", &indent_tabs_mode, "Documentation"); */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3357 void
7765
688637ba31c5 (defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents: 7675
diff changeset
3358 defvar_int (namestring, address)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3359 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
3360 EMACS_INT *address;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3361 {
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3362 Lisp_Object sym, val;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3363 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
3364 val = allocate_misc ();
11242
36e8e27c8625 (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3365 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
3366 XINTFWD (val)->intvar = address;
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3367 SET_SYMBOL_VALUE (sym, val);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3368 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3369
42206
0f4506820432 Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 41463
diff changeset
3370 /* 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
3371 nil if address contains 0 */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3372 void
7765
688637ba31c5 (defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents: 7675
diff changeset
3373 defvar_bool (namestring, address)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3374 char *namestring;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3375 int *address;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3376 {
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3377 Lisp_Object sym, val;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3378 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
3379 val = allocate_misc ();
11242
36e8e27c8625 (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3380 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
3381 XBOOLFWD (val)->boolvar = address;
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3382 SET_SYMBOL_VALUE (sym, val);
25555
301ce7f0b398 (Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents: 25251
diff changeset
3383 Vbyte_boolean_vars = Fcons (sym, Vbyte_boolean_vars);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3384 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3385
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3386 /* 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
3387 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
3388 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
3389 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
3390 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
3391 void
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3392 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
3393 char *namestring;
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3394 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
3395 {
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3396 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
3397 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
3398 val = allocate_misc ();
11242
36e8e27c8625 (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3399 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
3400 XOBJFWD (val)->objvar = address;
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3401 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
3402 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3403
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3404 void
7765
688637ba31c5 (defvar_bool, defvar_int, defvar_lisp, defvar_lisp_nopro):
Richard M. Stallman <rms@gnu.org>
parents: 7675
diff changeset
3405 defvar_lisp (namestring, address)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3406 char *namestring;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3407 Lisp_Object *address;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3408 {
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3409 defvar_lisp_nopro (namestring, address);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3410 staticpro (address);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3411 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3412
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3413 /* 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
3414 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
3415 that is current now. */
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3416
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3417 void
1009
bf78b5ea9b3a * lread.c (defvar_per_buffer): Support new TYPE argument, by
Jim Blandy <jimb@redhat.com>
parents: 851
diff changeset
3418 defvar_per_buffer (namestring, address, type, doc)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3419 char *namestring;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3420 Lisp_Object *address;
1009
bf78b5ea9b3a * lread.c (defvar_per_buffer): Support new TYPE argument, by
Jim Blandy <jimb@redhat.com>
parents: 851
diff changeset
3421 Lisp_Object type;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3422 char *doc;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3423 {
9466
9052bf69f7de (defvar_int, defvar_bool, defvar_lisp, defvar_lisp_nopro, defvar_per_buffer):
Karl Heuer <kwzh@gnu.org>
parents: 9363
diff changeset
3424 Lisp_Object sym, val;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3425 int offset;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3426 extern struct buffer buffer_local_symbols;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3427
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3428 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
3429 val = allocate_misc ();
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3430 offset = (char *)address - (char *)current_buffer;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3431
11242
36e8e27c8625 (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3432 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
3433 XBUFFER_OBJFWD (val)->offset = offset;
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3434 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
3435 PER_BUFFER_SYMBOL (offset) = sym;
27133646d187 Use new macro names for handling per-buffer variables.
Gerd Moellmann <gerd@gnu.org>
parents: 28318
diff changeset
3436 PER_BUFFER_TYPE (offset) = type;
28318
ff71c3a83b75 (defvar_per_buffer): Use new macros for per-buffer
Gerd Moellmann <gerd@gnu.org>
parents: 28309
diff changeset
3437
28367
27133646d187 Use new macro names for handling per-buffer variables.
Gerd Moellmann <gerd@gnu.org>
parents: 28318
diff changeset
3438 if (PER_BUFFER_IDX (offset) == 0)
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3439 /* Did a DEFVAR_PER_BUFFER without initializing the corresponding
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3440 slot of buffer_local_flags */
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3441 abort ();
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3442 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3443
10606
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3444
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3445 /* 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
3446 at a particular offset in the current kboard object. */
10606
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3447
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3448 void
11020
0951bb12c8ee (defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents: 10650
diff changeset
3449 defvar_kboard (namestring, offset)
10606
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3450 char *namestring;
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3451 int offset;
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3452 {
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3453 Lisp_Object sym, val;
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3454 sym = intern (namestring);
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3455 val = allocate_misc ();
11242
36e8e27c8625 (defvar_int, defvar_bool, defvar_lisp_nopro, defvar_kboard)
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
3456 XMISCTYPE (val) = Lisp_Misc_Kboard_Objfwd;
11020
0951bb12c8ee (defvar_kboard): Renamed from defvar_display.
Karl Heuer <kwzh@gnu.org>
parents: 10650
diff changeset
3457 XKBOARD_OBJFWD (val)->offset = offset;
39580
ee9c4218a600 (Fintern, Funintern): Set symbol's interned and constant
Gerd Moellmann <gerd@gnu.org>
parents: 37981
diff changeset
3458 SET_SYMBOL_VALUE (sym, val);
10606
97b210b19217 (defvar_display): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10200
diff changeset
3459 }
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3460
14130
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
3461 /* 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
3462 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
3463 static Lisp_Object dump_path;
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
3464
20298
b7d23d2eded1 (read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents: 20168
diff changeset
3465 void
364
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3466 init_lread ()
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3467 {
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3468 char *normal;
11735
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3469 int turn_off_warning = 0;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3470
364
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3471 /* Compute the default load-path. */
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3472 #ifdef CANNOT_DUMP
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3473 normal = PATH_LOADSEARCH;
638
40b255f55df3 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 621
diff changeset
3474 Vload_path = decode_env_path (0, normal);
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3475 #else
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3476 if (NILP (Vpurify_flag))
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3477 normal = PATH_LOADSEARCH;
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3478 else
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3479 normal = PATH_DUMPLOADSEARCH;
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3480
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3481 /* 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
3482 Vload_path from PATH_LOADSEARCH, since the value that was dumped
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3483 uses ../lisp, instead of the path of the installed elisp
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3484 libraries. However, if it appears that Vload_path was changed
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3485 from the default before dumping, don't override that value. */
621
eca8812e61cd *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
3486 if (initialized)
eca8812e61cd *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
3487 {
eca8812e61cd *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
3488 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
3489 {
09d0f4b26641 (init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents: 3704
diff changeset
3490 Vload_path = decode_env_path (0, normal);
5617
0b312b3fa24e (init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents: 5568
diff changeset
3491 if (!NILP (Vinstallation_directory))
4482
09d0f4b26641 (init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents: 3704
diff changeset
3492 {
42797
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3493 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
3494
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3495 /* 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
3496 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
3497 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
3498 sitelisp = Qnil;
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3499 while (1)
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3500 {
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3501 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
3502 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
3503 tem, Qnil);
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3504 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
3505 {
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3506 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
3507 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
3508 }
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3509 else
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3510 break;
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3511 }
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3512
5617
0b312b3fa24e (init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents: 5568
diff changeset
3513 /* 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
3514 installation dir, if it exists. */
5617
0b312b3fa24e (init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents: 5568
diff changeset
3515 tem = Fexpand_file_name (build_string ("lisp"),
0b312b3fa24e (init_lread): Use Vinstallation_directory.
Richard M. Stallman <rms@gnu.org>
parents: 5568
diff changeset
3516 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
3517 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
3518 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
3519 {
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3520 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
3521 {
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3522 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
3523 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
3524 }
7004
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3525 }
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3526 else
0c4d3481bb1b (init_lread): Maybe put build-time Lisp dirs on load-path.
Richard M. Stallman <rms@gnu.org>
parents: 6503
diff changeset
3527 /* 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
3528 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
3529 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
3530
18530
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3531 /* 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
3532 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
3533 Vinstallation_directory);
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3534 tem1 = Ffile_exists_p (tem);
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3535 if (!NILP (tem1))
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3536 {
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3537 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
3538 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
3539 }
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3540
11311
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3541 /* 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
3542 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
3543 Vinstallation_directory);
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3544 tem1 = Ffile_exists_p (tem);
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3545 if (!NILP (tem1))
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3546 {
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3547 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
3548 Vload_path = Fcons (tem, Vload_path);
11311
864c3dea8754 (read_escape): Undo Nov 15 change.
Richard M. Stallman <rms@gnu.org>
parents: 11242
diff changeset
3549 }
18084
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3550
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3551 /* 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
3552 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
3553 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
3554
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3555 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
3556 {
18771
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3557 Lisp_Object tem2;
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3558
18084
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3559 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
3560 Vinstallation_directory);
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3561 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
3562
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3563 /* 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
3564 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
3565 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
3566 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
3567 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
3568 Vinstallation_directory);
c0b6ecdf4a2b (init_lread): Don't add to load-path lisp subdirectories
Richard M. Stallman <rms@gnu.org>
parents: 18665
diff changeset
3569 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
3570 if (!NILP (tem1) && NILP (tem2))
18084
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3571 {
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3572 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
3573 Vsource_directory);
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3574
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3575 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
3576 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
3577
18530
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3578 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
3579 Vsource_directory);
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3580
94c18a43de33 (init_lread): Add leim subdir, like lisp subdir.
Richard M. Stallman <rms@gnu.org>
parents: 18084
diff changeset
3581 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
3582 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
3583
18084
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3584 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
3585 Vsource_directory);
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3586
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3587 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
3588 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
3589 }
6f264bb70b49 (init_lread): Sometimes add to load-path
Richard M. Stallman <rms@gnu.org>
parents: 18051
diff changeset
3590 }
42797
2fc2abcdc67c (init_lread): Move the site-lisp dirs later in the path.
Richard M. Stallman <rms@gnu.org>
parents: 42424
diff changeset
3591 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
3592 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
3593 }
09d0f4b26641 (init_lread): Normally put Vinvocation_directory
Richard M. Stallman <rms@gnu.org>
parents: 3704
diff changeset
3594 }
621
eca8812e61cd *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
3595 }
eca8812e61cd *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 617
diff changeset
3596 else
14130
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
3597 {
17605
83850481ae70 (init_lread): Don't add ../lisp to the dump-time load path.
Richard M. Stallman <rms@gnu.org>
parents: 17325
diff changeset
3598 /* 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
3599 /* 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
3600 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
3601 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
3602 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
3603 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
3604 dump_path = Vload_path;
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
3605 }
364
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3606 #endif
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3607
9790
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
3608 #ifndef WINDOWSNT
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
3609 /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
3610 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
3611 confuses users. Since PATH_LOADSEARCH is always overridden by the
9790
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
3612 EMACSLOADPATH environment variable below, disable the warning on NT. */
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
3613
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3614 /* 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
3615 if (!turn_off_warning)
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3616 {
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3617 Lisp_Object path_tail;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3618
11735
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3619 for (path_tail = Vload_path;
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3620 !NILP (path_tail);
25663
a5eaace0fa01 Use XCAR and XCDR instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 25555
diff changeset
3621 path_tail = XCDR (path_tail))
11735
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3622 {
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3623 Lisp_Object dirfile;
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3624 dirfile = Fcar (path_tail);
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3625 if (STRINGP (dirfile))
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3626 {
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3627 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
3628 if (access (SDATA (dirfile), 0) < 0)
16487
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3629 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
3630 XCAR (path_tail));
11735
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3631 }
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3632 }
f2f0f3b55a7e (isfloat_string): Reject strings like "0.5+".
Richard M. Stallman <rms@gnu.org>
parents: 11699
diff changeset
3633 }
9790
637b4664f7a5 Change explicit uses of the Unix directory separator
Richard M. Stallman <rms@gnu.org>
parents: 9552
diff changeset
3634 #endif /* WINDOWSNT */
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3635
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3636 /* If the EMACSLOADPATH environment variable is set, use its value.
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3637 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
3638 #ifndef CANNOT_DUMP
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3639 if (NILP (Vpurify_flag)
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 604
diff changeset
3640 && egetenv ("EMACSLOADPATH"))
11955
d972c95e7577 (init_lread) [CANNOT_DUMP]: Set Vload_path to EMACSLOADPATH.
Geoff Voelker <voelker@cs.washington.edu>
parents: 11868
diff changeset
3641 #endif
364
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3642 Vload_path = decode_env_path ("EMACSLOADPATH", normal);
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3643
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3644 Vvalues = Qnil;
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3645
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3646 load_in_progress = 0;
15283
b2be450a8da4 (init_lread): Init Vload_file_name to Qnil.
Karl Heuer <kwzh@gnu.org>
parents: 15091
diff changeset
3647 Vload_file_name = Qnil;
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
3648
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
3649 load_descriptor_list = Qnil;
21291
b039d32d8399 (init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents: 21251
diff changeset
3650
b039d32d8399 (init_lread): Init Vstandard_input.
Richard M. Stallman <rms@gnu.org>
parents: 21251
diff changeset
3651 Vstandard_input = Qt;
31536
76cf765a7dad (init_lread): Set Vloads_in_progress to nil.
Gerd Moellmann <gerd@gnu.org>
parents: 31534
diff changeset
3652 Vloads_in_progress = Qnil;
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3653 }
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3654
16487
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3655 /* 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
3656 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
3657
20298
b7d23d2eded1 (read1): Declare `workbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents: 20168
diff changeset
3658 void
16487
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3659 dir_warning (format, dirname)
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3660 char *format;
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3661 Lisp_Object dirname;
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3662 {
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3663 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
3664 = (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
3665
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3666 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
3667 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
3668 /* 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
3669 if (initialized)
f654c3b16214 (dir_warning): Don't log a warning if Emacs hasn't
Geoff Voelker <voelker@cs.washington.edu>
parents: 21724
diff changeset
3670 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
3671 }
8e154ff6d4bf (dir_warning): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16383
diff changeset
3672
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3673 void
364
f4767dc8fff4 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 341
diff changeset
3674 syms_of_lread ()
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3675 {
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3676 defsubr (&Sread);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3677 defsubr (&Sread_from_string);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3678 defsubr (&Sintern);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3679 defsubr (&Sintern_soft);
11188
d7f70df00bb0 (oblookup): Save bucket num in oblookup_last_bucket_number.
Richard M. Stallman <rms@gnu.org>
parents: 11172
diff changeset
3680 defsubr (&Sunintern);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3681 defsubr (&Sload);
672
f81a3cf6ec22 *** empty log message ***
Joseph Arceneaux <jla@gnu.org>
parents: 638
diff changeset
3682 defsubr (&Seval_buffer);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3683 defsubr (&Seval_region);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3684 defsubr (&Sread_char);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3685 defsubr (&Sread_char_exclusive);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3686 defsubr (&Sread_event);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3687 defsubr (&Sget_file_char);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3688 defsubr (&Smapatoms);
45001
a3bd03ed0409 (openp): Change arg exec_only to predicate.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44222
diff changeset
3689 defsubr (&Slocate_file_internal);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3690
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3691 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
3692 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
3693 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
3694 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
3695 to find all the symbols in an obarray, use `mapatoms'. */);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3696
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3697 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
3698 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
3699 Order is reverse chronological. */);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3700
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3701 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
3702 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
3703 See documentation of `read' for possible values. */);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3704 Vstandard_input = Qt;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3705
45554
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3706 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
3707 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
3708
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3709 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
3710 will be added to `read-symbol-positions-list'.
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3711 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
3712 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
3713 defined, although they may be in the future.
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3714
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3715 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
3716 `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
3717 the toplevel; bind it instead. */);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3718 Vread_with_symbol_positions = Qnil;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3719
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3720 DEFVAR_LISP ("read-symbol-positions-list", &Vread_symbol_positions_list,
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3721 doc: /* An list mapping read symbols to their positions.
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3722 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
3723 `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
3724 non-nil.
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3725
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3726 Each element of the list looks like (SYMBOL . CHAR-POSITION), where
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3727 CHAR-POSITION is an integer giving the offset of that occurence of the
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3728 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
3729
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3730 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
3731 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
3732 were read in. */);
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3733 Vread_symbol_positions_list = Qnil;
cf7f041fd98e lread.c (readchar_count): New variable.
Colin Walters <walters@gnu.org>
parents: 45406
diff changeset
3734
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3735 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
3736 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
3737 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
3738 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
3739 otherwise to default specified by file `epaths.h' when Emacs was built. */);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3740
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
3741 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
3742 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
3743 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
3744 Vload_suffixes = Fcons (build_string (".elc"),
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
3745 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
3746 /* 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
3747 default_suffixes = Fcons (build_string (""), Qnil);
39808
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
3748 staticpro (&default_suffixes);
98efaf9813f4 (Vload_suffixes, default_suffixes): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39580
diff changeset
3749
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3750 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
3751 doc: /* Non-nil iff inside of `load'. */);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3752
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3753 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
3754 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
3755 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
3756 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
3757 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
3758
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3759 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
3760 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
3761 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
3762 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
3763 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
3764 when the corresponding call to `provide' is made. */);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3765 Vafter_load_alist = Qnil;
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3766
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
3767 DEFVAR_LISP ("load-history", &Vload_history,
40796
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3768 doc: /* Alist mapping source file names to symbols and features.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3769 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
3770 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
3771 definitions evaluated from buffers not visiting files.
47021
3bd4234e0844 (build_load_history): Use Fmember to see if a definition
Richard M. Stallman <rms@gnu.org>
parents: 46472
diff changeset
3772 The remaining elements of each list are symbols defined as functions,
3bd4234e0844 (build_load_history): Use Fmember to see if a definition
Richard M. Stallman <rms@gnu.org>
parents: 46472
diff changeset
3773 and cons cells of the form `(provide . FEATURE)', `(require . FEATURE)',
3bd4234e0844 (build_load_history): Use Fmember to see if a definition
Richard M. Stallman <rms@gnu.org>
parents: 46472
diff changeset
3774 `(defvar . VARIABLE), and `(autoload . SYMBOL)'. */);
2545
d666732c5f41 (readevalloop): New argument is the source file name (or nil if none).
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
3775 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
3776
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
3777 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
3778 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
3779 Vload_file_name = Qnil;
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
3780
24817
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
3781 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
3782 doc: /* File name, including directory, of user's initialization file.
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3783 If the file loaded had extension `.elc' and there was a corresponding `.el'
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3784 file, this variable contains the name of the .el file, suitable for use
816ced6caae8 (Feval_region): Remove obsolete #ifdef'd-out code (eval-current-buffer).
Pavel Janík <Pavel@Janik.cz>
parents: 40784
diff changeset
3785 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
3786 Vuser_init_file = Qnil;
3e8c8a06329b (Vuser_init_file): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 24412
diff changeset
3787
2901
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
3788 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
3789 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
3790 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
3791
11079
aeaaa579d967 (Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 11020
diff changeset
3792 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
3793 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
3794 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
3795 Vload_read_function = Qnil;
aeaaa579d967 (Vload_read_function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 11020
diff changeset
3796
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
3797 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
3798 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
3799 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
3800 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
3801 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
3802 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
3803 See `load' for the meaning of the remaining arguments. */);
17038
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
3804 Vload_source_file_function = Qnil;
f7a1e78fe210 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16978
diff changeset
3805
12780
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3806 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
3807 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
3808 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
3809 load_force_doc_strings = 0;
2c1f71512d5d (saved_doc_string*): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12639
diff changeset
3810
21677
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
3811 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
3812 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
3813 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
3814 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
3815 load_convert_to_unibyte = 0;
f42b78e033db (readevalloop): New arg UNIBYTE. Callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 21636
diff changeset
3816
13601
0a091134e047 (Vsource_directory): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 13455
diff changeset
3817 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
3818 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
3819 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
3820 Vsource_directory
f777822a5d81 (syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
3821 = Fexpand_file_name (build_string ("../"),
f777822a5d81 (syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
3822 Fcar (decode_env_path (0, PATH_DUMPLOADSEARCH)));
f777822a5d81 (syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
3823
18665
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
3824 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
3825 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
3826 Vpreloaded_file_list = Qnil;
6d7b8b35d878 (Vpreloaded_file_list): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 18530
diff changeset
3827
25555
301ce7f0b398 (Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents: 25251
diff changeset
3828 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
3829 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
3830 Vbyte_boolean_vars = Qnil;
301ce7f0b398 (Vbyte_boolean_vars): New variable.
Dave Love <fx@gnu.org>
parents: 25251
diff changeset
3831
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
3832 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
3833 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
3834 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
3835 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
3836 them. */);
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
3837 load_dangerous_libraries = 0;
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
3838
31367
22eb2b661cdf (syms_of_lread): Make Vbytecomp_version_regexp a Lisp
Gerd Moellmann <gerd@gnu.org>
parents: 31315
diff changeset
3839 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
3840 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
3841 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
3842 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
3843 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
3844 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
3845 Vbytecomp_version_regexp
31464
2efc0e152012 (syms_of_lread): Change value of regexp
Gerd Moellmann <gerd@gnu.org>
parents: 31367
diff changeset
3846 = build_string ("^;;;.\\(in Emacs version\\|bytecomp version FSF\\)");
28156
2e784b17f85a (load_dangerous_libraries): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27852
diff changeset
3847
14300
f777822a5d81 (syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
3848 /* Vsource_directory was initialized in init_lread. */
f777822a5d81 (syms_of_lread): Set Vsource_directory here.
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
3849
5568
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
3850 load_descriptor_list = Qnil;
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
3851 staticpro (&load_descriptor_list);
1af95f18f709 (Fload): Record descriptor numbers on load_descriptor_list.
Richard M. Stallman <rms@gnu.org>
parents: 5496
diff changeset
3852
2901
510a7ebce564 (syms_of_lread): Make Vcurrent_load_list ordinary Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 2781
diff changeset
3853 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
3854 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
3855
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3856 Qstandard_input = intern ("standard-input");
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3857 staticpro (&Qstandard_input);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3858
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3859 Qread_char = intern ("read-char");
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3860 staticpro (&Qread_char);
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3861
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3862 Qget_file_char = intern ("get-file-char");
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3863 staticpro (&Qget_file_char);
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
3864
11683
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
3865 Qbackquote = intern ("`");
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
3866 staticpro (&Qbackquote);
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
3867 Qcomma = intern (",");
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
3868 staticpro (&Qcomma);
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
3869 Qcomma_at = intern (",@");
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
3870 staticpro (&Qcomma_at);
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
3871 Qcomma_dot = intern (",.");
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
3872 staticpro (&Qcomma_dot);
355d0b23a080 (read1): New arg FIRST_IN_LIST; all callers changed.
Richard M. Stallman <rms@gnu.org>
parents: 11311
diff changeset
3873
16937
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
3874 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
3875 staticpro (&Qinhibit_file_name_operation);
c46111ba348b (openp): Handle remote file names in path.
Richard M. Stallman <rms@gnu.org>
parents: 16925
diff changeset
3876
2044
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
3877 Qascii_character = intern ("ascii-character");
258362f03d90 (syms_of_lread): Set up Qascii_character.
Richard M. Stallman <rms@gnu.org>
parents: 2018
diff changeset
3878 staticpro (&Qascii_character);
3625
57174f9b1870 (Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents: 3041
diff changeset
3879
13235
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
3880 Qfunction = intern ("function");
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
3881 staticpro (&Qfunction);
0f83b9eb5478 (read1): Handle #' as prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13146
diff changeset
3882
3625
57174f9b1870 (Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents: 3041
diff changeset
3883 Qload = intern ("load");
57174f9b1870 (Fload): Forward all 4 args to magic-name handler.
Richard M. Stallman <rms@gnu.org>
parents: 3041
diff changeset
3884 staticpro (&Qload);
10200
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
3885
899f5bd94bbb (Qload_file_name, Vload_file_name): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 10163
diff changeset
3886 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
3887 staticpro (&Qload_file_name);
14130
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
3888
99ab26698ab0 (read1): Use xmalloc and xrealloc, not malloc and realloc.
Karl Heuer <kwzh@gnu.org>
parents: 14092
diff changeset
3889 staticpro (&dump_path);
16141
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3890
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3891 staticpro (&read_objects);
9cbc74969e46 Add #n=object, #n#, and #:symbol constructs to reader.
Erik Naggum <erik@naggum.no>
parents: 16039
diff changeset
3892 read_objects = Qnil;
25165
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
3893 staticpro (&seen_list);
8b9110694bfa (read1): Added circular reading code to #N=.
Richard M. Stallman <rms@gnu.org>
parents: 24817
diff changeset
3894
31534
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
3895 Vloads_in_progress = Qnil;
0bfeb94864e2 (Vloads_in_progress): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31464
diff changeset
3896 staticpro (&Vloads_in_progress);
341
84ec93d39015 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3897 }